[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 Nix another conditional ...

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

details:   https://anonhg.NetBSD.org/src/rev/7797be470cc2
branches:  trunk
changeset: 744853:7797be470cc2
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Fri Feb 14 09:39:57 2020 +0000

description:
Nix another conditional ALIGN.

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/intel_fbdev.c |  10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)

diffs (40 lines):

diff -r 8b5c1be8ffc0 -r 7797be470cc2 sys/external/bsd/drm2/dist/drm/i915/intel_fbdev.c
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_fbdev.c Fri Feb 14 09:39:37 2020 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_fbdev.c Fri Feb 14 09:39:57 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intel_fbdev.c,v 1.11 2020/02/14 09:39:37 riastradh Exp $       */
+/*     $NetBSD: intel_fbdev.c,v 1.12 2020/02/14 09:39:57 riastradh Exp $       */
 
 /*
  * Copyright © 2007 David Airlie
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_fbdev.c,v 1.11 2020/02/14 09:39:37 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_fbdev.c,v 1.12 2020/02/14 09:39:57 riastradh Exp $");
 
 #include <linux/async.h>
 #include <linux/module.h>
@@ -53,6 +53,7 @@
 
 #ifdef __NetBSD__
 #include "intelfb.h"
+#include <linux/nbsd-namespace.h>
 #endif
 
 #ifndef __NetBSD__
@@ -145,13 +146,8 @@
        mode_cmd.width = sizes->surface_width;
        mode_cmd.height = sizes->surface_height;
 
-#ifdef __NetBSD__
-       mode_cmd.pitches[0] = round_up(mode_cmd.width *
-                                   DIV_ROUND_UP(sizes->surface_bpp, 8), 64);
-#else
        mode_cmd.pitches[0] = ALIGN(mode_cmd.width *
                                    DIV_ROUND_UP(sizes->surface_bpp, 8), 64);
-#endif
        mode_cmd.pixel_format = drm_mode_legacy_fb_format(sizes->surface_bpp,
                                                          sizes->surface_depth);