drm/i915/display: Drop duplicated code in intel_dp_set_infoframes()

No functional changes in here.

Cc: Matt Atwood <matthew.s.atwood@intel.com>
Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
Reviewed-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210418002126.87882-3-jose.souza@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
index fae51facf2c4c2ea7d8086354acd4fec60565104..536ab3b5ef410c78331cb152e377d309a1b6ea59 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -2818,24 +2818,19 @@ void intel_dp_set_infoframes(struct intel_encoder *encoder,
        u32 dip_enable = VIDEO_DIP_ENABLE_AVI_HSW | VIDEO_DIP_ENABLE_GCP_HSW |
                         VIDEO_DIP_ENABLE_VS_HSW | VIDEO_DIP_ENABLE_GMP_HSW |
                         VIDEO_DIP_ENABLE_SPD_HSW | VIDEO_DIP_ENABLE_DRM_GLK;
-       u32 val = intel_de_read(dev_priv, reg);
+       u32 val = intel_de_read(dev_priv, reg) & ~dip_enable;
 
        /* TODO: Add DSC case (DIP_ENABLE_PPS) */
        /* When PSR is enabled, this routine doesn't disable VSC DIP */
-       if (crtc_state->has_psr)
-               val &= ~dip_enable;
-       else
-               val &= ~(dip_enable | VIDEO_DIP_ENABLE_VSC_HSW);
-
-       if (!enable) {
-               intel_de_write(dev_priv, reg, val);
-               intel_de_posting_read(dev_priv, reg);
-               return;
-       }
+       if (!crtc_state->has_psr)
+               val &= ~VIDEO_DIP_ENABLE_VSC_HSW;
 
        intel_de_write(dev_priv, reg, val);
        intel_de_posting_read(dev_priv, reg);
 
+       if (!enable)
+               return;
+
        /* When PSR is enabled, VSC SDP is handled by PSR routine */
        if (!crtc_state->has_psr)
                intel_write_dp_sdp(encoder, crtc_state, DP_SDP_VSC);