Mesa (main): freedreno/a5xx: Make sure to mark blit read/write access in the BC.
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Wed Jun 30 21:57:29 UTC 2021
Module: Mesa
Branch: main
Commit: 514aa0185374593482e394aceff7c9018ce80f1b
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=514aa0185374593482e394aceff7c9018ce80f1b
Author: Emma Anholt <emma at anholt.net>
Date: Tue Jun 22 15:05:37 2021 -0700
freedreno/a5xx: Make sure to mark blit read/write access in the BC.
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11544>
---
src/gallium/drivers/freedreno/a5xx/fd5_blitter.c | 10 ++++
.../freedreno/ci/piglit-freedreno-a530-fails.txt | 55 ----------------------
2 files changed, 10 insertions(+), 55 deletions(-)
diff --git a/src/gallium/drivers/freedreno/a5xx/fd5_blitter.c b/src/gallium/drivers/freedreno/a5xx/fd5_blitter.c
index 0cc1661ef5e..ab33248e11d 100644
--- a/src/gallium/drivers/freedreno/a5xx/fd5_blitter.c
+++ b/src/gallium/drivers/freedreno/a5xx/fd5_blitter.c
@@ -441,8 +441,18 @@ fd5_blitter_blit(struct fd_context *ctx,
return false;
}
+ struct fd_resource *src = fd_resource(info->src.resource);
+ struct fd_resource *dst = fd_resource(info->dst.resource);
+
batch = fd_bc_alloc_batch(ctx, true);
+ fd_screen_lock(ctx->screen);
+
+ fd_batch_resource_read(batch, src);
+ fd_batch_resource_write(batch, dst);
+
+ fd_screen_unlock(ctx->screen);
+
DBG_BLIT(info, batch);
fd_batch_update_queries(batch);
diff --git a/src/gallium/drivers/freedreno/ci/piglit-freedreno-a530-fails.txt b/src/gallium/drivers/freedreno/ci/piglit-freedreno-a530-fails.txt
index e781c9a3c17..7adf52a8114 100644
--- a/src/gallium/drivers/freedreno/ci/piglit-freedreno-a530-fails.txt
+++ b/src/gallium/drivers/freedreno/ci/piglit-freedreno-a530-fails.txt
@@ -1,5 +1,3 @@
-fast_color_clear at fcc-read-after-clear copy rb,Fail
-fast_color_clear at fcc-read-after-clear copy tex,Fail
glx at glx-make-current,Crash
glx at glx-multi-window-single-context,Fail
glx at glx-query-drawable-glx_fbconfig_id-window,Fail
@@ -20,8 +18,6 @@ glx at glx_ext_import_context@make current- multi process,Fail
glx at glx_ext_import_context@make current- single process,Fail
glx at glx_ext_import_context@query context info,Fail
shaders at glsl-bug-110796,Fail
-shaders at glsl-kwin-blur-1,Fail
-shaders at glsl-kwin-blur-2,Fail
shaders at point-vertex-id divisor,Crash
shaders at point-vertex-id gl_instanceid,Crash
shaders at point-vertex-id gl_instanceid divisor,Crash
@@ -32,19 +28,14 @@ shaders at point-vertex-id gl_vertexid gl_instanceid divisor,Crash
spec@!opengl 1.0 at gl-1.0-edgeflag,Crash
spec@!opengl 1.0 at gl-1.0-edgeflag-quads,Crash
spec@!opengl 1.0 at gl-1.0-no-op-paths,Fail
-spec@!opengl 1.0 at gl-1.0-scissor-copypixels,Fail
spec@!opengl 1.0 at gl-1.0-scissor-offscreen,Fail
spec@!opengl 1.0 at gl-1.0-spot-light,Fail
spec@!opengl 1.0 at rasterpos,Crash
-spec@!opengl 1.1 at copypixels-sync,Fail
spec@!opengl 1.1 at copyteximage 1d,Fail
spec@!opengl 1.1 at copyteximage 2d,Fail
-spec@!opengl 1.1 at copyteximage-border,Fail
-spec@!opengl 1.1 at copytexsubimage,Fail
spec@!opengl 1.1 at depthstencil-default_fb-blit,Fail
spec@!opengl 1.1 at depthstencil-default_fb-blit samples=2,Fail
spec@!opengl 1.1 at depthstencil-default_fb-blit samples=4,Fail
-spec@!opengl 1.1 at depthstencil-default_fb-copypixels,Fail
spec@!opengl 1.1 at depthstencil-default_fb-copypixels samples=2,Fail
spec@!opengl 1.1 at depthstencil-default_fb-copypixels samples=4,Fail
spec@!opengl 1.1 at depthstencil-default_fb-drawpixels-24_8 samples=2,Fail
@@ -59,8 +50,6 @@ spec@!opengl 1.1 at depthstencil-default_fb-readpixels-32f_24_8_rev samples=2,Fail
spec@!opengl 1.1 at depthstencil-default_fb-readpixels-32f_24_8_rev samples=4,Fail
spec@!opengl 1.1 at depthstencil-default_fb-readpixels-float-and-ushort samples=2,Fail
spec@!opengl 1.1 at depthstencil-default_fb-readpixels-float-and-ushort samples=4,Fail
-spec@!opengl 1.1 at draw-copypixels-sync,Fail
-spec@!opengl 1.1 at gl-1.1-xor-copypixels,Fail
spec@!opengl 1.1 at linestipple,Fail
spec@!opengl 1.1 at linestipple@Factor 2x,Fail
spec@!opengl 1.1 at linestipple@Factor 3x,Fail
@@ -106,27 +95,13 @@ spec at arb_color_buffer_float@gl_rgba8_snorm-render,Fail
spec at arb_color_buffer_float@gl_rgba8_snorm-render-fog,Fail
spec at arb_color_buffer_float@gl_rgba8_snorm-render-sanity,Fail
spec at arb_color_buffer_float@gl_rgba8_snorm-render-sanity-fog,Fail
-spec at arb_depth_buffer_float@fbo-clear-formats,Fail
-spec at arb_depth_buffer_float@fbo-clear-formats at GL_DEPTH32F_STENCIL8,Fail
-spec at arb_depth_buffer_float@fbo-clear-formats at GL_DEPTH_COMPONENT32F,Fail
spec at arb_depth_buffer_float@fbo-clear-formats stencil,Fail
spec at arb_depth_buffer_float@fbo-clear-formats stencil at GL_DEPTH32F_STENCIL8,Fail
-spec at arb_depth_buffer_float@fbo-depth-gl_depth_component32f-copypixels,Fail
spec at arb_depth_buffer_float@fbo-depthstencil-gl_depth32f_stencil8-blit,Fail
spec at arb_depth_buffer_float@fbo-depthstencil-gl_depth32f_stencil8-copypixels,Fail
spec at arb_depth_buffer_float@fbo-stencil-gl_depth32f_stencil8-blit,Fail
spec at arb_depth_buffer_float@fbo-stencil-gl_depth32f_stencil8-copypixels,Fail
-spec at arb_depth_texture@fbo-clear-formats,Fail
-spec at arb_depth_texture@fbo-clear-formats at GL_DEPTH_COMPONENT,Fail
-spec at arb_depth_texture@fbo-clear-formats at GL_DEPTH_COMPONENT16,Fail
-spec at arb_depth_texture@fbo-clear-formats at GL_DEPTH_COMPONENT24,Fail
-spec at arb_depth_texture@fbo-clear-formats at GL_DEPTH_COMPONENT32,Fail
-spec at arb_depth_texture@fbo-depth-gl_depth_component16-copypixels,Fail
-spec at arb_depth_texture@fbo-depth-gl_depth_component24-copypixels,Fail
-spec at arb_depth_texture@fbo-depth-gl_depth_component32-copypixels,Fail
-spec at arb_direct_state_access@copytexturesubimage,Fail
spec at arb_direct_state_access@gettextureimage-formats,Crash
-spec at arb_direct_state_access@gettextureimage-formats init-by-rendering,Fail
spec at arb_draw_indirect@gl_vertexid used with gldrawarraysindirect,Crash
spec at arb_draw_indirect@gl_vertexid used with gldrawelementsindirect,Crash
spec at arb_framebuffer_no_attachments@arb_framebuffer_no_attachments-atomic,Fail
@@ -144,7 +119,6 @@ spec at arb_framebuffer_object@arb_framebuffer_object-depth-stencil-blit stencil gl
spec at arb_framebuffer_object@framebuffer-blit-levels draw stencil,Fail
spec at arb_framebuffer_object@framebuffer-blit-levels read stencil,Fail
spec at arb_map_buffer_alignment@arb_map_buffer_alignment-map-invalidate-range,Fail
-spec at arb_map_buffer_range@copybuffersubdata offset=0,Fail
spec at arb_multi_draw_indirect@gl-3.0-multidrawarrays-vertexid -indirect,Crash
spec at arb_occlusion_query@occlusion_query_order,Fail
spec at arb_point_sprite@arb_point_sprite-interactions 1.0,Fail
@@ -195,28 +169,13 @@ spec at egl_khr_gl_image@egl_khr_gl_renderbuffer_image-clear-shared-image gl_depth_
spec at egl_khr_gl_image@egl_khr_gl_renderbuffer_image-clear-shared-image gl_rgba,Fail
spec at egl_khr_surfaceless_context@viewport,Fail
spec at egl_mesa_configless_context@basic,Fail
-spec at ext_direct_state_access@multi-texture,Fail
-spec at ext_direct_state_access@multi-texture at CopyMultiTexImage1DEXT,Fail
-spec at ext_direct_state_access@textures,Fail
-spec at ext_direct_state_access@textures at CopyTextureImage1DEXT,Fail
spec at ext_direct_state_access@vao at VertexArrayVertexOffsetEXT,Fail
spec at ext_external_objects@semaphore-api-errors at gen-semaphores-bad-value,Fail
spec at ext_framebuffer_blit@fbo-blit-check-limits,Fail
-spec at ext_framebuffer_object@ext_framebuffer_object-mipmap,Fail
spec at ext_framebuffer_object@fbo-alphatest-nocolor,Fail
spec at ext_framebuffer_object@fbo-alphatest-nocolor-ff,Fail
spec at ext_framebuffer_object@fbo-blending-format-quirks,Fail
spec at ext_framebuffer_object@fbo-blending-snorm,Fail
-spec at ext_framebuffer_object@fbo-clearmipmap,Fail
-spec at ext_framebuffer_object@fbo-copyteximage,Fail
-spec at ext_framebuffer_object@fbo-copyteximage-simple,Fail
-spec at ext_framebuffer_object@fbo-cubemap,Fail
-spec at ext_framebuffer_object@fbo-generatemipmap,Fail
-spec at ext_framebuffer_object@fbo-generatemipmap-nonsquare,Fail
-spec at ext_framebuffer_object@fbo-generatemipmap-npot,Fail
-spec at ext_framebuffer_object@fbo-generatemipmap-scissor,Fail
-spec at ext_framebuffer_object@fbo-generatemipmap-swizzle,Fail
-spec at ext_framebuffer_object@fbo-generatemipmap-viewport,Fail
spec at ext_framebuffer_object@fbo-stencil-gl_stencil_index1-blit,Fail
spec at ext_framebuffer_object@fbo-stencil-gl_stencil_index1-copypixels,Fail
spec at ext_framebuffer_object@fbo-stencil-gl_stencil_index16-blit,Fail
@@ -225,8 +184,6 @@ spec at ext_framebuffer_object@fbo-stencil-gl_stencil_index4-blit,Fail
spec at ext_framebuffer_object@fbo-stencil-gl_stencil_index4-copypixels,Fail
spec at ext_framebuffer_object@fbo-stencil-gl_stencil_index8-blit,Fail
spec at ext_framebuffer_object@fbo-stencil-gl_stencil_index8-copypixels,Fail
-spec at ext_framebuffer_object@getteximage-formats init-by-clear-and-render,Fail
-spec at ext_framebuffer_object@getteximage-formats init-by-rendering,Fail
spec at ext_image_dma_buf_import@ext_image_dma_buf_import-export,Fail
spec at ext_image_dma_buf_import@ext_image_dma_buf_import-sample_p010,Fail
spec at ext_image_dma_buf_import@ext_image_dma_buf_import-sample_p012,Fail
@@ -238,23 +195,15 @@ spec at ext_image_dma_buf_import@ext_image_dma_buf_import-sample_y412,Fail
spec at ext_image_dma_buf_import@ext_image_dma_buf_import-sample_y416,Fail
spec at ext_image_dma_buf_import@ext_image_dma_buf_import-sample_uyvy,Fail
spec at ext_image_dma_buf_import@ext_image_dma_buf_import-sample_yuyv,Fail
-spec at ext_packed_depth_stencil@fbo-clear-formats,Fail
spec at ext_packed_depth_stencil@fbo-clear-formats stencil at GL_DEPTH_STENCIL,Fail
-spec at ext_packed_depth_stencil@fbo-clear-formats at GL_DEPTH24_STENCIL8,Fail
-spec at ext_packed_depth_stencil@fbo-clear-formats at GL_DEPTH_STENCIL,Fail
spec at ext_packed_depth_stencil@fbo-clear-formats stencil,Fail
spec at ext_packed_depth_stencil@fbo-clear-formats stencil at GL_DEPTH24_STENCIL8,Fail
spec at ext_packed_depth_stencil@fbo-depthstencil-gl_depth24_stencil8-blit,Fail
-spec at ext_packed_depth_stencil@fbo-depthstencil-gl_depth24_stencil8-copypixels,Fail
spec at ext_packed_depth_stencil@fbo-stencil-gl_depth24_stencil8-blit,Fail
spec at ext_packed_depth_stencil@fbo-stencil-gl_depth24_stencil8-copypixels,Fail
spec at ext_packed_float@query-rgba-signed-components,Fail
-spec at ext_render_snorm@render,Fail
-spec at ext_render_snorm@render at format 0x8f94,Fail
spec at ext_render_snorm@render at format 0x8f94 read fail,Fail
-spec at ext_render_snorm@render at format 0x8f95,Fail
spec at ext_render_snorm@render at format 0x8f95 read fail,Fail
-spec at ext_render_snorm@render at format 0x8f97,Fail
spec at ext_render_snorm@render at format 0x8f97 read fail,Fail
spec at ext_texture_integer@fbo-integer,Fail
spec at ext_texture_snorm@fbo-blending-formats,Fail
@@ -267,7 +216,6 @@ spec at ext_transform_feedback@api-errors bind_pipeline,Fail
spec at ext_transform_feedback@api-errors bind_range_active,Fail
spec at ext_transform_feedback@api-errors useprogstage_active,Crash
spec at ext_transform_feedback2@draw-auto,Fail
-spec at ext_transform_feedback@discard-copypixels,Fail
spec at ext_transform_feedback@generatemipmap prims_generated,Fail
spec at ext_transform_feedback@immediate-reuse,Fail
spec at ext_transform_feedback@immediate-reuse-index-buffer,Fail
@@ -371,9 +319,6 @@ spec at nv_copy_depth_to_color@nv_copy_depth_to_color 1 0x223344ff,Crash
spec at nv_copy_depth_to_color@nv_copy_depth_to_color 1 0x76356278,Crash
spec at nv_copy_image@nv_copy_image-formats,Fail
spec at nv_copy_image@nv_copy_image-formats at Source: GL_DEPTH32F_STENCIL8/Destination: GL_DEPTH32F_STENCIL8,Fail
-spec at nv_copy_image@nv_copy_image-simple --rb-to-rb,Fail
-spec at nv_copy_image@nv_copy_image-simple --rb-to-tex,Fail
-spec at nv_copy_image@nv_copy_image-simple --tex-to-tex,Fail
spec at nv_image_formats@nv_image_formats-gles3,Crash
spec at oes_egl_image_external_essl3@oes_egl_image_external_essl3,Crash
spec at oes_egl_image_external_essl3@oes_egl_image_external_essl3 at oes_egl_image_external_essl3_imageLoad,Fail
More information about the mesa-commit
mailing list