Module Name: src
Committed By: riastradh
Date: Sun Dec 19 10:37:47 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/include/linux: dma-resv.h
src/sys/external/bsd/drm2/linux: linux_dma_resv.c
Log Message:
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 <m...@netbsd.org>
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/drm2/include/linux/dma-resv.h
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/linux/linux_dma_resv.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/include/linux/dma-resv.h
diff -u src/sys/external/bsd/drm2/include/linux/dma-resv.h:1.6 src/sys/external/bsd/drm2/include/linux/dma-resv.h:1.7
--- src/sys/external/bsd/drm2/include/linux/dma-resv.h:1.6 Sun Dec 19 10:36:55 2021
+++ src/sys/external/bsd/drm2/include/linux/dma-resv.h Sun Dec 19 10:37:47 2021
@@ -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 @@ struct dma_fence *
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 *,
Index: src/sys/external/bsd/drm2/linux/linux_dma_resv.c
diff -u src/sys/external/bsd/drm2/linux/linux_dma_resv.c:1.2 src/sys/external/bsd/drm2/linux/linux_dma_resv.c:1.3
--- src/sys/external/bsd/drm2/linux/linux_dma_resv.c:1.2 Sun Dec 19 10:36:55 2021
+++ src/sys/external/bsd/drm2/linux/linux_dma_resv.c Sun Dec 19 10:37:47 2021
@@ -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 @@ dma_resv_get_list(struct dma_resv *robj)
* 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;
