From: Dave Airlie <airlied@redhat.com>
Date: Tue, 28 Jan 2014 23:37:47 +0000 (+1000)
Subject: Merge tag 'omapdrm-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=dee13f12f6ab0c0927adf9168dfc84da93fc9f13;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge tag 'omapdrm-3.14' of git://git./linux/kernel/git/tomba/linux into drm-next

omapdrm patches for 3.14

* tag 'omapdrm-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux:
  drm/omap: Enable DT support for DMM
  drm/omap: fix: change dev_unload order
  drm/omap: fix: disable encoder before destroying it
  drm/omap: fix: disconnect devices when omapdrm module is removed
  drm/omap: fix: Defer probe if an omapdss device requests for it at connect
  drm/omap: fix (un)registering irqs inside an irq handler

Conflicts:
	drivers/gpu/drm/omapdrm/omap_drv.c
---

dee13f12f6ab0c0927adf9168dfc84da93fc9f13
diff --cc drivers/gpu/drm/omapdrm/omap_drv.c
index 13f294aeaefd,c57e99cc3caa..bf39fcc49e0f
--- a/drivers/gpu/drm/omapdrm/omap_drv.c
+++ b/drivers/gpu/drm/omapdrm/omap_drv.c
@@@ -665,9 -695,12 +695,11 @@@ static int pdev_probe(struct platform_d
  static int pdev_remove(struct platform_device *device)
  {
  	DBG("");
 -	drm_platform_exit(&omap_drm_driver, device);
  
- 	drm_put_dev(platform_get_drvdata(device));
+ 	omap_disconnect_dssdevs();
+ 	omap_crtc_pre_uninit();
  
 -	platform_driver_unregister(&omap_dmm_driver);
++	drm_put_dev(platform_get_drvdata(device));
  	return 0;
  }