Commit c16b8555 authored by Helen Koike's avatar Helen Koike Committed by Boris Brezillon

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: 539c320b ("drm/vc4: update cursors asynchronously through atomic")
Suggested-by: default avatarBoris Brezillon <boris.brezillon@collabora.com>
Signed-off-by: default avatarHelen Koike <helen.koike@collabora.com>
Reviewed-by: default avatarBoris Brezillon <boris.brezillon@collabora.com>
Signed-off-by: default avatarBoris Brezillon <boris.brezillon@collabora.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190603165610.24614-5-helen.koike@collabora.com
parent 474d952b
...@@ -1025,7 +1025,7 @@ static void vc4_plane_atomic_async_update(struct drm_plane *plane, ...@@ -1025,7 +1025,7 @@ static void vc4_plane_atomic_async_update(struct drm_plane *plane,
{ {
struct vc4_plane_state *vc4_state, *new_vc4_state; struct vc4_plane_state *vc4_state, *new_vc4_state;
drm_atomic_set_fb_for_plane(plane->state, state->fb); swap(plane->state->fb, state->fb);
plane->state->crtc_x = state->crtc_x; plane->state->crtc_x = state->crtc_x;
plane->state->crtc_y = state->crtc_y; plane->state->crtc_y = state->crtc_y;
plane->state->crtc_w = state->crtc_w; plane->state->crtc_w = state->crtc_w;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment