[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 Scale offset by size of ...

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

details:   https://anonhg.NetBSD.org/src/rev/819e9ff2ae36
branches:  trunk
changeset: 835417:819e9ff2ae36
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 14:53:54 2018 +0000

description:
Scale offset by size of unit, gen6_pte_t.

diffstat:

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

diffs (28 lines):

diff -r 46ecd10736db -r 819e9ff2ae36 sys/external/bsd/drm2/dist/drm/i915/i915_gem_gtt.c
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_gem_gtt.c        Mon Aug 27 14:53:30 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_gem_gtt.c        Mon Aug 27 14:53:54 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i915_gem_gtt.c,v 1.14 2018/08/27 14:53:30 riastradh Exp $      */
+/*     $NetBSD: i915_gem_gtt.c,v 1.15 2018/08/27 14:53:54 riastradh Exp $      */
 
 /*
  * Copyright © 2010 Daniel Vetter
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_gem_gtt.c,v 1.14 2018/08/27 14:53:30 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_gem_gtt.c,v 1.15 2018/08/27 14:53:54 riastradh Exp $");
 
 #include <linux/bitmap.h>
 #include <linux/err.h>
@@ -1776,7 +1776,8 @@
        pd_entry |= GEN6_PDE_VALID;
 
 #ifdef __NetBSD__
-       bus_space_write_4(bst, bsh, pd_base + pde, pd_entry);
+       CTASSERT(sizeof(gen6_pte_t) == 4);
+       bus_space_write_4(bst, bsh, pd_base + 4*pde, pd_entry);
 #else
        writel(pd_entry, ppgtt->pd_addr + pde);
 #endif