Module Name: src
Committed By: riastradh
Date: Sat Jul 26 06:37:53 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_fb.c
Log Message:
Fix botched conversion from ALIGN to round_up (not DIV_ROUND_UP!).
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fb.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_fb.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fb.c:1.3 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fb.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fb.c:1.3 Fri Jul 25 12:48:34 2014
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fb.c Sat Jul 26 06:37:53 2014
@@ -128,14 +128,14 @@ static int radeonfb_create_pinned_object
fb_tiled) * ((bpp + 1) / 8);
if (rdev->family >= CHIP_R600)
-#ifdef __NetBSD__
- height = DIV_ROUND_UP(mode_cmd->height, 8);
+#ifdef __NetBSD__ /* XXX ALIGN means something else. */
+ height = round_up(mode_cmd->height, 8);
#else
height = ALIGN(mode_cmd->height, 8);
#endif
size = mode_cmd->pitches[0] * height;
-#ifdef __NetBSD__
- aligned_size = DIV_ROUND_UP (size, PAGE_SIZE);
+#ifdef __NetBSD__ /* XXX ALIGN means something else. */
+ aligned_size = round_up(size, PAGE_SIZE);
#else
aligned_size = ALIGN(size, PAGE_SIZE);
#endif
