Home Home > GIT Browse > SLE15-SP1
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Zimmermann <tzimmermann@suse.de>2019-01-10 16:25:48 +0100
committerThomas Zimmermann <tzimmermann@suse.de>2019-01-17 15:28:27 +0100
commit40c6068cc2808fd1d5a3820aac4ad08c77d6cced (patch)
treec3a0035c81adffe07e8fbbd4e356f6916e5645dd
parente1ae48d883b4605456bafc1892cf4bdcace843e7 (diff)
drm/v3d: Fix prime imports of buffers from other drivers. (bsc#1113956)
-rw-r--r--patches.drm/0087-drm-v3d-Fix-prime-imports-of-buffers-from-other-driv.patch39
-rw-r--r--series.conf1
2 files changed, 40 insertions, 0 deletions
diff --git a/patches.drm/0087-drm-v3d-Fix-prime-imports-of-buffers-from-other-driv.patch b/patches.drm/0087-drm-v3d-Fix-prime-imports-of-buffers-from-other-driv.patch
new file mode 100644
index 0000000000..71e53a14e3
--- /dev/null
+++ b/patches.drm/0087-drm-v3d-Fix-prime-imports-of-buffers-from-other-driv.patch
@@ -0,0 +1,39 @@
+From 62d1a752874962f072de8a779e960fcd2ab4847b Mon Sep 17 00:00:00 2001
+From: Eric Anholt <eric@anholt.net>
+Date: Wed, 28 Nov 2018 15:09:27 -0800
+Subject: drm/v3d: Fix prime imports of buffers from other drivers.
+Git-commit: 62d1a752874962f072de8a779e960fcd2ab4847b
+Patch-mainline: v5.0-rc1
+References: bsc#1113956
+
+v3d_bo_get_pages() checks this to decide to map the imported buffer
+instead of the backing shmem file. The caller was about to set this
+value anyway, and there's no error path in between. Ideally we
+wouldn't even allocate the shmem file for our imports, but that's a
+more invasive fix.
+
+Signed-off-by: Eric Anholt <eric@anholt.net>
+Fixes: 57692c94dcbe ("drm/v3d: Introduce a new DRM driver for Broadcom V3D V3.x+")
+Link: https://patchwork.freedesktop.org/patch/msgid/20181128230927.10951-3-eric@anholt.net
+Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
+Reviewed-by: Dave Emett <david.emett@broadcom.com>
+Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
+---
+ drivers/gpu/drm/v3d/v3d_bo.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/drivers/gpu/drm/v3d/v3d_bo.c b/drivers/gpu/drm/v3d/v3d_bo.c
+index 54d96518a131..a08766d39eab 100644
+--- a/drivers/gpu/drm/v3d/v3d_bo.c
++++ b/drivers/gpu/drm/v3d/v3d_bo.c
+@@ -293,6 +293,7 @@ v3d_prime_import_sg_table(struct drm_device *dev,
+ bo->resv = attach->dmabuf->resv;
+
+ bo->sgt = sgt;
++ obj->import_attach = attach;
+ v3d_bo_get_pages(bo);
+
+ v3d_mmu_insert_ptes(bo);
+--
+2.20.1
+
diff --git a/series.conf b/series.conf
index bbb9301ee1..b4e4a1395e 100644
--- a/series.conf
+++ b/series.conf
@@ -42104,6 +42104,7 @@
patches.drm/0001-drm-rcar-du-Fix-vblank-initialization.patch
patches.drm/0001-drm-rcar-du-Fix-external-clock-error-checks.patch
patches.drm/0001-drm-i915-vgpu-Disallow-loading-on-old-vGPU-hosts.patch
+ patches.drm/0087-drm-v3d-Fix-prime-imports-of-buffers-from-other-driv.patch
patches.drivers/ALSA-usb-audio-Define-registers-for-CM6206.patch
patches.drivers/ALSA-hda-ca0132-Optimize-for-non-PCI-configuration.patch
patches.drivers/ALSA-control-Consolidate-helpers-for-adding-and-repl.patch