Module Name: src
Committed By: riastradh
Date: Wed Jan 15 13:52:09 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915 [riastradh-drm2]: i915_drv.h
Log Message:
Lock the right uvmobject for uvm_pagelookup.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1.2.16 -r1.1.1.1.2.17 \
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.1.1.1.2.16 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h:1.1.1.1.2.17
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h:1.1.1.1.2.16 Sun Sep 8 16:00:22 2013
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h Wed Jan 15 13:52:09 2014
@@ -1456,9 +1456,9 @@ i915_gem_object_get_page(struct drm_i915
* prevent them from disappearing.
*/
KASSERT(obj->pages != NULL);
- mutex_enter(obj->base.gemo_uvmobj.vmobjlock);
+ mutex_enter(obj->base.gemo_shm_uao->vmobjlock);
struct vm_page *const page = uvm_pagelookup(obj->base.gemo_shm_uao, n);
- mutex_exit(obj->base.gemo_uvmobj.vmobjlock);
+ mutex_exit(obj->base.gemo_shm_uao->vmobjlock);
return container_of(page, struct page, p_vmp);
}
