drm/i915/display: Check the old state to find port sync slave

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@intel.com>
Cc: Matt Roper <matthew.d.roper@intel.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191202222513.337777-1-jose.souza@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 947739f18b0a61162249f2af7f143d3b390a0b66..c2161ce8fe650c3b556e75230fe58ad3dbf8a64c 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -14497,8 +14497,8 @@ 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_master(new_crtc_state))
+               if (is_trans_port_sync_mode(old_crtc_state)) {
+                       if (is_trans_port_sync_master(old_crtc_state))
                                intel_trans_port_sync_modeset_disables(state,
                                                                       crtc,
                                                                       old_crtc_state,