drm/rockchip: don't restore to fbdev when display kernel logo

[firefly-linux-kernel-4.4.55.git] / drivers / gpu / drm / rockchip / rockchip_drm_drv.c

diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
index af4e8ea763be934530654f5579db6b1442e6ef21..cf83cd1ec6768f970998551a0cef0f69ff3023d4 100644 (file)
--- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
@@ -1069,7 +1069,8 @@ void rockchip_drm_lastclose(struct drm_device *dev)
 {
        struct rockchip_drm_private *priv = dev->dev_private;
 
-       drm_fb_helper_restore_fbdev_mode_unlocked(priv->fbdev_helper);
+       if (!priv->logo)
+               drm_fb_helper_restore_fbdev_mode_unlocked(priv->fbdev_helper);
 }
 
 static const struct drm_ioctl_desc rockchip_ioctls[] = {