Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-01-16 15:23:05 +0100
committerTakashi Iwai <tiwai@suse.de>2019-01-16 15:27:09 +0100
commitfb80451a568386754d0a9e7bbd8bfcd6b87f1267 (patch)
tree7fa51f466b45581e83d0c18a03c3ce35f2c27d67
parenta124c0d1eeb9653807e0ca10871bd7a7d01ea910 (diff)
dma-fence: Allow wait_any_timeout for all fences (bsc#794563).
-rw-r--r--patches.drivers/dma-fence-Allow-wait_any_timeout-for-all-fences-2.patch68
-rw-r--r--series.conf1
2 files changed, 69 insertions, 0 deletions
diff --git a/patches.drivers/dma-fence-Allow-wait_any_timeout-for-all-fences-2.patch b/patches.drivers/dma-fence-Allow-wait_any_timeout-for-all-fences-2.patch
new file mode 100644
index 0000000000..22b96e64e6
--- /dev/null
+++ b/patches.drivers/dma-fence-Allow-wait_any_timeout-for-all-fences-2.patch
@@ -0,0 +1,68 @@
+From 796422f227eef662256dcf74f609abd48cfd1cc9 Mon Sep 17 00:00:00 2001
+From: Daniel Vetter <daniel.vetter@ffwll.ch>
+Date: Thu, 3 May 2018 16:25:51 +0200
+Subject: [PATCH] dma-fence: Allow wait_any_timeout for all fences
+Mime-version: 1.0
+Content-type: text/plain; charset=UTF-8
+Content-transfer-encoding: 8bit
+Git-commit: 796422f227eef662256dcf74f609abd48cfd1cc9
+Patch-mainline: v4.19-rc1
+References: bsc#794563
+
+When this was introduced in
+
+commit a519435a96597d8cd96123246fea4ae5a6c90b02
+Author: Christian König <christian.koenig@amd.com>
+Date: Tue Oct 20 16:34:16 2015 +0200
+
+ dma-buf/fence: add fence_wait_any_timeout function v2
+
+there was a restriction added that this only works if the dma-fence
+uses the dma_fence_default_wait hook. Which works for amdgpu, which is
+the only caller. Well, until you share some buffers with e.g. i915,
+then you get an -EINVAL.
+
+But there's really no reason for this, because all drivers must
+support callbacks. The special ->wait hook is only as an optimization;
+if the driver needs to create a worker thread for an active callback,
+then it can avoid to do that if it knows that there's a process
+context available already. So ->wait is just an optimization, just
+using the logic in dma_fence_default_wait() should work for all
+drivers.
+
+Let's remove this restriction.
+
+Reviewed-by: Christian König <christian.koenig@amd.com>
+Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
+Cc: Sumit Semwal <sumit.semwal@linaro.org>
+Cc: Gustavo Padovan <gustavo@padovan.org>
+Cc: linux-media@vger.kernel.org
+Cc: linaro-mm-sig@lists.linaro.org
+Cc: Christian König <christian.koenig@amd.com>
+Cc: Alex Deucher <alexander.deucher@amd.com>
+Link: https://patchwork.freedesktop.org/patch/msgid/20180503142603.28513-4-daniel.vetter@ffwll.ch
+Acked-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ drivers/dma-buf/dma-fence.c | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/drivers/dma-buf/dma-fence.c b/drivers/dma-buf/dma-fence.c
+index dd01a1720be9..ea343f992112 100644
+--- a/drivers/dma-buf/dma-fence.c
++++ b/drivers/dma-buf/dma-fence.c
+@@ -497,11 +497,6 @@ dma_fence_wait_any_timeout(struct dma_fence **fences, uint32_t count,
+ for (i = 0; i < count; ++i) {
+ struct dma_fence *fence = fences[i];
+
+- if (fence->ops->wait != dma_fence_default_wait) {
+- ret = -EINVAL;
+- goto fence_rm_cb;
+- }
+-
+ cb[i].task = current;
+ if (dma_fence_add_callback(fence, &cb[i].base,
+ dma_fence_default_wait_cb)) {
+--
+2.20.1
+
diff --git a/series.conf b/series.conf
index c47d08d456..80acc365df 100644
--- a/series.conf
+++ b/series.conf
@@ -36547,6 +36547,7 @@
patches.drm/7880-drm-pl111-support-nomadik-lcdc-variant
patches.drivers/dma-fence-remove-fill_driver_data-callback-2.patch
patches.drivers/dma-fence-Make-enable_signaling-optional-2.patch
+ patches.drivers/dma-fence-Allow-wait_any_timeout-for-all-fences-2.patch
patches.drm/7881-drm-atomic-helper-use-old-new-state-in-drm_atomic_helper_commit_planes_on_crtc
patches.drm/7882-drm-add-drm_plane_mask
patches.drm/7883-drm-use-drm_crtc_mask