From 04725d0283f647fe99c185ddfcf514ed4bde9da9 Mon Sep 17 00:00:00 2001 From: Sandy Huang Date: Fri, 18 Jun 2021 15:59:59 +0800 Subject: [PATCH] drm/rockchip: drv: enable power before direct close crtc make sure vop power is enabled before use priv function crtc_close() to close current crtc plane. Signed-off-by: Sandy Huang Change-Id: I928e5f0f38692fbb8a134e6938ec28f8c1f41285 --- drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c index a9ca58b0e8ac..80ab47b65555 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c @@ -1023,8 +1023,15 @@ static void show_loader_logo(struct drm_device *drm_dev) struct rockchip_drm_private *priv = drm_dev->dev_private; - if (unset->hdisplay && unset->vdisplay) + if (unset->hdisplay && unset->vdisplay) { + if (priv->crtc_funcs[pipe] && + priv->crtc_funcs[pipe]->loader_protect) + priv->crtc_funcs[pipe]->loader_protect(crtc, true); priv->crtc_funcs[pipe]->crtc_close(crtc); + if (priv->crtc_funcs[pipe] && + priv->crtc_funcs[pipe]->loader_protect) + priv->crtc_funcs[pipe]->loader_protect(crtc, false); + } } list_del(&unset->head);