[src/trunk]: src/sys/external/bsd/drm2/linux dma_resv_reserve_shared takes on...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1f5399e71429
branches:  trunk
changeset: 1028320:1f5399e71429
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 10:37:47 2021 +0000

description:
dma_resv_reserve_shared takes one more argument, num_fences

Fortunately it's ~always 1, and (XXX) I assume our implementation
assumes this, too. But assert it.


Author: Maya Rashish <maya%NetBSD.org@localhost>

diffstat:

 sys/external/bsd/drm2/include/linux/dma-resv.h |  4 ++--
 sys/external/bsd/drm2/linux/linux_dma_resv.c   |  7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diffs (51 lines):

diff -r 002a11b3a26f -r 1f5399e71429 sys/external/bsd/drm2/include/linux/dma-resv.h
--- a/sys/external/bsd/drm2/include/linux/dma-resv.h    Sun Dec 19 10:37:40 2021 +0000
+++ b/sys/external/bsd/drm2/include/linux/dma-resv.h    Sun Dec 19 10:37:47 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dma-resv.h,v 1.6 2021/12/19 10:36:55 riastradh Exp $   */
+/*     $NetBSD: dma-resv.h,v 1.7 2021/12/19 10:37:47 riastradh Exp $   */
 
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -108,7 +108,7 @@
        dma_resv_get_excl(struct dma_resv *);
 struct dma_resv_list *
        dma_resv_get_list(struct dma_resv *);
-int    dma_resv_reserve_shared(struct dma_resv *);
+int    dma_resv_reserve_shared(struct dma_resv *, unsigned int);
 void   dma_resv_add_excl_fence(struct dma_resv *,
            struct dma_fence *);
 void   dma_resv_add_shared_fence(struct dma_resv *,
diff -r 002a11b3a26f -r 1f5399e71429 sys/external/bsd/drm2/linux/linux_dma_resv.c
--- a/sys/external/bsd/drm2/linux/linux_dma_resv.c      Sun Dec 19 10:37:40 2021 +0000
+++ b/sys/external/bsd/drm2/linux/linux_dma_resv.c      Sun Dec 19 10:37:47 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: linux_dma_resv.c,v 1.2 2021/12/19 10:36:55 riastradh Exp $     */
+/*     $NetBSD: linux_dma_resv.c,v 1.3 2021/12/19 10:37:47 riastradh Exp $     */
 
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_dma_resv.c,v 1.2 2021/12/19 10:36:55 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_dma_resv.c,v 1.3 2021/12/19 10:37:47 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/poll.h>
@@ -278,12 +278,13 @@
  *     we don't have enough.  This is not guaranteed.
  */
 int
-dma_resv_reserve_shared(struct dma_resv *robj)
+dma_resv_reserve_shared(struct dma_resv *robj, unsigned int num_fences)
 {
        struct dma_resv_list *list, *prealloc;
        uint32_t n, nalloc;
 
        KASSERT(dma_resv_held(robj));
+       KASSERT(num_fences == 1);
 
        list = robj->fence;
        prealloc = robj->robj_prealloc;