From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> 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@xxxxxxxxxxxxxxx> --- drivers/gpu/drm/i915/display/intel_display.c | 4 ++-- 1 file 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 e38d0a85889b..40fb356b5d46 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) -- 2.35.1
