Skip to content

Commit 2b2c4a8

Browse files
Manasi Navarejlahtine-intel
authored andcommitted
drm/i915/dp: Disable Port sync mode correctly on teardown
While clearing the Ports ync mode enable and master select bits we need to clear the register completely instead of using disable masks v3: * Remove reg variable (Matt) v2: * Just write 0 to the reg (Ville) * Rebase Bugzilla: https://gitlab.freedesktop.org/drm/intel/issues/5 Cc: Ville Syrjälä <[email protected]> Cc: Jani Nikula <[email protected]> Fixes: 51528af ("drm/i915/display/icl: Disable transcoder port sync as part of crtc_disable() sequence") Signed-off-by: Manasi Navare <[email protected]> Reviewed-by: Matt Roper <[email protected]> Reviewed-by: Ville Syrjälä <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] (cherry picked from commit a3d9382) Signed-off-by: Joonas Lahtinen <[email protected]>
1 parent 25b79ad commit 2b2c4a8

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

drivers/gpu/drm/i915/display/intel_display.c

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4515,19 +4515,14 @@ static void icl_disable_transcoder_port_sync(const struct intel_crtc_state *old_
45154515
{
45164516
struct intel_crtc *crtc = to_intel_crtc(old_crtc_state->base.crtc);
45174517
struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
4518-
i915_reg_t reg;
4519-
u32 trans_ddi_func_ctl2_val;
45204518

45214519
if (old_crtc_state->master_transcoder == INVALID_TRANSCODER)
45224520
return;
45234521

45244522
DRM_DEBUG_KMS("Disabling Transcoder Port Sync on Slave Transcoder %s\n",
45254523
transcoder_name(old_crtc_state->cpu_transcoder));
45264524

4527-
reg = TRANS_DDI_FUNC_CTL2(old_crtc_state->cpu_transcoder);
4528-
trans_ddi_func_ctl2_val = ~(PORT_SYNC_MODE_ENABLE |
4529-
PORT_SYNC_MODE_MASTER_SELECT_MASK);
4530-
I915_WRITE(reg, trans_ddi_func_ctl2_val);
4525+
I915_WRITE(TRANS_DDI_FUNC_CTL2(old_crtc_state->cpu_transcoder), 0);
45314526
}
45324527

45334528
static void intel_fdi_normal_train(struct intel_crtc *crtc)

0 commit comments

Comments
 (0)