Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Zimmermann <tzimmermann@suse.de>2019-10-01 08:53:33 +0200
committerThomas Zimmermann <tzimmermann@suse.de>2019-10-01 08:53:33 +0200
commit1cd88ecb8bcf1fc04599f17c1c451d5eb3389824 (patch)
treea5655ec831acf71c80cf2710b224e7ac2ffaa4c8
parent5ad68641362dbaf10c350b3f17242e29a4ee80ab (diff)
drm/mgag200: Pin displayed cursor BO to video memory (bsc#1152472)
-rw-r--r--patches.suse/0002-drm-mgag200-Pin-displayed-cursor-BO-to-video-memory.patch39
-rw-r--r--series.conf1
2 files changed, 40 insertions, 0 deletions
diff --git a/patches.suse/0002-drm-mgag200-Pin-displayed-cursor-BO-to-video-memory.patch b/patches.suse/0002-drm-mgag200-Pin-displayed-cursor-BO-to-video-memory.patch
new file mode 100644
index 0000000000..8bb57c48cb
--- /dev/null
+++ b/patches.suse/0002-drm-mgag200-Pin-displayed-cursor-BO-to-video-memory.patch
@@ -0,0 +1,39 @@
+From a0fd72d2c95b56c78feec0867f2077b5ff5991e6 Mon Sep 17 00:00:00 2001
+From: Thomas Zimmermann <tzimmermann@suse.de>
+Date: Tue, 23 Jul 2019 09:54:23 +0200
+Subject: drm/mgag200: Pin displayed cursor BO to video memory
+Git-commit: a0fd72d2c95b56c78feec0867f2077b5ff5991e6
+Patch-mainline: v5.4-rc1
+References: bsc#1152472
+
+The cursor BO has to be pinned to video ram while it's being displayed.
+With the current code, the BO might be pinned to system memory instead.
+The patch fixes this problem.
+
+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-2-tzimmermann@suse.de
+Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
+---
+ drivers/gpu/drm/mgag200/mgag200_cursor.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/gpu/drm/mgag200/mgag200_cursor.c b/drivers/gpu/drm/mgag200/mgag200_cursor.c
+index 13f32df7e357..a19975931c6d 100644
+--- a/drivers/gpu/drm/mgag200/mgag200_cursor.c
++++ b/drivers/gpu/drm/mgag200/mgag200_cursor.c
+@@ -99,7 +99,7 @@ int mga_crtc_cursor_set(struct drm_crtc *crtc,
+ }
+
+ /* Pin and map up-coming buffer to write colour indices */
+- ret = drm_gem_vram_pin(pixels_next, 0);
++ ret = drm_gem_vram_pin(pixels_next, DRM_GEM_VRAM_PL_FLAG_VRAM);
+ if (ret) {
+ dev_err(&dev->pdev->dev,
+ "failed to pin cursor buffer: %d\n", ret);
+--
+2.23.0
+
diff --git a/series.conf b/series.conf
index fa76891b02..da36a4a3cb 100644
--- a/series.conf
+++ b/series.conf
@@ -96,6 +96,7 @@
patches.suse/0001-drm-mgag200-add-in-missing-around-if-block.patch
patches.suse/0004-drm-panel-make-drm_panel.h-self-contained.patch
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/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