From: Helen Koike <helen.koike@collabora.com>
To: Boris Brezillon <boris.brezillon@collabora.com>
Cc: dri-devel@lists.freedesktop.org, nicholas.kazlauskas@amd.com,
andrey.grodzovsky@amd.com, daniel.vetter@ffwll.ch,
linux-kernel@vger.kernel.org, "Tomasz Figa" <tfiga@chromium.org>,
"David Airlie" <airlied@linux.ie>,
"Sean Paul" <seanpaul@google.com>,
kernel@collabora.com, harry.wentland@amd.com,
"Stéphane Marchesin" <marcheu@google.com>,
"Eric Anholt" <eric@anholt.net>
Subject: Re: [PATCH 5/5] drm/vc4: fix fb references in async update
Date: Mon, 11 Mar 2019 20:26:34 -0300 [thread overview]
Message-ID: <a4a6e73b-5c09-89e8-eebd-9254d4a32adf@collabora.com> (raw)
In-Reply-To: <20190311105642.44816e7b@collabora.com>
On 3/11/19 6:56 AM, Boris Brezillon wrote:
> +Eric (the VC4 driver maintainer)
>
> Hello Helen,
>
> On Mon, 4 Mar 2019 11:49:09 -0300
> Helen Koike <helen.koike@collabora.com> wrote:
>
>> 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+: 25dc194b34dd: drm: Block fb changes for async plane updates
>> Cc: <stable@vger.kernel.org> # v4.19+: 8105bbaf9afd: drm: don't block fb changes for async plane updates
>
> Hm, the commit hash you give here will change when applied to the DRM
> tree. I think there's a standard way to express dependencies between
> patches that needs to be applied to stable, but I'm not sure you need
> to describe that since Greg picks patches in the order they appear in
> Linus' tree and those patches will be applied in the right order.
right
>
> Another option if you want to keep things simple is to squash all
> changes in a single patch ;).
I was thinking about that, but some of them don't need to be picked by
Greg (rockchip changes won't apply to stable for example), and I think
it's easier to get tested-by/reviewed-by tags if I separate them and
send them to the proper mailing list for the respective architecture.
>
>> Fixes: 25dc194b34dd ("drm: Block fb changes for async plane updates")
>
> Nitpicking: this Fixes tag is a bit of lie since you're actually fixing a
> mistake that was introduced when async update support was added to VC4.
> Commit 25dc194b34dd only added a new constraint to fix the initial
> problem.
>
> So I'd suggest:
>
> Fixes: 539c320bfa97 ("drm/vc4: update cursors asynchronously through atomic")
>
> BTW, the same applies to other patches in this series.
>
>> Suggested-by: Boris Brezillon <boris.brezillon@collabora.com>
>
> Other than that,
>
> Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Thanks!
Helen
>
> Regards,
>
> Boris
>
>> Signed-off-by: Helen Koike <helen.koike@collabora.com>
>>
>> ---
>> Hello,
>>
>> As mentioned in the cover letter,
>> I tested on the rockchip and on i915 using igt plane_cursor_legacy and
>> kms_cursor_legacy and I didn't see any regressions.
>> But I couldn't test on VC4. I have a Raspberry pi model B rev2, when
>> FB_SIMPLE is running I can see output on the screen, but when vc4 is
>> loaded my hdmi display is not detected anymore, I am still debugging
>> this, probably some config in the firmware, but I would appreciate if
>> anyone could help me testing it.
>>
>> Also the Cc statble commit hash dependency needs to be updated once the
>> refered commit is merged.
>>
>> Thanks!
>> Helen
>>
>> 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;
>
>
next prev parent reply other threads:[~2019-03-11 23:26 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-04 14:49 [PATCH 0/5] drm: Fix fb changes for async updates Helen Koike
2019-03-04 14:49 ` [PATCH 1/5] drm: don't block fb changes for async plane updates Helen Koike
2019-03-04 15:46 ` Kazlauskas, Nicholas
2019-03-11 10:06 ` Boris Brezillon
2019-03-11 13:15 ` Kazlauskas, Nicholas
2019-03-11 14:20 ` Boris Brezillon
2019-03-11 19:51 ` Daniel Vetter
2019-03-11 19:58 ` Daniel Vetter
2019-03-12 9:32 ` Boris Brezillon
2019-03-12 9:44 ` Daniel Vetter
2019-03-11 19:53 ` Daniel Vetter
2019-03-11 9:39 ` Boris Brezillon
2019-03-04 14:49 ` [PATCH 2/5] drm/rockchip: fix fb references in async update Helen Koike
2019-03-04 14:49 ` [PATCH 3/5] drm/amd: " Helen Koike
2019-03-04 15:51 ` Kazlauskas, Nicholas
2019-03-04 14:49 ` [PATCH 4/5] drm/msm: " Helen Koike
2019-03-04 14:49 ` [PATCH 5/5] drm/vc4: " Helen Koike
2019-03-06 0:42 ` Helen Koike
2019-03-11 9:56 ` Boris Brezillon
2019-03-11 23:26 ` Helen Koike [this message]
2019-03-06 1:04 ` [PATCH 0/5] drm: Fix fb changes for async updates Helen Koike
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=a4a6e73b-5c09-89e8-eebd-9254d4a32adf@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=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=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).