Module Name: src
Committed By: riastradh
Date: Sun Dec 19 11:07:28 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm: drm_gem.c
Log Message:
drm/gem: Narrow scope of #ifdef __NetBSD__.
Need to initialize this resv.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/external/bsd/drm2/dist/drm/drm_gem.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/dist/drm/drm_gem.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_gem.c:1.19 src/sys/external/bsd/drm2/dist/drm/drm_gem.c:1.20
--- src/sys/external/bsd/drm2/dist/drm/drm_gem.c:1.19 Sun Dec 19 11:00:28 2021
+++ src/sys/external/bsd/drm2/dist/drm/drm_gem.c Sun Dec 19 11:07:28 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_gem.c,v 1.19 2021/12/19 11:00:28 riastradh Exp $ */
+/* $NetBSD: drm_gem.c,v 1.20 2021/12/19 11:07:28 riastradh Exp $ */
/*
* Copyright © 2008 Intel Corporation
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_gem.c,v 1.19 2021/12/19 11:00:28 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_gem.c,v 1.20 2021/12/19 11:07:28 riastradh Exp $");
#include <linux/types.h>
#include <linux/slab.h>
@@ -196,13 +196,13 @@ void drm_gem_private_object_init(struct
kref_init(&obj->refcount);
obj->handle_count = 0;
obj->size = size;
-#ifdef __NetBSD__
- drm_vma_node_init(&obj->vma_node);
-#else
dma_resv_init(&obj->_resv);
if (!obj->resv)
obj->resv = &obj->_resv;
+#ifdef __NetBSD__
+ drm_vma_node_init(&obj->vma_node);
+#else
drm_vma_node_reset(&obj->vma_node);
#endif
}
