[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 With <asm/cpufeature.h>, ...

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

details:   https://anonhg.NetBSD.org/src/rev/a30dfeb1529f
branches:  trunk
changeset: 835270:a30dfeb1529f
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 13:44:29 2018 +0000

description:
With <asm/cpufeature.h>, we can now use cpu_has_pat.

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/i915_gem.c |  8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diffs (38 lines):

diff -r 0230a436901f -r a30dfeb1529f sys/external/bsd/drm2/dist/drm/i915/i915_gem.c
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c    Mon Aug 27 13:44:15 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c    Mon Aug 27 13:44:29 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i915_gem.c,v 1.48 2018/08/27 13:41:37 riastradh Exp $  */
+/*     $NetBSD: i915_gem.c,v 1.49 2018/08/27 13:44:29 riastradh Exp $  */
 
 /*
  * Copyright © 2008-2015 Intel Corporation
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_gem.c,v 1.48 2018/08/27 13:41:37 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_gem.c,v 1.49 2018/08/27 13:44:29 riastradh Exp $");
 
 #ifdef __NetBSD__
 #if 0                          /* XXX uvmhist option?  */
@@ -67,6 +67,7 @@
 #include <linux/printk.h>
 #include <asm/param.h>
 #include <asm/page.h>
+#include <asm/cpufeature.h>
 
 #define RQ_BUG_ON(expr)
 
@@ -1933,11 +1934,8 @@
        if (args->flags & ~(I915_MMAP_WC))
                return -EINVAL;
 
-#if 0
-       /* XXX cpu_has_pat == CPUID_PAT, do we care to do this check */
        if (args->flags & I915_MMAP_WC && !cpu_has_pat)
                return -ENODEV;
-#endif
 
        obj = drm_gem_object_lookup(dev, file, args->handle);
        if (obj == NULL)