drm/i915/display/adlp: Remove code related to underrun recovery

This is not supported for ADLP and is not needed.

Signed-off-by: Swathi Dhanavanthri <swathi.dhanavanthri@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220302231119.16876-1-swathi.dhanavanthri@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 6cae58f921a50c35b1982fca75522976bc22fff8..541797a2ff9eb690f1a75edbdc61c8f9879c43f7 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -3595,12 +3595,8 @@ static void hsw_set_transconf(const struct intel_crtc_state *crtc_state)
 static void bdw_set_pipemisc(const struct intel_crtc_state *crtc_state)
 {
        struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
-       const struct intel_crtc_scaler_state *scaler_state =
-               &crtc_state->scaler_state;
-
        struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
        u32 val = 0;
-       int i;
 
        switch (crtc_state->pipe_bpp) {
        case 18:
@@ -3639,23 +3635,6 @@ static void bdw_set_pipemisc(const struct intel_crtc_state *crtc_state)
        if (DISPLAY_VER(dev_priv) >= 12)
                val |= PIPEMISC_PIXEL_ROUNDING_TRUNC;
 
-       if (IS_ALDERLAKE_P(dev_priv)) {
-               bool scaler_in_use = false;
-
-               for (i = 0; i < crtc->num_scalers; i++) {
-                       if (!scaler_state->scalers[i].in_use)
-                               continue;
-
-                       scaler_in_use = true;
-                       break;
-               }
-
-               intel_de_rmw(dev_priv, PIPE_MISC2(crtc->pipe),
-                            PIPE_MISC2_BUBBLE_COUNTER_MASK,
-                            scaler_in_use ? PIPE_MISC2_BUBBLE_COUNTER_SCALER_EN :
-                            PIPE_MISC2_BUBBLE_COUNTER_SCALER_DIS);
-       }
-
        intel_de_write(dev_priv, PIPEMISC(crtc->pipe), val);
 }