Module Name: src
Committed By: riastradh
Date: Mon Aug 27 07:52:20 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_vm.c
Log Message:
ALIGN -> round_up
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_vm.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/radeon/radeon_vm.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_vm.c:1.4 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_vm.c:1.5
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_vm.c:1.4 Mon Aug 27 07:52:10 2018
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_vm.c Mon Aug 27 07:52:20 2018
@@ -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 @@ static void radeon_vm_frag_ptes(struct r
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;
