From 82a56746d9becce4b488265539a8338f027f7ff8 Mon Sep 17 00:00:00 2001 From: Sandy Huang Date: Wed, 31 May 2023 18:58:01 +0800 Subject: [PATCH] Revert "drm: Not mark crtc state as connectors_changed when a writeback connector attatch to a crtc" This reverts commit ae488c03abd7cf9291947c3bb01e58ac4de78bed. Use the following commit instead: 22fe2c3d386e ("drm/rockchip: vop2: No need for a full modested when the only writeback connector changed") Change-Id: If8669d28ebc6c06331beaca588e9842920894a4c Signed-off-by: Sandy Huang --- drivers/gpu/drm/drm_atomic_helper.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index 4108c7265d53..33768ddfaacb 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -296,14 +296,12 @@ update_connector_routing(struct drm_atomic_state *state, if (old_connector_state->crtc != new_connector_state->crtc) { if (old_connector_state->crtc) { crtc_state = drm_atomic_get_new_crtc_state(state, old_connector_state->crtc); - if (connector->connector_type != DRM_MODE_CONNECTOR_WRITEBACK) - crtc_state->connectors_changed = true; + crtc_state->connectors_changed = true; } if (new_connector_state->crtc) { crtc_state = drm_atomic_get_new_crtc_state(state, new_connector_state->crtc); - if (connector->connector_type != DRM_MODE_CONNECTOR_WRITEBACK) - crtc_state->connectors_changed = true; + crtc_state->connectors_changed = true; } } @@ -388,8 +386,7 @@ update_connector_routing(struct drm_atomic_state *state, set_best_encoder(state, new_connector_state, new_encoder); - if (connector->connector_type != DRM_MODE_CONNECTOR_WRITEBACK) - crtc_state->connectors_changed = true; + crtc_state->connectors_changed = true; DRM_DEBUG_ATOMIC("[CONNECTOR:%d:%s] using [ENCODER:%d:%s] on [CRTC:%d:%s]\n", connector->base.id,