[src/trunk]: src/sys/external/bsd/drm2/dist/drm/ttm combine a pair of #ifdef'...

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

details:   https://anonhg.NetBSD.org/src/rev/46decd0ccadf
branches:  trunk
changeset: 838848:46decd0ccadf
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sat Feb 02 21:46:27 2019 +0000

description:
combine a pair of #ifdef's and make upstream diff slightly less ugly.  NFCI.

diffstat:

 sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c |  10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diffs (38 lines):

diff -r 2072eb3eef7f -r 46decd0ccadf sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c
--- a/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c       Sat Feb 02 19:02:59 2019 +0000
+++ b/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c       Sat Feb 02 21:46:27 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ttm_bo.c,v 1.14 2018/08/27 15:32:39 riastradh Exp $    */
+/*     $NetBSD: ttm_bo.c,v 1.15 2019/02/02 21:46:27 mrg Exp $  */
 
 /**************************************************************************
  *
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ttm_bo.c,v 1.14 2018/08/27 15:32:39 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ttm_bo.c,v 1.15 2019/02/02 21:46:27 mrg Exp $");
 
 #define pr_fmt(fmt) "[TTM] " fmt
 
@@ -1624,10 +1624,6 @@
 
 void ttm_bo_unmap_virtual_locked(struct ttm_buffer_object *bo)
 {
-#ifndef __NetBSD__
-       struct ttm_bo_device *bdev = bo->bdev;
-#endif
-
 #ifdef __NetBSD__
        if (bo->mem.bus.is_iomem) {
                paddr_t start, end, pa;
@@ -1654,6 +1650,8 @@
                mutex_exit(bo->uvmobj.vmobjlock);
        }
 #else
+       struct ttm_bo_device *bdev = bo->bdev;
+
        drm_vma_node_unmap(&bo->vma_node, bdev->dev_mapping);
 #endif
        ttm_mem_io_free_vm(bo);