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

drm/i915: Use {active,scaled}_planes to compute ilk watermarks 



Use the {active,scaled}_planes bitmasks from the crtc state
rather than poking at the plane state directly. One step
towards eliminating the last use of the somewhat questionble
intel_atomic_crtc_state_for_each_plane_state() macro which
peeks into the plane state without actually holding the plane
mutex.

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


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

drivers/gpu/drm/i915/intel_pm.c

+2 −6
Original line number Diff line number Diff line
@@ -3179,12 +3179,8 @@ static int ilk_compute_pipe_wm(struct intel_atomic_state *state, 
	}



	pipe_wm->pipe_enabled = crtc_state->hw.active;

	if (sprstate) {

		pipe_wm->sprites_enabled = sprstate->uapi.visible;

		pipe_wm->sprites_scaled = sprstate->uapi.visible &&

			(drm_rect_width(&sprstate->uapi.dst) != drm_rect_width(&sprstate->uapi.src) >> 16 ||

			 drm_rect_height(&sprstate->uapi.dst) != drm_rect_height(&sprstate->uapi.src) >> 16);

	}

	pipe_wm->sprites_enabled = crtc_state->active_planes & BIT(PLANE_SPRITE0);

	pipe_wm->sprites_scaled = crtc_state->scaled_planes & BIT(PLANE_SPRITE0);



	usable_level = max_level;