drm/i915/fbc: Consult hw.crtc instead of uapi.crtc
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Wed, 13 Apr 2022 15:28:51 +0000 (18:28 +0300)
committerJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Tue, 26 Apr 2022 07:12:36 +0000 (10:12 +0300)
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: 2e6c99f88679 ("drm/i915/fbc: Nuke lots of crap from intel_fbc_state_cache")
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220413152852.7336-1-ville.syrjala@linux.intel.com
Reviewed-by: Manasi Navare <manasi.d.navare@intel.com>
(cherry picked from commit 3e1faae3398789abe8d4797255bfe28d95d81308)
Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
drivers/gpu/drm/i915/display/intel_fbc.c

index 87f4af3fd523ec0d1a9a2191aeec6bbd422c43db..3e61a89362453727c9c1dc95f43c059ec85354c8 100644 (file)
@@ -1037,7 +1037,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;