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

drm/i915/fbc: Consult hw.crtc instead of uapi.crtc 



plane_state->uapi.crtc is not what we want to be looking at.
If bigjoiner is used hw.crtc is what tells us what crtc the plane
is supposedly using.

Not an actual problem on current hardware as the only FBC capable
pipe (A) can't be a bigjoiner slave and thus uapi.crtc==hw.crtc
always here. But when we get more FBC instances this will become
actually important.

Fixes: 2e6c99f8 ("drm/i915/fbc: Nuke lots of crap from intel_fbc_state_cache")
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220413152852.7336-1-ville.syrjala@linux.intel.com


Reviewed-by: default avatarManasi Navare <manasi.d.navare@intel.com>
parent af2cbc6e

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

+1 −1
Original line number Diff line number Diff line
@@ -1053,7 +1053,7 @@ static int intel_fbc_check_plane(struct intel_atomic_state *state, 
	struct intel_plane_state *plane_state =

		intel_atomic_get_new_plane_state(state, plane);

	const struct drm_framebuffer *fb = plane_state->hw.fb;

	struct intel_crtc *crtc = to_intel_crtc(plane_state->uapi.crtc);

	struct intel_crtc *crtc = to_intel_crtc(plane_state->hw.crtc);

	const struct intel_crtc_state *crtc_state;

	struct intel_fbc *fbc = plane->fbc;