From: Dave Airlie <airlied@redhat.com>
Date: Mon, 5 Dec 2016 07:11:48 +0000 (+1000)
Subject: Backmerge tag 'v4.9-rc8' into drm-next
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f03ee46be9401e3434f52bb15e92d1e640f76438;p=linux-beck.git

Backmerge tag 'v4.9-rc8' into drm-next

Linux 4.9-rc8

Daniel requested this so we could apply some follow on fixes cleanly to -next.
---

f03ee46be9401e3434f52bb15e92d1e640f76438
diff --cc drivers/gpu/drm/arm/hdlcd_drv.c
index faab7f9bd3b7,e138fb51e8ce..e5f4f4a6546d
--- a/drivers/gpu/drm/arm/hdlcd_drv.c
+++ b/drivers/gpu/drm/arm/hdlcd_drv.c
@@@ -365,20 -371,10 +365,19 @@@ static int hdlcd_drm_bind(struct devic
  		goto err_fbdev;
  	}
  
 +	ret = drm_dev_register(drm, 0);
 +	if (ret)
 +		goto err_register;
 +
  	return 0;
  
 +err_register:
 +	if (hdlcd->fbdev) {
 +		drm_fbdev_cma_fini(hdlcd->fbdev);
 +		hdlcd->fbdev = NULL;
 +	}
  err_fbdev:
  	drm_kms_helper_poll_fini(drm);
- 	drm_mode_config_cleanup(drm);
  	drm_vblank_cleanup(drm);
  err_vblank:
  	pm_runtime_disable(drm->dev);