fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-23 15:30:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

radeonsi: Fix omitted flush when moving suballocated texture

Browse source 
Fixes: 5e805cc74b "radeonsi: flush the context after resource_copy_region for buffer exports"

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4925>
This commit is contained in:
Blaž Tomažič 2020-05-06 21:34:10 +02:00 • committed by Marek Olšák
parent 37e89e3027
commit 808eb20186
3 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gallium/drivers/radeonsi/si_descriptors.c
View file

@ -835,7 +835,7 @@ void si_update_ps_colorbuf0_slot(struct si_context *sctx)
if (tex->buffer.b.b.nr_samples <= 1 && tex->cmask_buffer) { if (tex->buffer.b.b.nr_samples <= 1 && tex->cmask_buffer) {
/* Disable CMASK. */ /* Disable CMASK. */
assert(tex->cmask_buffer != &tex->buffer); assert(tex->cmask_buffer != &tex->buffer);
si_eliminate_fast_color_clear(sctx, tex); si_eliminate_fast_color_clear(sctx, tex, NULL);
si_texture_discard_cmask(sctx->screen, tex); si_texture_discard_cmask(sctx->screen, tex);
} }

3
src/gallium/drivers/radeonsi/si_pipe.h
View file

@ -1496,7 +1496,8 @@ void si_init_viewport_functions(struct si_context *ctx);
bool si_prepare_for_dma_blit(struct si_context *sctx, struct si_texture *dst, unsigned dst_level, bool si_prepare_for_dma_blit(struct si_context *sctx, struct si_texture *dst, unsigned dst_level,
unsigned dstx, unsigned dsty, unsigned dstz, struct si_texture *src, unsigned dstx, unsigned dsty, unsigned dstz, struct si_texture *src,
unsigned src_level, const struct pipe_box *src_box); unsigned src_level, const struct pipe_box *src_box);
void si_eliminate_fast_color_clear(struct si_context *sctx, struct si_texture *tex); void si_eliminate_fast_color_clear(struct si_context *sctx, struct si_texture *tex,
bool *ctx_flushed);
void si_texture_discard_cmask(struct si_screen *sscreen, struct si_texture *tex); void si_texture_discard_cmask(struct si_screen *sscreen, struct si_texture *tex);
bool si_init_flushed_depth_texture(struct pipe_context *ctx, struct pipe_resource *texture); bool si_init_flushed_depth_texture(struct pipe_context *ctx, struct pipe_resource *texture);
void si_print_texture_info(struct si_screen *sscreen, struct si_texture *tex, void si_print_texture_info(struct si_screen *sscreen, struct si_texture *tex,

17
src/gallium/drivers/radeonsi/si_texture.c
View file

@ -314,7 +314,8 @@ static int si_init_surface(struct si_screen *sscreen, struct radeon_surf *surfac
return 0; return 0;
} }
void si_eliminate_fast_color_clear(struct si_context *sctx, struct si_texture *tex) void si_eliminate_fast_color_clear(struct si_context *sctx, struct si_texture *tex,
bool *ctx_flushed)
{ {
struct si_screen *sscreen = sctx->screen; struct si_screen *sscreen = sctx->screen;
struct pipe_context *ctx = &sctx->b; struct pipe_context *ctx = &sctx->b;
@ -326,8 +327,14 @@ void si_eliminate_fast_color_clear(struct si_context *sctx, struct si_texture *t
ctx->flush_resource(ctx, &tex->buffer.b.b); ctx->flush_resource(ctx, &tex->buffer.b.b);
/* Flush only if any fast clear elimination took place. */ /* Flush only if any fast clear elimination took place. */
bool flushed = false;
if (n != sctx->num_decompress_calls) if (n != sctx->num_decompress_calls)
{
ctx->flush(ctx, NULL, 0); ctx->flush(ctx, NULL, 0);
flushed = true;
}
if (ctx_flushed)
*ctx_flushed = flushed;
if (ctx == sscreen->aux_context) if (ctx == sscreen->aux_context)
simple_mtx_unlock(&sscreen->aux_context_lock); simple_mtx_unlock(&sscreen->aux_context_lock);
@ -705,9 +712,11 @@ static bool si_texture_get_handle(struct pipe_screen *screen, struct pipe_contex
if (!(usage & PIPE_HANDLE_USAGE_EXPLICIT_FLUSH) && if (!(usage & PIPE_HANDLE_USAGE_EXPLICIT_FLUSH) &&
(tex->cmask_buffer || tex->surface.dcc_offset)) { (tex->cmask_buffer || tex->surface.dcc_offset)) {
/* Eliminate fast clear (both CMASK and DCC) */ /* Eliminate fast clear (both CMASK and DCC) */
si_eliminate_fast_color_clear(sctx, tex); bool flushed;
/* eliminate_fast_color_clear flushes the context */ si_eliminate_fast_color_clear(sctx, tex, &flushed);
flush = false; /* eliminate_fast_color_clear sometimes flushes the context */
if (flushed)
flush = false;
/* Disable CMASK if flush_resource isn't going /* Disable CMASK if flush_resource isn't going
* to be called. * to be called.