From: Dave Airlie Date: Tue, 8 Dec 2015 01:04:26 +0000 (+1000) Subject: Back merge tag 'v4.4-rc4' into drm-next X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e876b41ab074561d65f213bf5e0fc68cf5bc7380;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git Back merge tag 'v4.4-rc4' into drm-next We've picked up a few conflicts and it would be nice to resolve them before we move onwards. --- e876b41ab074561d65f213bf5e0fc68cf5bc7380 diff --cc drivers/gpu/drm/imx/imx-drm-core.c index 6faa735376ec,7b990b4e96d2..882cf3d4b7a8 --- a/drivers/gpu/drm/imx/imx-drm-core.c +++ b/drivers/gpu/drm/imx/imx-drm-core.c @@@ -62,10 -60,11 +62,9 @@@ EXPORT_SYMBOL_GPL(imx_drm_crtc_id) static void imx_drm_driver_lastclose(struct drm_device *drm) { -#if IS_ENABLED(CONFIG_DRM_IMX_FB_HELPER) struct imx_drm_device *imxdrm = drm->dev_private; - if (imxdrm->fbhelper) - drm_fbdev_cma_restore_mode(imxdrm->fbhelper); + drm_fbdev_cma_restore_mode(imxdrm->fbhelper); -#endif } static int imx_drm_driver_unload(struct drm_device *drm)