[src/trunk]: src/sys/external/bsd/drm2/dist/drm/ttm Fix merge botch: do uvm_o...

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

details:   https://anonhg.NetBSD.org/src/rev/5669dab7349e
branches:  trunk
changeset: 1028483:5669dab7349e
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 11:09:02 2021 +0000

description:
Fix merge botch: do uvm_obj_init unconditionally.

diffstat:

 sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (33 lines):

diff -r e5615efb8da4 -r 5669dab7349e sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c
--- a/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c       Sun Dec 19 11:08:55 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c       Sun Dec 19 11:09:02 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ttm_bo.c,v 1.26 2021/12/19 11:07:20 riastradh Exp $    */
+/*     $NetBSD: ttm_bo.c,v 1.27 2021/12/19 11:09:02 riastradh Exp $    */
 
 /* SPDX-License-Identifier: GPL-2.0 OR MIT */
 /**************************************************************************
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ttm_bo.c,v 1.26 2021/12/19 11:07:20 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ttm_bo.c,v 1.27 2021/12/19 11:09:02 riastradh Exp $");
 
 #define pr_fmt(fmt) "[TTM] " fmt
 
@@ -1362,11 +1362,13 @@
                dma_resv_init(&bo->base._resv);
 #ifdef __NetBSD__
                drm_vma_node_init(&bo->base.vma_node);
-               uvm_obj_init(&bo->uvmobj, bdev->driver->ttm_uvm_ops, true, 1);
 #else
                drm_vma_node_reset(&bo->base.vma_node);
 #endif
        }
+#ifdef __NetBSD__
+       uvm_obj_init(&bo->uvmobj, bdev->driver->ttm_uvm_ops, true, 1);
+#endif
        atomic_inc(&ttm_bo_glob.bo_count);
 
        /*