Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 Need vaddr_t, not pointe...



details:   https://anonhg.NetBSD.org/src/rev/848b9d1ac94d
branches:  trunk
changeset: 992564:848b9d1ac94d
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 07:02:41 2018 +0000

description:
Need vaddr_t, not pointer, for pmap_extract.

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/i915_drv.h |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r 49c4ef9cf055 -r 848b9d1ac94d sys/external/bsd/drm2/dist/drm/i915/i915_drv.h
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h    Mon Aug 27 07:02:30 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h    Mon Aug 27 07:02:41 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i915_drv.h,v 1.15 2018/08/27 07:02:30 riastradh Exp $  */
+/*     $NetBSD: i915_drv.h,v 1.16 2018/08/27 07:02:41 riastradh Exp $  */
 
 /* i915_drv.h -- Private header for the I915 driver -*- linux-c -*-
  */
@@ -2945,7 +2945,7 @@
        struct vm_page *page;
 
        if (obj->phys_handle) {
-               char *va = obj->phys_handle->vaddr;
+               vaddr_t va = (vaddr_t)obj->phys_handle->vaddr;
                paddr_t pa;
                if (!pmap_extract(pmap_kernel(), va + n*PAGE_SIZE, &pa))
                        panic("i915 gem object phys-attached but not mapped:"



Home | Main Index | Thread Index | Old Index