diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2019-09-14 16:27:16 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2019-09-14 16:27:16 -0400 |
| commit | 679eb2d8b547a7c080ad5249775d905deaa937e8 (patch) | |
| tree | e51cd0d130562f61e0ec8b4e2789a9523416c6e1 | |
| parent | 9c6fd2bdac2f788594bb4771f5b9cb33f89d0b7b (diff) | |
| download | longterm-queue-4.18-679eb2d8b547a7c080ad5249775d905deaa937e8.tar.gz | |
drm: drop vc4 commit n/a for 4.18.x
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/drm-vc4-fix-fb-references-in-async-update.patch | 38 | ||||
| -rw-r--r-- | queue/series | 1 |
2 files changed, 0 insertions, 39 deletions
diff --git a/queue/drm-vc4-fix-fb-references-in-async-update.patch b/queue/drm-vc4-fix-fb-references-in-async-update.patch deleted file mode 100644 index ea1786c..0000000 --- a/queue/drm-vc4-fix-fb-references-in-async-update.patch +++ /dev/null @@ -1,38 +0,0 @@ -From c16b85559dcfb5a348cc085a7b4c75ed49b05e2c Mon Sep 17 00:00:00 2001 -From: Helen Koike <helen.koike@collabora.com> -Date: Mon, 3 Jun 2019 13:56:09 -0300 -Subject: [PATCH] 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(). - -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> -Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com> -Link: https://patchwork.freedesktop.org/patch/msgid/20190603165610.24614-5-helen.koike@collabora.com - -diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c -index 4d918d3e4858..afc80b245ea3 100644 ---- a/drivers/gpu/drm/vc4/vc4_plane.c -+++ b/drivers/gpu/drm/vc4/vc4_plane.c -@@ -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; --- -2.7.4 - diff --git a/queue/series b/queue/series index 6c98042..b0a6200 100644 --- a/queue/series +++ b/queue/series @@ -106,7 +106,6 @@ usb-typec-fusb302-Check-vconn-is-off-when-we-start-t.patch soc-renesas-Identify-R-Car-M3-W-ES1.3.patch gpio-vf610-Do-not-share-irq_chip.patch percpu-do-not-search-past-bitmap-when-allocating-an-.patch -drm-vc4-fix-fb-references-in-async-update.patch ALSA-seq-Cover-unsubscribe_port-in-list_mutex.patch tcp-limit-payload-size-of-sacked-skbs.patch tcp-tcp_fragment-should-apply-sane-memory-limits.patch |