Commit 3af96f34 authored by Helen Koike's avatar Helen Koike Committed by Greg Kroah-Hartman

drm/vc4: fix fb references in async update

commit c16b8555 upstream.

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.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent afec7068
...@@ -818,6 +818,7 @@ static void vc4_plane_atomic_async_update(struct drm_plane *plane, ...@@ -818,6 +818,7 @@ static void vc4_plane_atomic_async_update(struct drm_plane *plane,
drm_atomic_set_fb_for_plane(plane->state, state->fb); drm_atomic_set_fb_for_plane(plane->state, state->fb);
} }
swap(plane->state->fb, state->fb);
/* Set the cursor's position on the screen. This is the /* Set the cursor's position on the screen. This is the
* expected change from the drm_mode_cursor_universal() * expected change from the drm_mode_cursor_universal()
* helper. * helper.
......
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