Skip to content

Commit f7e1089

Browse files
vsyrjalajlahtine-intel
authored andcommitted
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: 2e6c99f ("drm/i915/fbc: Nuke lots of crap from intel_fbc_state_cache") Signed-off-by: Ville Syrjälä <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] Reviewed-by: Manasi Navare <[email protected]> (cherry picked from commit 3e1faae) Signed-off-by: Joonas Lahtinen <[email protected]>
1 parent 4ae4dd2 commit f7e1089

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1037,7 +1037,7 @@ static int intel_fbc_check_plane(struct intel_atomic_state *state,
10371037
struct intel_plane_state *plane_state =
10381038
intel_atomic_get_new_plane_state(state, plane);
10391039
const struct drm_framebuffer *fb = plane_state->hw.fb;
1040-
struct intel_crtc *crtc = to_intel_crtc(plane_state->uapi.crtc);
1040+
struct intel_crtc *crtc = to_intel_crtc(plane_state->hw.crtc);
10411041
const struct intel_crtc_state *crtc_state;
10421042
struct intel_fbc *fbc = plane->fbc;
10431043

0 commit comments

Comments
 (0)