FAILED: patch "[PATCH] drm/vc4: fix fb references in async update" failed to apply to 4.19-stable tree
Subsystems (4)
[email protected]
maintainerThe patch below does not apply to the 4.19-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From c16b85559dcfb5a348cc085a7b4c75ed49b05e2c Mon Sep 17 00:00:00 2001
From: Helen Koike <[email protected]>
Date: Mon, 3 Jun 2019 13:56:09 -0300
Subject: [PATCH] drm/vc4: 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().
drivers/gpu/drm/vc4/vc4_plane.c +1 -1
@@ -1025,7 +1025,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;
PATCH v5 1/1 drm/vc4: fix fb references in async update
commit c16b85559dcfb5a348cc085a7b4c75ed49b05e2c upstream.
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().
---
Hi,
This patch failed to apply on kernel stable v4.19, I'm re-sending it fixing the conflict.
Thanks
Helen
drivers/gpu/drm/vc4/vc4_plane.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/vc4/vc4_plane.c +1 -0
@@ -818,6 +818,7 @@ static void vc4_plane_atomic_async_update(struct drm_plane *plane,drm_atomic_set_fb_for_plane (plane->state, state->fb); } +swap (plane->state->fb, state->fb);/* Set the cursor's position on the screen. This is the * expected change from the drm_mode_cursor_universal() * helper.
Signature · 1 line
2.20.1
Re: [PATCH v5] drm/vc4: fix fb references in async update
Quoted 16 lines · Helen Koike
commit
c16b85559dcfb5a348cc085a7b4c75ed49b05e2cupstream.Async update callbacks are expected to set the
old_fbin thenew_stateso 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 bydrm_mode_cursor_universal()when callingdrm_atomic_helper_update_plane().Cc <[email protected]> # v4.19+Fixes 539c320bfa97 ("drm/vc4: update cursors asynchronously through atomic")Suggested-by Boris Brezillon <[email protected]>Signed-off-by Helen Koike <[email protected]>Reviewed-by Boris Brezillon <[email protected]>Signed-off-by Boris Brezillon <[email protected]>
Quoted 6 lines
---
Hi,
This patch failed to apply on kernel stable v4.19, I'm re-sending it fixing the conflict.
fyi, this patch was already applied in other stable branches.
Thanks
Helen
Quoted 20 lines
Thanks
Helendrivers/gpu/drm/vc4/vc4_plane.c | 1 + 1 file changed, 1 insertion(+)drivers/gpu/drm/vc4/vc4_plane.c +1
-0@@ -818,6 +818,7 @@ static void vc4_plane_atomic_async_update(struct drm_plane *plane,drm_atomic_set_fb_for_plane (plane->state, state->fb); } +swap (plane->state->fb, state->fb);/* Set the cursor's position on the screen. This is the * expected change from the drm_mode_cursor_universal() * helper.
Greg KH
maintainerRe: [PATCH v5] drm/vc4: fix fb references in async update
In reply to Helen KoikeQuoted 16 lines · Helen Koike
commit
c16b85559dcfb5a348cc085a7b4c75ed49b05e2cupstream.Async update callbacks are expected to set the
old_fbin thenew_stateso 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 bydrm_mode_cursor_universal()when callingdrm_atomic_helper_update_plane().Cc <[email protected]> # v4.19+Fixes 539c320bfa97 ("drm/vc4: update cursors asynchronously through atomic")Suggested-by Boris Brezillon <[email protected]>Signed-off-by Helen Koike <[email protected]>Reviewed-by Boris Brezillon <[email protected]>Signed-off-by Boris Brezillon <[email protected]>
Quoted 6 lines
---
Hi,
This patch failed to apply on kernel stable v4.19, I'm re-sending it fixing the conflict.
Now applied, thanks.
greg k-h
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel