Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/vc4: fix fb references in async update

Async update callbacks are expected to set the old_fb in the new_state
so prepare/cleanup framebuffers are balanced.

Calling drm_atomic_set_fb_for_plane() (which gets a reference of the new
fb and put the old fb) is not required, as it's taken care by
drm_mode_cursor_universal() when calling drm_atomic_helper_update_plane().

Cc: <stable@vger.kernel.org> # v4.19+
Fixes: 539c320bfa97 ("drm/vc4: update cursors asynchronously through atomic")
Suggested-by: Boris Brezillon <boris.brezillon@collabora.com>
Signed-off-by: Helen Koike <helen.koike@collabora.com>
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190603165610.24614-5-helen.koike@collabora.com

authored by

Helen Koike and committed by
Boris Brezillon
c16b8555 474d952b

+1 -1
+1 -1
drivers/gpu/drm/vc4/vc4_plane.c
··· 1025 1025 { 1026 1026 struct vc4_plane_state *vc4_state, *new_vc4_state; 1027 1027 1028 - drm_atomic_set_fb_for_plane(plane->state, state->fb); 1028 + swap(plane->state->fb, state->fb); 1029 1029 plane->state->crtc_x = state->crtc_x; 1030 1030 plane->state->crtc_y = state->crtc_y; 1031 1031 plane->state->crtc_w = state->crtc_w;