Commit 332af874 authored Jun 03, 2019 by Helen Koike Committed by Boris Brezillon Jun 04, 2019

drm/amd: 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.20+
Fixes: 674e78ac ("drm/amd/display: Add fast path for cursor plane updates")
Suggested-by: Boris Brezillon <boris.brezillon@collabora.com>
Signed-off-by: Helen Koike <helen.koike@collabora.com>
Reviewed-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190603165610.24614-3-helen.koike@collabora.com

parent d985a353

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -4232,8 +4232,7 @@ static void dm_plane_atomic_async_update(struct drm_plane *plane,
		struct drm_plane_state *old_state =
		drm_atomic_get_old_plane_state(new_state->state, plane);

		if (plane->state->fb != new_state->fb)
		drm_atomic_set_fb_for_plane(plane->state, new_state->fb);
		swap(plane->state->fb, new_state->fb);

		plane->state->src_x = new_state->src_x;
		plane->state->src_y = new_state->src_y;