From 2cbc24b9da01fb7cc38b42fd78d8f232ce7167b7 Mon Sep 17 00:00:00 2001 From: Amber Date: Tue, 2 May 2023 10:08:57 +0200 Subject: [PATCH] turnip: fix buffer markers using wrong addresses Fixes failures in dEQP-VK.api.buffer_marker.* Signed-off-by: Amber Amber Part-of: --- src/freedreno/ci/freedreno-a618-fails.txt | 13 ------------- src/freedreno/ci/freedreno-a630-fails.txt | 12 ------------ src/freedreno/vulkan/tu_cmd_buffer.cc | 2 +- 3 files changed, 1 insertion(+), 26 deletions(-) diff --git a/src/freedreno/ci/freedreno-a618-fails.txt b/src/freedreno/ci/freedreno-a618-fails.txt index 68caae8c852..4519985c60c 100644 --- a/src/freedreno/ci/freedreno-a618-fails.txt +++ b/src/freedreno/ci/freedreno-a618-fails.txt @@ -345,18 +345,6 @@ SRGBReadWritePixels,Fail # New CTS failures in 1.3.5.0 KHR-GL45.polygon_offset_clamp.PolygonOffsetClampMinMax,Fail KHR-GL45.polygon_offset_clamp.PolygonOffsetClampZeroInfinity,Fail -dEQP-VK.api.buffer_marker.graphics.default_mem.bottom_of_pipe.memory_dep.buffer_copy_offset_24,Fail -dEQP-VK.api.buffer_marker.graphics.default_mem.bottom_of_pipe.memory_dep.dispatch_offset_24,Fail -dEQP-VK.api.buffer_marker.graphics.default_mem.bottom_of_pipe.memory_dep.draw_offset_24,Fail -dEQP-VK.api.buffer_marker.graphics.default_mem.bottom_of_pipe.overwrite.64_offset_24,Fail -dEQP-VK.api.buffer_marker.graphics.default_mem.bottom_of_pipe.sequential.64_offset_16,Fail -dEQP-VK.api.buffer_marker.graphics.default_mem.bottom_of_pipe.sequential.65536_offset_1024,Fail -dEQP-VK.api.buffer_marker.graphics.default_mem.top_of_pipe.memory_dep.buffer_copy_offset_24,Fail -dEQP-VK.api.buffer_marker.graphics.default_mem.top_of_pipe.memory_dep.dispatch_offset_24,Fail -dEQP-VK.api.buffer_marker.graphics.default_mem.top_of_pipe.memory_dep.draw_offset_24,Fail -dEQP-VK.api.buffer_marker.graphics.default_mem.top_of_pipe.overwrite.64_offset_24,Fail -dEQP-VK.api.buffer_marker.graphics.default_mem.top_of_pipe.sequential.64_offset_16,Fail -dEQP-VK.api.buffer_marker.graphics.default_mem.top_of_pipe.sequential.65536_offset_1024,Fail dEQP-VK.binding_model.descriptor_buffer.multiple.compute_comp_buffers1_sets1,Crash dEQP-VK.binding_model.descriptor_buffer.multiple.compute_comp_buffers1_sets3,Crash dEQP-VK.binding_model.descriptor_buffer.multiple.compute_comp_buffers1_sets3_imm_samplers,Crash @@ -422,7 +410,6 @@ dEQP-VK.transform_feedback.simple.lines_or_triangles_line_strip_1,Fail dEQP-VK.transform_feedback.simple.lines_or_triangles_line_strip_3,Fail dEQP-VK.transform_feedback.simple.lines_or_triangles_triangle_strip_1,Fail dEQP-VK.transform_feedback.simple.lines_or_triangles_triangle_strip_3,Fail -gmem-dEQP-VK.api.buffer_marker.graphics.default_mem.top_of_pipe.memory_dep.dispatch_offset_24,Fail gmem-dEQP-VK.binding_model.descriptor_buffer.multiple.graphics_ahit_buffers1_sets1,Crash gmem-dEQP-VK.binding_model.descriptor_buffer.multiple.graphics_call_buffers1_sets3_imm_samplers,Crash gmem-dEQP-VK.binding_model.descriptor_buffer.multiple.graphics_chit_buffers1_sets1,Crash diff --git a/src/freedreno/ci/freedreno-a630-fails.txt b/src/freedreno/ci/freedreno-a630-fails.txt index fcd1f242385..94059ddf7b4 100644 --- a/src/freedreno/ci/freedreno-a630-fails.txt +++ b/src/freedreno/ci/freedreno-a630-fails.txt @@ -355,18 +355,6 @@ SRGBReadWritePixels,Fail spec@!opengl 1.1@line-smooth-stipple,Fail # New CTS failures in 1.3.5.0 -dEQP-VK.api.buffer_marker.graphics.default_mem.bottom_of_pipe.memory_dep.buffer_copy_offset_24,Fail -dEQP-VK.api.buffer_marker.graphics.default_mem.bottom_of_pipe.memory_dep.dispatch_offset_24,Fail -dEQP-VK.api.buffer_marker.graphics.default_mem.bottom_of_pipe.memory_dep.draw_offset_24,Fail -dEQP-VK.api.buffer_marker.graphics.default_mem.bottom_of_pipe.overwrite.64_offset_24,Fail -dEQP-VK.api.buffer_marker.graphics.default_mem.bottom_of_pipe.sequential.64_offset_16,Fail -dEQP-VK.api.buffer_marker.graphics.default_mem.bottom_of_pipe.sequential.65536_offset_1024,Fail -dEQP-VK.api.buffer_marker.graphics.default_mem.top_of_pipe.memory_dep.buffer_copy_offset_24,Fail -dEQP-VK.api.buffer_marker.graphics.default_mem.top_of_pipe.memory_dep.dispatch_offset_24,Fail -dEQP-VK.api.buffer_marker.graphics.default_mem.top_of_pipe.memory_dep.draw_offset_24,Fail -dEQP-VK.api.buffer_marker.graphics.default_mem.top_of_pipe.overwrite.64_offset_24,Fail -dEQP-VK.api.buffer_marker.graphics.default_mem.top_of_pipe.sequential.64_offset_16,Fail -dEQP-VK.api.buffer_marker.graphics.default_mem.top_of_pipe.sequential.65536_offset_1024,Fail dEQP-VK.binding_model.descriptor_buffer.multiple.compute_comp_buffers1_sets1,Crash dEQP-VK.binding_model.descriptor_buffer.multiple.compute_comp_buffers1_sets3_imm_samplers,Crash dEQP-VK.binding_model.descriptor_buffer.multiple.compute_comp_buffers1_sets3,Crash diff --git a/src/freedreno/vulkan/tu_cmd_buffer.cc b/src/freedreno/vulkan/tu_cmd_buffer.cc index eb372fc432b..78ac84c2c0f 100644 --- a/src/freedreno/vulkan/tu_cmd_buffer.cc +++ b/src/freedreno/vulkan/tu_cmd_buffer.cc @@ -6223,7 +6223,7 @@ tu_CmdWriteBufferMarker2AMD(VkCommandBuffer commandBuffer, TU_FROM_HANDLE(tu_cmd_buffer, cmd, commandBuffer); TU_FROM_HANDLE(tu_buffer, buffer, dstBuffer); - uint64_t va = buffer->bo->iova + dstOffset; + uint64_t va = buffer->iova + dstOffset; struct tu_cs *cs = cmd->state.pass ? &cmd->draw_cs : &cmd->cs; struct tu_cache_state *cache =