From: Helen Koike <helen.koike@collabora.com>
To: dri-devel@lists.freedesktop.org, nicholas.kazlauskas@amd.com
Cc: andrey.grodzovsky@amd.com, daniel.vetter@ffwll.ch,
linux-kernel@vger.kernel.org, "Tomasz Figa" <tfiga@chromium.org>,
boris.brezillon@collabora.com, "David Airlie" <airlied@linux.ie>,
"Sean Paul" <seanpaul@google.com>,
kernel@collabora.com, harry.wentland@amd.com,
"Stéphane Marchesin" <marcheu@google.com>,
"Helen Koike" <helen.koike@collabora.com>,
stable@vger.kernel.org, eric@anholt.net,
"Daniel Vetter" <daniel@ffwll.ch>
Subject: [PATCH v2 4/5] drm/vc4: fix fb references in async update
Date: Mon, 11 Mar 2019 23:22:02 -0300 [thread overview]
Message-ID: <20190312022204.2775-5-helen.koike@collabora.com> (raw)
In-Reply-To: <20190312022204.2775-1-helen.koike@collabora.com>
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>
---
Hello,
I tested on a Raspberry Pi model B rev2 with igt plane_cursor_legacy and
kms_cursor_legacy and I didn't see any regressions.
Changes in v2:
- Added reviewed-by tag
- updated CC stable and Fixes tag
drivers/gpu/drm/vc4/vc4_plane.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c
index 1babfeca0c92..1235e53b22a3 100644
--- a/drivers/gpu/drm/vc4/vc4_plane.c
+++ b/drivers/gpu/drm/vc4/vc4_plane.c
@@ -968,7 +968,7 @@ static void vc4_plane_atomic_async_update(struct drm_plane *plane,
{
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_y = state->crtc_y;
plane->state->crtc_w = state->crtc_w;
--
2.20.1
next prev parent reply other threads:[~2019-03-12 2:25 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-12 2:21 [PATCH v2 0/5] drm: Fix fb changes for async updates Helen Koike
2019-03-12 2:21 ` [PATCH v2 1/5] drm/rockchip: fix fb references in async update Helen Koike
2019-03-12 6:34 ` Boris Brezillon
2019-03-12 11:04 ` Daniel Vetter
2019-03-12 15:34 ` Helen Koike
2019-03-12 15:52 ` Boris Brezillon
2019-03-13 3:42 ` Tomasz Figa
2019-03-13 9:58 ` Michel Dänzer
2019-03-13 18:08 ` Helen Koike
2019-03-14 9:15 ` Michel Dänzer
2019-03-14 17:51 ` Helen Koike
2019-03-15 10:11 ` Michel Dänzer
2019-03-15 10:25 ` Boris Brezillon
2019-03-15 11:29 ` Michel Dänzer
2019-03-15 16:54 ` Helen Koike
2019-03-12 2:22 ` [PATCH v2 2/5] drm/amd: " Helen Koike
2019-03-12 2:22 ` [PATCH v2 3/5] drm/msm: " Helen Koike
2019-03-12 2:22 ` Helen Koike [this message]
2019-03-12 2:22 ` [PATCH v2 5/5] drm: don't block fb changes for async plane updates Helen Koike
2019-03-12 6:44 ` Boris Brezillon
2019-03-12 12:49 ` Kazlauskas, Nicholas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190312022204.2775-5-helen.koike@collabora.com \
--to=helen.koike@collabora.com \
--cc=airlied@linux.ie \
--cc=andrey.grodzovsky@amd.com \
--cc=boris.brezillon@collabora.com \
--cc=daniel.vetter@ffwll.ch \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=eric@anholt.net \
--cc=harry.wentland@amd.com \
--cc=kernel@collabora.com \
--cc=linux-kernel@vger.kernel.org \
--cc=marcheu@google.com \
--cc=nicholas.kazlauskas@amd.com \
--cc=seanpaul@google.com \
--cc=stable@vger.kernel.org \
--cc=tfiga@chromium.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).