Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/external/bsd/drm2/dist/drm drm/gem: Narrow scope of #ifd...



details:   https://anonhg.NetBSD.org/src/rev/7ac426cbec1b
branches:  trunk
changeset: 1028470:7ac426cbec1b
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 11:07:28 2021 +0000

description:
drm/gem: Narrow scope of #ifdef __NetBSD__.

Need to initialize this resv.

diffstat:

 sys/external/bsd/drm2/dist/drm/drm_gem.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (35 lines):

diff -r 6e7f0499b109 -r 7ac426cbec1b sys/external/bsd/drm2/dist/drm/drm_gem.c
--- a/sys/external/bsd/drm2/dist/drm/drm_gem.c  Sun Dec 19 11:07:20 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/drm_gem.c  Sun Dec 19 11:07:28 2021 +0000
@@ -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 @@
        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
 }



Home | Main Index | Thread Index | Old Index