diff options
| author | Matt Turner <[email protected]> | 2017-06-08 15:13:42 -0700 |
|---|---|---|
| committer | Matt Turner <[email protected]> | 2017-06-09 12:14:28 -0700 |
| commit | 71651b3139c501f50e6547c21a1cdb816b0a9dde (patch) | |
| tree | a1f863452d20bff934e9a0cd39202353ac1f7617 | |
| parent | d42fc65bb3c8af6ed25baae17e6f2daec73338fc (diff) | |
i965: Temporarily disable async mappings on non-LLC
Fixes regressions from commits e0a9b261e593 and a16355d67d92 by
neutering async mappings on non-LLC to be synchronous, like they were
before those two commits. :(
The failing tests include
piglit-test piglit.spec.nv_primitive_restart.primitive-restart-vbo_index_only
piglit-test piglit.spec.nv_primitive_restart.primitive-restart-vbo_combined_vertex_and_index
piglit-test piglit.spec.nv_primitive_restart.primitive-restart-vbo_separate_vertex_and_index
piglit-test piglit.spec.nv_primitive_restart.primitive-restart-vbo_vertex_only
piglit-test piglit.spec.arb_pixel_buffer_object.texsubimage-unpack pbo
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_bufmgr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_bufmgr.c b/src/mesa/drivers/dri/i965/brw_bufmgr.c index 2ee57e2a0d3..66a2d4964a2 100644 --- a/src/mesa/drivers/dri/i965/brw_bufmgr.c +++ b/src/mesa/drivers/dri/i965/brw_bufmgr.c @@ -689,7 +689,7 @@ brw_bo_map_cpu(struct brw_context *brw, struct brw_bo *bo, unsigned flags) DBG("brw_bo_map_cpu: %d (%s) -> %p\n", bo->gem_handle, bo->name, bo->map_cpu); - if (!(flags & MAP_ASYNC)) { + if (!(flags & MAP_ASYNC) || !bufmgr->has_llc) { set_domain(brw, "CPU mapping", bo, I915_GEM_DOMAIN_CPU, flags & MAP_WRITE ? I915_GEM_DOMAIN_CPU : 0); } @@ -743,7 +743,7 @@ brw_bo_map_gtt(struct brw_context *brw, struct brw_bo *bo, unsigned flags) DBG("bo_map_gtt: %d (%s) -> %p\n", bo->gem_handle, bo->name, bo->map_gtt); - if (!(flags & MAP_ASYNC)) { + if (!(flags & MAP_ASYNC) || !bufmgr->has_llc) { set_domain(brw, "GTT mapping", bo, I915_GEM_DOMAIN_GTT, I915_GEM_DOMAIN_GTT); } |