From 45bfb674cdaeb96567d88248caf24a74984fe3d3 Mon Sep 17 00:00:00 2001 From: Algea Cao Date: Wed, 31 Mar 2021 09:46:11 +0800 Subject: [PATCH] drm: rockchip: dw-hdmi: Fix reboot display err When system reboot, drm framework will set mode to prefer mode first then set mode to 0. Clearing flag in encoder enable will causes the VOP to not set the sync polarity. Signed-off-by: Algea Cao Change-Id: I20dfcc7b6dc76faf903b42620454a7f5071bd3e3 --- drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c index 5164cf3fa295..817260d2f07c 100644 --- a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c +++ b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c @@ -579,8 +579,6 @@ static void dw_hdmi_rockchip_encoder_enable(struct drm_encoder *encoder) if (WARN_ON(!crtc || !crtc->state)) return; - hdmi->mode_changed = false; - if (hdmi->phy) phy_set_bus_width(hdmi->phy, hdmi->phy_bus_width); @@ -860,8 +858,7 @@ dw_hdmi_rockchip_encoder_atomic_check(struct drm_encoder *encoder, s->bus_format = bus_format; hdmi->bus_format = s->bus_format; - if (crtc_state->mode_changed == true) - hdmi->mode_changed = true; + hdmi->mode_changed = crtc_state->mode_changed; if (hdmi->enc_out_encoding == V4L2_YCBCR_ENC_BT2020) s->color_space = V4L2_COLORSPACE_BT2020;