From b238376cc939d4c848c1041dc950032223c56776 Mon Sep 17 00:00:00 2001 From: Mark Yao Date: Fri, 31 Mar 2017 17:58:45 +0800 Subject: [PATCH] drm/rockchip: don't restore to fbdev when display kernel logo Change-Id: Ie0f53364c51924feb589fa2e8550ef5b423bb4cd Signed-off-by: Mark Yao --- drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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[] = { -- 2.34.1