From 9fdb834853bbf65cebcc71e79481b5910c4c51fe Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Thu, 7 Apr 2022 11:20:52 +0300 Subject: [PATCH] anv: fix clflush usage on utrace copy batch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Lionel Landwerlin Fixes: cc5843a573bd ("anv: implement u_trace support") Reviewed-by: Marcin Ślusarz Reviewed-by: Tapani Pälli Part-of: (cherry picked from commit 44e93b4c6fdce90a72be51cc96be9f6b34051d5d) --- .pick_status.json | 2 +- src/intel/vulkan/anv_batch_chain.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index a27da40b1e0..9e7a5f2d03d 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -382,7 +382,7 @@ "description": "anv: fix clflush usage on utrace copy batch", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "cc5843a573bd0412c547b4f2af3cce18263ecfd4" }, diff --git a/src/intel/vulkan/anv_batch_chain.c b/src/intel/vulkan/anv_batch_chain.c index c6926158e82..489543d648f 100644 --- a/src/intel/vulkan/anv_batch_chain.c +++ b/src/intel/vulkan/anv_batch_chain.c @@ -1998,11 +1998,8 @@ setup_utrace_execbuf(struct anv_execbuf *execbuf, struct anv_queue *queue, flush->batch_bo->exec_obj_index = last_idx; } - if (!device->info.has_llc) { - __builtin_ia32_mfence(); - for (uint32_t i = 0; i < flush->batch_bo->size; i += CACHELINE_SIZE) - __builtin_ia32_clflush(flush->batch_bo->map); - } + if (!device->info.has_llc) + intel_flush_range(flush->batch_bo->map, flush->batch_bo->size); execbuf->execbuf = (struct drm_i915_gem_execbuffer2) { .buffers_ptr = (uintptr_t) execbuf->objects,