Author: kib
Date: Mon May 28 13:55:49 2012
New Revision: 236182
URL: http://svn.freebsd.org/changeset/base/236182
Log:
Fix calculation of the execution buffer end in the mapped pages
when it is spilled into the next page.
MFC after: 1 month
Modified:
head/sys/dev/drm2/i915/i915_gem_execbuffer.c
Modified: head/sys/dev/drm2/i915/i915_gem_execbuffer.c
==============================================================================
--- head/sys/dev/drm2/i915/i915_gem_execbuffer.c Mon May 28 13:49:52
2012 (r236181)
+++ head/sys/dev/drm2/i915/i915_gem_execbuffer.c Mon May 28 13:55:49
2012 (r236182)
@@ -1069,7 +1069,8 @@ i915_gem_fix_mi_batchbuffer_end(struct d
po_r -= 4;
mkva = pmap_mapdev_attr(trunc_page(po_r), 2 * PAGE_SIZE,
PAT_WRITE_COMBINING);
- cmd = *(uint32_t *)(mkva + (po_r & PAGE_MASK));
+ po_r &= PAGE_MASK;
+ cmd = *(uint32_t *)(mkva + po_r);
if (cmd != MI_BATCH_BUFFER_END) {
/*
@@ -1083,8 +1084,7 @@ i915_gem_fix_mi_batchbuffer_end(struct d
po_w = po_r;
DRM_DEBUG("batchbuffer does not end by MI_BATCH_BUFFER_END, overwriting last
bo cmd !\n");
}
-
- *(uint32_t *)(mkva + (po_w & PAGE_MASK)) = MI_BATCH_BUFFER_END;
+ *(uint32_t *)(mkva + po_w) = MI_BATCH_BUFFER_END;
}
pmap_unmapdev((vm_offset_t)mkva, 2 * PAGE_SIZE);
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
