diff options
| author | Helen Koike <helen.koike@collabora.com> | 2019-06-03 12:56:09 -0400 |
|---|---|---|
| committer | Boris Brezillon <boris.brezillon@collabora.com> | 2019-06-04 04:14:49 -0400 |
| commit | c16b85559dcfb5a348cc085a7b4c75ed49b05e2c (patch) | |
| tree | a137372213facb8e87fd8eca4a7706fd0d22b01c | |
| parent | 474d952b4870cfbdc55d3498f4d498775fe77e81 (diff) | |
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
| -rw-r--r-- | drivers/gpu/drm/vc4/vc4_plane.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c index 4d918d3e4858..afc80b245ea3 100644 --- a/drivers/gpu/drm/vc4/vc4_plane.c +++ b/drivers/gpu/drm/vc4/vc4_plane.c | |||
| @@ -1025,7 +1025,7 @@ static void vc4_plane_atomic_async_update(struct drm_plane *plane, | |||
| 1025 | { | 1025 | { |
| 1026 | struct vc4_plane_state *vc4_state, *new_vc4_state; | 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 | plane->state->crtc_x = state->crtc_x; | 1029 | plane->state->crtc_x = state->crtc_x; |
| 1030 | plane->state->crtc_y = state->crtc_y; | 1030 | plane->state->crtc_y = state->crtc_y; |
| 1031 | plane->state->crtc_w = state->crtc_w; | 1031 | plane->state->crtc_w = state->crtc_w; |
