summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVille Syrjälä <ville.syrjala@linux.intel.com>2022-06-15 20:48:51 +0300
committerVille Syrjälä <ville.syrjala@linux.intel.com>2022-06-16 17:06:18 +0300
commit651d4a0fc4c5c6a2d20c95ef814f0d4381f71d55 (patch)
tree22a4cd2dbdac4bf617f4241880efcc0839ebd8fa
parentb8fec4400923eb91f995d7dbe97411b8991ea559 (diff)
downloadlinux-651d4a0fc4c5c6a2d20c95ef814f0d4381f71d55.tar.xz
drm/i915: Sanitize underrun reporting before turning off any pipes
Make sure FIFO underrun reporting is flagged as disabled very early during the state readout so that we don't get any spurious FIFO underruns reports from intel_crtc_disable_noatomic(). Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20220615174851.20658-2-ville.syrjala@linux.intel.com Reviewed-by: Jani Nikula <jani.nikula@intel.com>
-rw-r--r--drivers/gpu/drm/i915/display/intel_display.c4
1 files 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 3fac545414b4..88658090ac58 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -9962,8 +9962,6 @@ static void intel_sanitize_crtc(struct intel_crtc *crtc,
if (crtc_state->hw.active && !intel_crtc_has_encoders(crtc) &&
!intel_crtc_is_bigjoiner_slave(crtc_state))
intel_crtc_disable_noatomic(crtc, ctx);
-
- intel_sanitize_fifo_underrun_reporting(crtc_state);
}
static bool has_bogus_dpll_config(const struct intel_crtc_state *crtc_state)
@@ -10363,6 +10361,8 @@ intel_modeset_setup_hw_state(struct drm_device *dev,
struct intel_crtc_state *crtc_state =
to_intel_crtc_state(crtc->base.state);
+ intel_sanitize_fifo_underrun_reporting(crtc_state);
+
drm_crtc_vblank_reset(&crtc->base);
if (crtc_state->hw.active)