Module Name: src
Committed By: riastradh
Date: Mon Aug 27 07:02:41 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_drv.h
Log Message:
Need vaddr_t, not pointer, for pmap_extract.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h
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/i915_drv.h
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h:1.15 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h:1.16
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h:1.15 Mon Aug 27 07:02:30 2018
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h Mon Aug 27 07:02:41 2018
@@ -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 @@ i915_gem_object_get_page(struct drm_i915
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:"
