Home Home > GIT Browse > openSUSE-15.1
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Zimmermann <tzimmermann@suse.de>2019-01-10 15:55:07 +0100
committerThomas Zimmermann <tzimmermann@suse.de>2019-01-11 13:41:54 +0100
commit7ad23ef958c1ed9af0e01ecb87f546371229e9ce (patch)
tree0dd5bdf6e240614d4c48854981bf92dfe2d910e3
parentab32c58be361bc062fc2c9bec8346aa6356581ce (diff)
dma-buf: Remove requirement for ops->map() from dma_buf_export (bsc#1113956)
-rw-r--r--patches.drm/0031-dma-buf-Remove-requirement-for-ops-map-from-dma_buf_.patch36
-rw-r--r--series.conf1
2 files changed, 37 insertions, 0 deletions
diff --git a/patches.drm/0031-dma-buf-Remove-requirement-for-ops-map-from-dma_buf_.patch b/patches.drm/0031-dma-buf-Remove-requirement-for-ops-map-from-dma_buf_.patch
new file mode 100644
index 0000000000..ba848cc74d
--- /dev/null
+++ b/patches.drm/0031-dma-buf-Remove-requirement-for-ops-map-from-dma_buf_.patch
@@ -0,0 +1,36 @@
+From f82aab2d521e4c1d4f9f98450b4a9a8abeaff1c4 Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Tue, 7 Aug 2018 19:36:47 +0100
+Subject: dma-buf: Remove requirement for ops->map() from dma_buf_export
+Git-commit: f82aab2d521e4c1d4f9f98450b4a9a8abeaff1c4
+Patch-mainline: v4.20-rc1
+References: bsc#1113956
+
+Since commit 9ea0dfbf972 ("dma-buf: make map_atomic and map function
+pointers optional"), the core provides the no-op functions when map and
+map_atomic are not provided, so we no longer need assert that are
+supplied by a dma-buf exporter.
+
+Fixes: 09ea0dfbf972 ("dma-buf: make map_atomic and map function pointers optional")
+Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
+Link: http://patchwork.freedesktop.org/patch/msgid/20180807183647.22626-1-chris@chris-wilson.co.uk
+Cc: Daniel Vetter <daniel@ffwll.ch>
+Cc: Gerd Hoffmann <kraxel@redhat.com>
+Cc: Sumit Semwal <sumit.semwal@linaro.org>
+Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
+Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
+---
+ drivers/dma-buf/dma-buf.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/drivers/dma-buf/dma-buf.c
++++ b/drivers/dma-buf/dma-buf.c
+@@ -406,7 +406,6 @@ struct dma_buf *dma_buf_export(const str
+ || !exp_info->ops->unmap_dma_buf
+ || !exp_info->ops->release
+ || !exp_info->ops->map_atomic
+- || !exp_info->ops->map
+ || !exp_info->ops->mmap)) {
+ return ERR_PTR(-EINVAL);
+ }
diff --git a/series.conf b/series.conf
index 89bc9654e4..f4d739cb53 100644
--- a/series.conf
+++ b/series.conf
@@ -40802,6 +40802,7 @@
patches.suse/0005-watchdog-hpwdt-Update-version-number.patch
patches.suse/0006-watchdog-hpwdt-Disable-PreTimeout-when-Timeout-is-sm.patch
patches.drm/0001-drm-sti-do-not-remove-the-drm_bridge-that-was-never-.patch
+ patches.drm/0031-dma-buf-Remove-requirement-for-ops-map-from-dma_buf_.patch
patches.drm/0001-drm-cirrus-Use-drm_framebuffer_put-to-avoid-kernel-o.patch
patches.drm/0001-drm-virtio-fix-bounds-check-in-virtio_gpu_cmd_get_ca.patch
patches.drm/drm-rockchip-Allow-driver-to-be-shutdown-on-reboot-k.patch