Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Zimmermann <tzimmermann@suse.de>2019-10-01 08:54:07 +0200
committerThomas Zimmermann <tzimmermann@suse.de>2019-10-01 08:54:07 +0200
commit6389bb6fdfab89f406b719d1c65e6a09a646ef31 (patch)
tree90805cff26dbe94c58acd56971256d53150555b3
parentfba11f20a1841ba1cc3785eddcca34958b361969 (diff)
drm/mgag200: Don't unpin the current cursor image's buffer. (bsc#1152472)
-rw-r--r--patches.suse/0004-drm-mgag200-Don-t-unpin-the-current-cursor-image-s-b.patch39
-rw-r--r--series.conf1
2 files changed, 40 insertions, 0 deletions
diff --git a/patches.suse/0004-drm-mgag200-Don-t-unpin-the-current-cursor-image-s-b.patch b/patches.suse/0004-drm-mgag200-Don-t-unpin-the-current-cursor-image-s-b.patch
new file mode 100644
index 0000000000..1140a2ad5d
--- /dev/null
+++ b/patches.suse/0004-drm-mgag200-Don-t-unpin-the-current-cursor-image-s-b.patch
@@ -0,0 +1,39 @@
+From a9c342ab77ab6e8ab662105335ae1e44e01271d4 Mon Sep 17 00:00:00 2001
+From: Thomas Zimmermann <tzimmermann@suse.de>
+Date: Tue, 23 Jul 2019 09:54:25 +0200
+Subject: drm/mgag200: Don't unpin the current cursor image's buffer.
+Git-commit: a9c342ab77ab6e8ab662105335ae1e44e01271d4
+Patch-mainline: v5.4-rc1
+References: bsc#1152472
+
+Currently the displayed cursor buffer might be evicted from video memory.
+Not unpinning the BO fixes this problem. At this point, pixels_current
+also references the BO and it will be unpinned during the next cursor
+update.
+
+Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
+Acked-by: Sam Ravnborg <sam@ravnborg.org>
+Fixes: 94dc57b10399 ("drm/mgag200: Rewrite cursor handling")
+Cc: Gerd Hoffmann <kraxel@redhat.com>
+Cc: Dave Airlie <airlied@redhat.com>
+Link: https://patchwork.freedesktop.org/patch/msgid/20190723075425.24028-4-tzimmermann@suse.de
+Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
+---
+ drivers/gpu/drm/mgag200/mgag200_cursor.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/drivers/gpu/drm/mgag200/mgag200_cursor.c b/drivers/gpu/drm/mgag200/mgag200_cursor.c
+index f11b862cbed9..289ce3e29032 100644
+--- a/drivers/gpu/drm/mgag200/mgag200_cursor.c
++++ b/drivers/gpu/drm/mgag200/mgag200_cursor.c
+@@ -213,7 +213,6 @@ int mga_crtc_cursor_set(struct drm_crtc *crtc,
+ mdev->cursor.pixels_current = pixels_next;
+
+ drm_gem_vram_kunmap(pixels_next);
+- drm_gem_vram_unpin(pixels_next);
+ drm_gem_vram_kunmap(gbo);
+ drm_gem_vram_unpin(gbo);
+ drm_gem_object_put_unlocked(obj);
+--
+2.23.0
+
diff --git a/series.conf b/series.conf
index bdddd95133..28edff3678 100644
--- a/series.conf
+++ b/series.conf
@@ -98,6 +98,7 @@
patches.suse/0001-video-ssd1307fb-Start-page-range-at-page_offset.patch
patches.suse/0002-drm-mgag200-Pin-displayed-cursor-BO-to-video-memory.patch
patches.suse/0003-drm-mgag200-Set-cursor-scanout-address-to-correct-BO.patch
+ patches.suse/0004-drm-mgag200-Don-t-unpin-the-current-cursor-image-s-b.patch
patches.suse/0005-drm-bridge-sii902x-fix-missing-reference-to-mclk-clo.patch
patches.suse/0001-drm-syncobj-fix-leaking-dma_fence-in-drm_syncobj_que.patch
patches.suse/0002-drm-mali-dp-Mark-expected-switch-fall-through.patch