[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 Fix pointer arithmetic a...

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

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

description:
Fix pointer arithmetic and include asm/cpufeature.h for cpu_has_clflush.

diffstat:

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

diffs (36 lines):

diff -r a117281113b1 -r e1f7075e5f2e sys/external/bsd/drm2/dist/drm/i915/i915_gem_execbuffer.c
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_gem_execbuffer.c Mon Aug 27 07:07:45 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_gem_execbuffer.c Mon Aug 27 07:07:56 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i915_gem_execbuffer.c,v 1.6 2018/08/27 04:58:23 riastradh Exp $        */
+/*     $NetBSD: i915_gem_execbuffer.c,v 1.7 2018/08/27 07:07:56 riastradh Exp $        */
 
 /*
  * Copyright © 2008,2010 Intel Corporation
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_gem_execbuffer.c,v 1.6 2018/08/27 04:58:23 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_gem_execbuffer.c,v 1.7 2018/08/27 07:07:56 riastradh Exp $");
 
 #include <drm/drmP.h>
 #include <drm/i915_drm.h>
@@ -41,6 +41,7 @@
 #include <linux/log2.h>
 #include <linux/pagemap.h>
 #include <linux/err.h>
+#include <asm/cpufeature.h>
 
 #define  __EXEC_OBJECT_HAS_PIN (1<<31)
 #define  __EXEC_OBJECT_HAS_FENCE (1<<30)
@@ -332,7 +333,8 @@
        offset += reloc->offset;
        reloc_page = io_mapping_map_atomic_wc(dev_priv->gtt.mappable,
                                              offset & PAGE_MASK);
-       iowrite32(lower_32_bits(delta), (char __iomem *)reloc_page + offset_in_page(offset));
+       iowrite32(lower_32_bits(delta), (uint32_t __iomem *)
+           ((char __iomem *)reloc_page + offset_in_page(offset)));
 
        if (INTEL_INFO(dev)->gen >= 8) {
                offset += sizeof(uint32_t);