Module Name: src
Committed By: riastradh
Date: Fri Feb 14 09:39:57 UTC 2020
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: intel_fbdev.c
Log Message:
Nix another conditional ALIGN.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
src/sys/external/bsd/drm2/dist/drm/i915/intel_fbdev.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/i915/intel_fbdev.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_fbdev.c:1.11 src/sys/external/bsd/drm2/dist/drm/i915/intel_fbdev.c:1.12
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_fbdev.c:1.11 Fri Feb 14 09:39:37 2020
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_fbdev.c Fri Feb 14 09:39:57 2020
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: intel_fbdev.
#ifdef __NetBSD__
#include "intelfb.h"
+#include <linux/nbsd-namespace.h>
#endif
#ifndef __NetBSD__
@@ -145,13 +146,8 @@ static int intelfb_alloc(struct drm_fb_h
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);
