Module Name: src
Committed By: riastradh
Date: Sat Apr 9 23:44:45 UTC 2022
Modified Files:
src/sys/external/bsd/drm2/linux: linux_dma_buf.c linux_dma_fence.c
linux_dma_fence_chain.c
Log Message:
drm: Convert membar_enter/exit stragglers to membar_acquire/release.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/external/bsd/drm2/linux/linux_dma_buf.c
cvs rdiff -u -r1.39 -r1.40 src/sys/external/bsd/drm2/linux/linux_dma_fence.c
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/linux/linux_dma_fence_chain.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/linux/linux_dma_buf.c
diff -u src/sys/external/bsd/drm2/linux/linux_dma_buf.c:1.14 src/sys/external/bsd/drm2/linux/linux_dma_buf.c:1.15
--- src/sys/external/bsd/drm2/linux/linux_dma_buf.c:1.14 Thu Feb 17 01:38:38 2022
+++ src/sys/external/bsd/drm2/linux/linux_dma_buf.c Sat Apr 9 23:44:44 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_dma_buf.c,v 1.14 2022/02/17 01:38:38 riastradh Exp $ */
+/* $NetBSD: linux_dma_buf.c,v 1.15 2022/04/09 23:44:44 riastradh Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_dma_buf.c,v 1.14 2022/02/17 01:38:38 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_dma_buf.c,v 1.15 2022/04/09 23:44:44 riastradh Exp $");
#include <sys/types.h>
#include <sys/atomic.h>
@@ -160,10 +160,10 @@ void
dma_buf_put(struct dma_buf *dmabuf)
{
- membar_exit();
+ membar_release();
if (atomic_dec_uint_nv(&dmabuf->db_refcnt) != 0)
return;
- membar_enter();
+ membar_acquire();
dma_resv_poll_fini(&dmabuf->db_resv_poll);
mutex_destroy(&dmabuf->db_lock);
Index: src/sys/external/bsd/drm2/linux/linux_dma_fence.c
diff -u src/sys/external/bsd/drm2/linux/linux_dma_fence.c:1.39 src/sys/external/bsd/drm2/linux/linux_dma_fence.c:1.40
--- src/sys/external/bsd/drm2/linux/linux_dma_fence.c:1.39 Sun Dec 19 12:39:40 2021
+++ src/sys/external/bsd/drm2/linux/linux_dma_fence.c Sat Apr 9 23:44:44 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_dma_fence.c,v 1.39 2021/12/19 12:39:40 riastradh Exp $ */
+/* $NetBSD: linux_dma_fence.c,v 1.40 2022/04/09 23:44:44 riastradh Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_dma_fence.c,v 1.39 2021/12/19 12:39:40 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_dma_fence.c,v 1.40 2022/04/09 23:44:44 riastradh Exp $");
#include <sys/atomic.h>
#include <sys/condvar.h>
@@ -245,9 +245,9 @@ dma_fence_context_alloc(unsigned n)
} S;
uint64_t c;
- while (__predict_false(atomic_cas_uint(&S.lock, 0, 1) != 0))
+ while (__predict_false(atomic_swap_uint(&S.lock, 1)))
SPINLOCK_BACKOFF_HOOK;
- membar_enter();
+ membar_acquire();
c = S.context;
S.context += n;
atomic_store_release(&S.lock, 0);
Index: src/sys/external/bsd/drm2/linux/linux_dma_fence_chain.c
diff -u src/sys/external/bsd/drm2/linux/linux_dma_fence_chain.c:1.3 src/sys/external/bsd/drm2/linux/linux_dma_fence_chain.c:1.4
--- src/sys/external/bsd/drm2/linux/linux_dma_fence_chain.c:1.3 Sun Dec 19 12:39:32 2021
+++ src/sys/external/bsd/drm2/linux/linux_dma_fence_chain.c Sat Apr 9 23:44:44 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_dma_fence_chain.c,v 1.3 2021/12/19 12:39:32 riastradh Exp $ */
+/* $NetBSD: linux_dma_fence_chain.c,v 1.4 2022/04/09 23:44:44 riastradh Exp $ */
/*-
* Copyright (c) 2021 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_dma_fence_chain.c,v 1.3 2021/12/19 12:39:32 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_dma_fence_chain.c,v 1.4 2022/04/09 23:44:44 riastradh Exp $");
#include <sys/types.h>
@@ -262,7 +262,7 @@ dma_fence_chain_walk(struct dma_fence *f
break;
splice = NULL;
}
- membar_exit(); /* pairs with dma_fence_get_rcu_safe */
+ membar_release(); /* pairs with dma_fence_get_rcu_safe */
if (atomic_cas_ptr(&chain->dfc_prev, prev, splice) == prev)
dma_fence_put(prev); /* transferred to splice */
else
