[Intel-gfx] [PATCH 2/3] drm/i915/display: Check the old state to find port sync slave

José Roberto de Souza jose.souza at intel.com
Wed Nov 20 23:48:52 UTC 2019


If the CRTC is going from enabled to disabled and it is a port sync
slave, it needs to check to the old state to be disabled before the
port sync master.

Cc: Manasi Navare <manasi.d.navare at intel.com>
Cc: Matt Roper <matthew.d.roper at intel.com>
Cc: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
Cc: Ville Syrjälä <ville.syrjala at linux.intel.com>
Signed-off-by: José Roberto de Souza <jose.souza at intel.com>
---
 drivers/gpu/drm/i915/display/intel_display.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 1b1fbb6d8acc..801b975c7d39 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -14460,9 +14460,9 @@ static void intel_commit_modeset_disables(struct intel_atomic_state *state)
 		 * slave CRTCs are disabled first and then master CRTC since
 		 * Slave vblanks are masked till Master Vblanks.
 		 */
-		if (!is_trans_port_sync_mode(new_crtc_state))
+		if (!is_trans_port_sync_mode(old_crtc_state))
 			continue;
-		if (is_trans_port_sync_master(new_crtc_state))
+		if (is_trans_port_sync_master(old_crtc_state))
 			continue;
 
 		intel_pre_plane_update(old_crtc_state, new_crtc_state);
-- 
2.24.0



More information about the Intel-gfx mailing list