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, "Rob Clark" <robdclark@gmail.com>,
"Sean Paul" <sean@poorly.run>,
"Thomas Zimmermann" <tzimmermann@suse.de>,
linux-arm-msm@vger.kernel.org,
"Ville Syrjälä" <ville.syrjala@linux.intel.com>,
"Jeykumar Sankaran" <jsanka@codeaurora.org>,
"Maxime Ripard" <maxime.ripard@bootlin.com>,
freedreno@lists.freedesktop.org,
"Mamta Shukla" <mamtashukla555@gmail.com>,
"Daniel Vetter" <daniel@ffwll.ch>
Subject: [PATCH v4 3/5] drm/msm: fix fb references in async update
Date: Mon, 3 Jun 2019 13:56:08 -0300 [thread overview]
Message-ID: <20190603165610.24614-4-helen.koike@collabora.com> (raw)
In-Reply-To: <20190603165610.24614-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>
Acked-by: Rob Clark <robdclark@gmail.com>
---
Hello,
This was tested on the dragonboard 410c using igt plane_cursor_legacy and
kms_cursor_legacy and I didn't see any regressions.
Changes in v4:
- add acked by tag
Changes in v3: None
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 9d9fb6c5fd68..1105c2433f14 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-06-03 16:56 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-03 16:56 [PATCH v4 0/5] drm: Fix fb changes for async updates Helen Koike
2019-06-03 16:56 ` [PATCH v4 1/5] drm/rockchip: fix fb references in async update Helen Koike
2019-06-03 20:13 ` Helen Koike
2019-06-04 8:34 ` Boris Brezillon
2019-06-03 16:56 ` [PATCH v4 2/5] drm/amd: " Helen Koike
2019-06-03 20:14 ` Helen Koike
2019-06-03 16:56 ` Helen Koike [this message]
2019-06-03 16:56 ` [PATCH v4 4/5] drm/vc4: " Helen Koike
2019-06-03 16:56 ` [PATCH v4 5/5] drm: don't block fb changes for async plane updates Helen Koike
2019-06-04 8:32 ` [PATCH v4 0/5] drm: Fix fb changes for async updates Boris Brezillon
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=20190603165610.24614-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=jsanka@codeaurora.org \
--cc=kernel@collabora.com \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mamtashukla555@gmail.com \
--cc=marcheu@google.com \
--cc=maxime.ripard@bootlin.com \
--cc=nicholas.kazlauskas@amd.com \
--cc=robdclark@gmail.com \
--cc=sean@poorly.run \
--cc=seanpaul@google.com \
--cc=stable@vger.kernel.org \
--cc=tfiga@chromium.org \
--cc=tzimmermann@suse.de \
--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).