diff options
| -rw-r--r-- | dma-buf-fix-reservation_object_wait_timeout_rcu-once-more-v2.patch | 62 | ||||
| -rw-r--r-- | gitrev | 2 | ||||
| -rw-r--r-- | kernel.spec | 10 | ||||
| -rw-r--r-- | sources | 2 |
4 files changed, 73 insertions, 3 deletions
diff --git a/dma-buf-fix-reservation_object_wait_timeout_rcu-once-more-v2.patch b/dma-buf-fix-reservation_object_wait_timeout_rcu-once-more-v2.patch new file mode 100644 index 000000000..6e40c3da3 --- /dev/null +++ b/dma-buf-fix-reservation_object_wait_timeout_rcu-once-more-v2.patch @@ -0,0 +1,62 @@ +From patchwork Mon Jan 22 20:00:03 2018 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 8bit +Subject: dma-buf: fix reservation_object_wait_timeout_rcu once more v2 +From: =?UTF-8?q?Christian=20K=C3=B6nig?= <ckoenig.leichtzumerken@gmail.com> +X-Patchwork-Id: 199865 +Message-Id: <20180122200003.6665-1-christian.koenig@amd.com> +To: dri-devel@lists.freedesktop.org, chris@chris-wilson.co.uk, lyude@redhat.com +Date: Mon, 22 Jan 2018 21:00:03 +0100 + +We need to set shared_count even if we already have a fence to wait for. + +v2: init i to -1 as well + +Signed-off-by: Christian König <christian.koenig@amd.com> +Cc: stable@vger.kernel.org +Tested-by: Lyude Paul <lyude@redhat.com> +Reviewed-by: Lyude Paul <lyude@redhat.com> +Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> +--- + drivers/dma-buf/reservation.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/drivers/dma-buf/reservation.c b/drivers/dma-buf/reservation.c +index 461afa9febd4..314eb1071cce 100644 +--- a/drivers/dma-buf/reservation.c ++++ b/drivers/dma-buf/reservation.c +@@ -484,13 +484,15 @@ long reservation_object_wait_timeout_rcu(struct reservation_object *obj, + unsigned long timeout) + { + struct dma_fence *fence; +- unsigned seq, shared_count, i = 0; ++ unsigned seq, shared_count; + long ret = timeout ? timeout : 1; ++ int i; + + retry: + shared_count = 0; + seq = read_seqcount_begin(&obj->seq); + rcu_read_lock(); ++ i = -1; + + fence = rcu_dereference(obj->fence_excl); + if (fence && !test_bit(DMA_FENCE_FLAG_SIGNALED_BIT, &fence->flags)) { +@@ -506,14 +508,14 @@ long reservation_object_wait_timeout_rcu(struct reservation_object *obj, + fence = NULL; + } + +- if (!fence && wait_all) { ++ if (wait_all) { + struct reservation_object_list *fobj = + rcu_dereference(obj->fence); + + if (fobj) + shared_count = fobj->shared_count; + +- for (i = 0; i < shared_count; ++i) { ++ for (i = 0; !fence && i < shared_count; ++i) { + struct dma_fence *lfence = rcu_dereference(fobj->shared[i]); + + if (test_bit(DMA_FENCE_FLAG_SIGNALED_BIT, @@ -1 +1 @@ -5b7d27967dabfb17c21b0d98b29153b9e3ee71e5 +993ca2068b043dc3c933a8a4fe1052b77fe63f10 diff --git a/kernel.spec b/kernel.spec index 17b5e1b7f..97134830a 100644 --- a/kernel.spec +++ b/kernel.spec @@ -77,7 +77,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 9 # The git snapshot level -%define gitrev 3 +%define gitrev 4 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -659,6 +659,8 @@ Patch641: 0001-Bluetooth-btusb-Disable-autosuspend-on-QCA-Rome-devi.patch # Speculative Execution patches Patch642: prevent-bounds-check-bypass-via-speculative-execution.patch +# Fix crash on Xwayland using nouveau +Patch650: dma-buf-fix-reservation_object_wait_timeout_rcu-once-more-v2.patch # END OF PATCH DEFINITIONS @@ -1921,6 +1923,12 @@ fi # # %changelog +* Fri Jan 26 2018 Justin M. Forbes <jforbes@fedoraproject.org> +- Fix crash on Xwayland using nouveau + +* Fri Jan 26 2018 Laura Abbott <labbott@redhat.com> - 4.15.0-0.rc9.git4.1 +- Linux v4.15-rc9-67-g993ca2068b04 + * Thu Jan 25 2018 Laura Abbott <labbott@redhat.com> - 4.15.0-0.rc9.git3.1 - Linux v4.15-rc9-55-g5b7d27967dab @@ -1,4 +1,4 @@ SHA512 (linux-4.14.tar.xz) = 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8 SHA512 (perf-man-4.14.tar.gz) = 76a9d8adc284cdffd4b3fbb060e7f9a14109267707ce1d03f4c3239cd70d8d164f697da3a0f90a363fbcac42a61d3c378afbcc2a86f112c501b9cb5ce74ef9f8 SHA512 (patch-4.15-rc9.xz) = 1b26350365d680bfa2bd5b38526aed8547e856a84168bdbca6e118b8181a68a2deb5bb5335325a4a2ffe33508eabdb01893bcdc85c90314746e8d399aac33be0 -SHA512 (patch-4.15-rc9-git3.xz) = 2730959d8348c9022579fa0157f9cbc83f22d26c81e2ec7224fed3ec92f37a8c34a5b6df319766921c32b86935a9ae434a75bb8ae2605fd67eff873357856bbd +SHA512 (patch-4.15-rc9-git4.xz) = f4be11147335d15008d07388f4ad6f040c6f0ef336921a1d82b34beb8e68380ba7cf7a424a1f519243121da58ad02a8c1cc62c9b79ca49e9cfdc7c74d85faf2f |