Date: Mon, 28 May 2012 13:55:49 +0000 (UTC) From: Konstantin Belousov <kib@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r236182 - head/sys/dev/drm2/i915 Message-ID: <201205281355.q4SDtnl8014942@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201205281355.q4SDtnl8014942>