[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 round_up, not ALIGN.

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

details:   https://anonhg.NetBSD.org/src/rev/b96e2044151c
branches:  trunk
changeset: 835039:b96e2044151c
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 07:24:01 2018 +0000

description:
round_up, not ALIGN.

diffstat:

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

diffs (30 lines):

diff -r 3af67631f3b9 -r b96e2044151c sys/external/bsd/drm2/dist/drm/i915/intel_lrc.c
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_lrc.c   Mon Aug 27 07:23:50 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_lrc.c   Mon Aug 27 07:24:01 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intel_lrc.c,v 1.3 2018/08/27 07:23:50 riastradh Exp $  */
+/*     $NetBSD: intel_lrc.c,v 1.4 2018/08/27 07:24:01 riastradh Exp $  */
 
 /*
  * Copyright © 2014 Intel Corporation
@@ -135,7 +135,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_lrc.c,v 1.3 2018/08/27 07:23:50 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_lrc.c,v 1.4 2018/08/27 07:24:01 riastradh Exp $");
 
 #include <drm/drmP.h>
 #include <drm/i915_drm.h>
@@ -1198,7 +1198,11 @@
                                    uint32_t offset,
                                    uint32_t start_alignment)
 {
+#ifdef __NetBSD__              /* XXX ALIGN means something else */
+       return wa_ctx->offset = round_up(offset, start_alignment);
+#else
        return wa_ctx->offset = ALIGN(offset, start_alignment);
+#endif
 }
 
 static inline int wa_ctx_end(struct i915_wa_ctx_bb *wa_ctx,