Commit 599cc77e authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Write watermarks for disabled pipes on gmch platforms 



We've excluded gmch platforms from writing the final watermarks
for any disabled pipe. IIRC the reason was perhaps some lingering
issue with the watermark merging across the pipes. But I can't
really see any reason for this anymore, so let's unify this behaviour.
The main benefit being more consistency in register dumps when
we don't have stale watermarks hanging around in the registers.
Functionally there should be no difference as the hardware just
ignore all of it when the pipe is disabled.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220622155452.32587-9-ville.syrjala@linux.intel.com


Reviewed-by: default avatarStanislav Lisovskiy <stanislav.lisovskiy@intel.com>
parent eadbd867

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

+1 −3
Original line number Diff line number Diff line
@@ -7166,9 +7166,7 @@ static void intel_old_crtc_state_disables(struct intel_atomic_state *state, 
	intel_fbc_disable(crtc);

	intel_disable_shared_dpll(old_crtc_state);



	/* FIXME unify this for all platforms */

	if (!new_crtc_state->hw.active &&

	    !HAS_GMCH(dev_priv))

	if (!new_crtc_state->hw.active)

		intel_initial_watermarks(state, crtc);

}