[src/trunk]: src/sys/external/bsd/drm2/dist/drm/radeon ALIGN -> round_up

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

details:   https://anonhg.NetBSD.org/src/rev/519584d359ce
branches:  trunk
changeset: 992811:519584d359ce
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 07:52:20 2018 +0000

description:
ALIGN -> round_up

diffstat:

 sys/external/bsd/drm2/dist/drm/radeon/radeon_vm.c |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (30 lines):

diff -r 52d01feef7e8 -r 519584d359ce sys/external/bsd/drm2/dist/drm/radeon/radeon_vm.c
--- a/sys/external/bsd/drm2/dist/drm/radeon/radeon_vm.c Mon Aug 27 07:52:10 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/radeon/radeon_vm.c Mon Aug 27 07:52:20 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: radeon_vm.c,v 1.4 2018/08/27 07:52:10 riastradh Exp $  */
+/*     $NetBSD: radeon_vm.c,v 1.5 2018/08/27 07:52:20 riastradh Exp $  */
 
 /*
  * Copyright 2008 Advanced Micro Devices, Inc.
@@ -28,7 +28,7 @@
  *          Jerome Glisse
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeon_vm.c,v 1.4 2018/08/27 07:52:10 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_vm.c,v 1.5 2018/08/27 07:52:20 riastradh Exp $");
 
 #include <drm/drmP.h>
 #include <drm/radeon_drm.h>
@@ -763,7 +763,11 @@
        uint64_t frag_align = ((rdev->family == CHIP_CAYMAN) ||
                               (rdev->family == CHIP_ARUBA)) ? 0x200 : 0x80;
 
+#ifdef __NetBSD__              /* XXX ALIGN means something else */
+       uint64_t frag_start = round_up(pe_start, frag_align);
+#else
        uint64_t frag_start = ALIGN(pe_start, frag_align);
+#endif
        uint64_t frag_end = pe_end & ~(frag_align - 1);
 
        unsigned count;