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, linux-arm-msm@vger.kernel.org,
"Ville Syrjälä" <ville.syrjala@linux.intel.com>,
"Russell King" <rmk+kernel@armlinux.org.uk>,
"Mamta Shukla" <mamtashukla555@gmail.com>,
robdclark@gmail.com,
"Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>,
freedreno@lists.freedesktop.org,
"Sean Paul" <seanpaul@chromium.org>,
"Daniel Vetter" <daniel@ffwll.ch>
Subject: [PATCH v2 3/5] drm/msm: fix fb references in async update
Date: Mon, 11 Mar 2019 23:22:01 -0300 [thread overview]
Message-ID: <20190312022204.2775-4-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.
Cc: <stable@vger.kernel.org> # v4.14+
Fixes: 224a4c970987 ("drm/msm: update cursors asynchronously through atomic")
Suggested-by: Boris Brezillon <boris.brezillon@collabora.com>
Signed-off-by: Helen Koike <helen.koike@collabora.com>
---
Hello,
As mentioned in the cover letter,
But I couldn't test on MSM because I don't have the hardware and I would
appreciate if anyone could test it.
In other platforms (VC4, AMD, Rockchip), there is a hidden
drm_framebuffer_get(new_fb)/drm_framebuffer_put(old_fb) in async_update
that is wrong, but I couldn't identify those here, not sure if it is hidden
somewhere else, but if tests fail this is probably the cause.
Thanks!
Helen
Changes in v2:
- update CC stable and Fixes tag
drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c
index be13140967b4..b854f471e9e5 100644
--- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c
+++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c
@@ -502,6 +502,8 @@ static int mdp5_plane_atomic_async_check(struct drm_plane *plane,
static void mdp5_plane_atomic_async_update(struct drm_plane *plane,
struct drm_plane_state *new_state)
{
+ struct drm_framebuffer *old_fb = plane->state->fb;
+
plane->state->src_x = new_state->src_x;
plane->state->src_y = new_state->src_y;
plane->state->crtc_x = new_state->crtc_x;
@@ -524,6 +526,8 @@ static void mdp5_plane_atomic_async_update(struct drm_plane *plane,
*to_mdp5_plane_state(plane->state) =
*to_mdp5_plane_state(new_state);
+
+ new_state->fb = old_fb;
}
static const struct drm_plane_helper_funcs mdp5_plane_helper_funcs = {
--
2.20.1
next prev parent reply other threads:[~2019-03-12 2:22 UTC|newest]
Thread overview: 22+ 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
[not found] ` <ed44e1f4-07da-b1cb-b5cb-d34d29758502-ZGY8ohtN/8qB+jHODAdFcQ@public.gmane.org>
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
[not found] ` <20190312022204.2775-1-helen.koike-ZGY8ohtN/8qB+jHODAdFcQ@public.gmane.org>
2019-03-12 2:22 ` [PATCH v2 2/5] drm/amd: " Helen Koike
2019-03-12 2:22 ` Helen Koike [this message]
2019-03-12 2:22 ` [PATCH v2 4/5] drm/vc4: " Helen Koike
2019-03-25 0:38 ` Sasha Levin
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-4-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=freedreno@lists.freedesktop.org \
--cc=harry.wentland@amd.com \
--cc=kernel@collabora.com \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=maarten.lankhorst@linux.intel.com \
--cc=mamtashukla555@gmail.com \
--cc=marcheu@google.com \
--cc=nicholas.kazlauskas@amd.com \
--cc=rmk+kernel@armlinux.org.uk \
--cc=robdclark@gmail.com \
--cc=seanpaul@chromium.org \
--cc=seanpaul@google.com \
--cc=stable@vger.kernel.org \
--cc=tfiga@chromium.org \
--cc=ville.syrjala@linux.intel.com \
/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).