From: Mark Yao <mark.yao@rock-chips.com>
Date: Fri, 31 Mar 2017 09:58:45 +0000 (+0800)
Subject: drm/rockchip: don't restore to fbdev when display kernel logo
X-Git-Tag: firefly_0821_release~145
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b238376cc939d4c848c1041dc950032223c56776;p=firefly-linux-kernel-4.4.55.git

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

Change-Id: Ie0f53364c51924feb589fa2e8550ef5b423bb4cd
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
---

diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
index af4e8ea763be..cf83cd1ec676 100644
--- 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[] = {