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

drm/i915: Flag even inactive crtcs as "inherited" 



I want to use the crtc_state->inherited flag to clean up some
of the early SAGV handling. To make that work nicely I need to
flag even the inactive crtcs as "inherited".

Since we can't expect user space to perform any real commits
on inactive crtcs we'll clear the flag already during
initial_commit().

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


Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 0029d2f7

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

+3 −0
Original line number Diff line number Diff line
@@ -8100,6 +8100,9 @@ int intel_initial_commit(struct intel_display *display) 
			goto out;

		}



		if (!crtc_state->hw.active)

			crtc_state->inherited = false;



		if (crtc_state->hw.active) {

			struct intel_encoder *encoder;

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

+11 −11
Original line number Diff line number Diff line
@@ -821,7 +821,6 @@ static void intel_modeset_readout_hw_state(struct drm_i915_private *i915) 
			to_intel_crtc_state(crtc->base.state);

		struct intel_plane *plane;



		if (crtc_state->hw.active) {

		/*

		 * The initial mode needs to be set in order to keep

		 * the atomic core happy. It wants a valid mode if the
@@ -833,6 +832,7 @@ static void intel_modeset_readout_hw_state(struct drm_i915_private *i915) 
		 */

		crtc_state->inherited = true;



		if (crtc_state->hw.active) {

			intel_crtc_update_active_timings(crtc_state,

							 crtc_state->vrr.enable);