drm/vc4: Make sure to emit a tile coordinates between two MSAA loads.
Subsystems (3)
PATCH RESEND 1/1 drm/vc4: Make sure to emit a tile coordinates between two MSAA loads.
The HW only executes a load once the tile coordinates packet happens, and only tracks one at a time, so by emitting our two MSAA loads back to back we would end up with an undefined color or Z buffer.
Fixes dEQP-EGL.functional.render.multi_context.gles2.rgb888_window
--- drivers/gpu/drm/vc4/vc4_render_cl.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-)
drivers/gpu/drm/vc4/vc4_render_cl.c +11 -12
@@ -148,6 +148,12 @@ static void emit_tile(struct vc4_exec_info *exec, }if (setup->zs_read) { +if (setup->color_read) { +/* Exec previous load. */ +vc4_tile_coordinates (setup, x, y); +vc4_store_before_load (setup); + } +if (args->zs_read.flags &VC4_SUBMIT_RCL_SURFACE_READ_IS_FULL_RES ) {rcl_u8 (setup,VC4_PACKET_LOAD_FULL_RES_TILE_BUFFER );
@@ -156,12 +162,6 @@ static void emit_tile(struct vc4_exec_info *exec, &args->zs_read, x, y) | VC4_LOADSTORE_FULL_RES_DISABLE_COLOR); }else { -if (setup->color_read) { -/* Exec previous load. */ -vc4_tile_coordinates (setup, x, y); -vc4_store_before_load (setup); - } -rcl_u8 (setup,VC4_PACKET_LOAD_TILE_BUFFER_GENERAL );rcl_u16 (setup, args->zs_read.bits); rcl_u32(setup, setup->zs_read->paddr +
@@ -291,16 +291,15 @@ static int vc4_create_rcl_bo(struct drm_device *dev, struct vc4_exec_info *exec, } }if (setup->zs_read) { +if (setup->color_read) { + loop_body_size +=VC4_PACKET_TILE_COORDINATES_SIZE ; + loop_body_size +=VC4_PACKET_STORE_TILE_BUFFER_GENERAL_SIZE ; + } +if (args->zs_read.flags &VC4_SUBMIT_RCL_SURFACE_READ_IS_FULL_RES ) { loop_body_size +=VC4_PACKET_LOAD_FULL_RES_TILE_BUFFER_SIZE ; }else { -if (setup->color_read && - !(args->color_read.flags & -VC4_SUBMIT_RCL_SURFACE_READ_IS_FULL_RES )) { - loop_body_size +=VC4_PACKET_TILE_COORDINATES_SIZE ; - loop_body_size +=VC4_PACKET_STORE_TILE_BUFFER_GENERAL_SIZE ; - } loop_body_size +=VC4_PACKET_LOAD_TILE_BUFFER_GENERAL_SIZE ; } }
Signature · 1 line
2.20.0.rc1
Hi,
Quoted 3 lines · Eric Anholt
The HW only executes a load once the tile coordinates packet happens, and only tracks one at a time, so by emitting our two MSAA loads back to back we would end up with an undefined color or Z buffer.
This change deals with things that I'm not very familiar with, but here is my take on what is happening here:
- When we have to do more than a single load in the same render command list, we need to send out tile coordinates and a dummy store in between the two, because of internal architecture requirements of the GPU;
- We're dealing with the color buffer first and then the z-stencil buffer;
- As a result, we need to issue that dummy store in the block handling the z-stencil, if there was a previous color load in the rcl;
- We previously only did that for non-MSAA z-stencil buffers (without the FULL_RES flag);
- The same thing actually needs to be done for the MSAA case too, as the reason why we need that dummy store also applies to MSAA loads.
If my understanding is correct, then consider this:
Otherwise, I'd be happy to know what I misunderstood in the process!
Cheers,
Paul
Quoted 61 lines
Fixes dEQP-EGL.functional.render.multi_context.gles2.rgb888_window
Signed-off-by Eric Anholt <[email protected]>Cc Paul Kocialkowski <[email protected]>Cc Maxime Ripard <[email protected]>--- drivers/gpu/drm/vc4/vc4_render_cl.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-)drivers/gpu/drm/vc4/vc4_render_cl.c +11
-12@@ -148,6 +148,12 @@ static void emit_tile(struct vc4_exec_info *exec, }if (setup->zs_read) { +if (setup->color_read) { +/* Exec previous load. */ +vc4_tile_coordinates (setup, x, y); +vc4_store_before_load (setup); + } +if (args->zs_read.flags &VC4_SUBMIT_RCL_SURFACE_READ_IS_FULL_RES ) {rcl_u8 (setup,VC4_PACKET_LOAD_FULL_RES_TILE_BUFFER );@@ -156,12 +162,6 @@ static void emit_tile(struct vc4_exec_info *exec, &args->zs_read, x, y) | VC4_LOADSTORE_FULL_RES_DISABLE_COLOR); }else { -if (setup->color_read) { -/* Exec previous load. */ -vc4_tile_coordinates (setup, x, y); -vc4_store_before_load (setup); - } -rcl_u8 (setup,VC4_PACKET_LOAD_TILE_BUFFER_GENERAL );rcl_u16 (setup, args->zs_read.bits); rcl_u32(setup, setup->zs_read->paddr +@@ -291,16 +291,15 @@ static int vc4_create_rcl_bo(struct drm_device *dev, struct vc4_exec_info *exec, } }if (setup->zs_read) { +if (setup->color_read) { + loop_body_size +=VC4_PACKET_TILE_COORDINATES_SIZE ; + loop_body_size +=VC4_PACKET_STORE_TILE_BUFFER_GENERAL_SIZE ; + } +if (args->zs_read.flags &VC4_SUBMIT_RCL_SURFACE_READ_IS_FULL_RES ) { loop_body_size +=VC4_PACKET_LOAD_FULL_RES_TILE_BUFFER_SIZE ; }else { -if (setup->color_read && - !(args->color_read.flags & -VC4_SUBMIT_RCL_SURFACE_READ_IS_FULL_RES )) { - loop_body_size +=VC4_PACKET_TILE_COORDINATES_SIZE ; - loop_body_size +=VC4_PACKET_STORE_TILE_BUFFER_GENERAL_SIZE ; - } loop_body_size +=VC4_PACKET_LOAD_TILE_BUFFER_GENERAL_SIZE ; } }
Signature · 8 lines
Paul Kocialkowski, Bootlin Embedded Linux and kernel engineering https://bootlin.com _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 22 lines · Paul Kocialkowski
Hi,
Quoted 3 lines · Eric Anholt
The HW only executes a load once the tile coordinates packet happens, and only tracks one at a time, so by emitting our two MSAA loads back to back we would end up with an undefined color or Z buffer.
This change deals with things that I'm not very familiar with, but here is my take on what is happening here:
- When we have to do more than a single load in the same render command list, we need to send out tile coordinates and a dummy store in between the two, because of internal architecture requirements of the GPU;
- We're dealing with the color buffer first and then the z-stencil buffer;
- As a result, we need to issue that dummy store in the block handling the z-stencil, if there was a previous color load in the rcl;
- We previously only did that for non-MSAA z-stencil buffers (without theFULL_RESflag);
- The same thing actually needs to be done for the MSAA case too, as the reason why we need that dummy store also applies to MSAA loads.
Quoted 2 lines
If my understanding is correct, then consider this:
Reviewed-by Paul Kocialkowski <[email protected]>
This is all correct. Thanks!