Skip to content

Commit c65fe9c

Browse files
vsyrjalajnikula
authored andcommitted
drm/i915/fbc: Remember to update FBC state even when not reallocating CFB
We mustn't forget to update our FBC state even if we don't have to reallocate the CFB. Otherwise we won't refresh our notion of what eg. the new fence or the new override CFB stride should be. Using the wrong CFB stride in particular can cause underruns and could even corrupt other stuff in stolen. Fixes: f4cfdbb ("drm/i915/fbc: Nuke state_cache") Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/4774 Signed-off-by: Ville Syrjälä <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] Reviewed-by: Mika Kahola <[email protected]> (cherry picked from commit 798c5da) Signed-off-by: Jani Nikula <[email protected]>
1 parent 040bf2a commit c65fe9c

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1384,8 +1384,10 @@ static void __intel_fbc_enable(struct intel_atomic_state *state,
13841384
if (fbc->state.plane != plane)
13851385
return;
13861386

1387-
if (intel_fbc_is_ok(plane_state))
1387+
if (intel_fbc_is_ok(plane_state)) {
1388+
intel_fbc_update_state(state, crtc, plane);
13881389
return;
1390+
}
13891391

13901392
__intel_fbc_disable(fbc);
13911393
}

0 commit comments

Comments
 (0)