Module: Mesa Branch: master Commit: 3e6888e5d7caaa6b588c94a89010478fad286d99 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3e6888e5d7caaa6b588c94a89010478fad286d99
Author: Marek Olšák <[email protected]> Date: Thu Jul 12 00:05:23 2018 -0400 radeonsi: remove non-GFX BO priority flags For a later simplification. Reviewed-by: Samuel Pitoiset <[email protected]> --- src/gallium/drivers/radeon/radeon_uvd.c | 3 +-- src/gallium/drivers/radeon/radeon_uvd_enc_1_1.c | 2 +- src/gallium/drivers/radeon/radeon_vce.c | 2 +- src/gallium/drivers/radeon/radeon_vcn_dec.c | 2 +- src/gallium/drivers/radeon/radeon_vcn_enc_1_2.c | 2 +- src/gallium/drivers/radeon/radeon_winsys.h | 5 ----- src/gallium/drivers/radeonsi/si_debug.c | 4 ---- src/gallium/drivers/radeonsi/si_dma_cs.c | 6 ++---- 8 files changed, 7 insertions(+), 19 deletions(-) diff --git a/src/gallium/drivers/radeon/radeon_uvd.c b/src/gallium/drivers/radeon/radeon_uvd.c index dbf3c95175..923216d77f 100644 --- a/src/gallium/drivers/radeon/radeon_uvd.c +++ b/src/gallium/drivers/radeon/radeon_uvd.c @@ -116,8 +116,7 @@ static void send_cmd(struct ruvd_decoder *dec, unsigned cmd, int reloc_idx; reloc_idx = dec->ws->cs_add_buffer(dec->cs, buf, usage | RADEON_USAGE_SYNCHRONIZED, - domain, - RADEON_PRIO_UVD); + domain, 0); if (!dec->use_legacy) { uint64_t addr; addr = dec->ws->buffer_get_virtual_address(buf); diff --git a/src/gallium/drivers/radeon/radeon_uvd_enc_1_1.c b/src/gallium/drivers/radeon/radeon_uvd_enc_1_1.c index 42a9fa9abf..ddb219792a 100644 --- a/src/gallium/drivers/radeon/radeon_uvd_enc_1_1.c +++ b/src/gallium/drivers/radeon/radeon_uvd_enc_1_1.c @@ -55,7 +55,7 @@ radeon_uvd_enc_add_buffer(struct radeon_uvd_encoder *enc, enum radeon_bo_domain domain, signed offset) { enc->ws->cs_add_buffer(enc->cs, buf, usage | RADEON_USAGE_SYNCHRONIZED, - domain, RADEON_PRIO_VCE); + domain, 0); uint64_t addr; addr = enc->ws->buffer_get_virtual_address(buf); addr = addr + offset; diff --git a/src/gallium/drivers/radeon/radeon_vce.c b/src/gallium/drivers/radeon/radeon_vce.c index 6d1b1ff787..8972253c7c 100644 --- a/src/gallium/drivers/radeon/radeon_vce.c +++ b/src/gallium/drivers/radeon/radeon_vce.c @@ -559,7 +559,7 @@ void si_vce_add_buffer(struct rvce_encoder *enc, struct pb_buffer *buf, int reloc_idx; reloc_idx = enc->ws->cs_add_buffer(enc->cs, buf, usage | RADEON_USAGE_SYNCHRONIZED, - domain, RADEON_PRIO_VCE); + domain, 0); if (enc->use_vm) { uint64_t addr; addr = enc->ws->buffer_get_virtual_address(buf); diff --git a/src/gallium/drivers/radeon/radeon_vcn_dec.c b/src/gallium/drivers/radeon/radeon_vcn_dec.c index ed7223bbec..c2e22048ce 100644 --- a/src/gallium/drivers/radeon/radeon_vcn_dec.c +++ b/src/gallium/drivers/radeon/radeon_vcn_dec.c @@ -1033,7 +1033,7 @@ static void send_cmd(struct radeon_decoder *dec, unsigned cmd, uint64_t addr; dec->ws->cs_add_buffer(dec->cs, buf, usage | RADEON_USAGE_SYNCHRONIZED, - domain, RADEON_PRIO_UVD); + domain, 0); addr = dec->ws->buffer_get_virtual_address(buf); addr = addr + off; diff --git a/src/gallium/drivers/radeon/radeon_vcn_enc_1_2.c b/src/gallium/drivers/radeon/radeon_vcn_enc_1_2.c index 143721211d..6632451900 100644 --- a/src/gallium/drivers/radeon/radeon_vcn_enc_1_2.c +++ b/src/gallium/drivers/radeon/radeon_vcn_enc_1_2.c @@ -56,7 +56,7 @@ static void radeon_enc_add_buffer(struct radeon_encoder *enc, struct pb_buffer * signed offset) { enc->ws->cs_add_buffer(enc->cs, buf, usage | RADEON_USAGE_SYNCHRONIZED, - domain, RADEON_PRIO_VCE); + domain, 0); uint64_t addr; addr = enc->ws->buffer_get_virtual_address(buf); addr = addr + offset; diff --git a/src/gallium/drivers/radeon/radeon_winsys.h b/src/gallium/drivers/radeon/radeon_winsys.h index 22ec47b9dc..e9ae1f925c 100644 --- a/src/gallium/drivers/radeon/radeon_winsys.h +++ b/src/gallium/drivers/radeon/radeon_winsys.h @@ -127,11 +127,6 @@ enum radeon_bo_priority { RADEON_PRIO_DRAW_INDIRECT, RADEON_PRIO_INDEX_BUFFER, - RADEON_PRIO_VCE = 8, - RADEON_PRIO_UVD, - RADEON_PRIO_SDMA_BUFFER, - RADEON_PRIO_SDMA_TEXTURE, - RADEON_PRIO_CP_DMA = 12, RADEON_PRIO_CONST_BUFFER = 16, diff --git a/src/gallium/drivers/radeonsi/si_debug.c b/src/gallium/drivers/radeonsi/si_debug.c index 8581228263..0e5012b9d3 100644 --- a/src/gallium/drivers/radeonsi/si_debug.c +++ b/src/gallium/drivers/radeonsi/si_debug.c @@ -496,10 +496,6 @@ static const char *priority_to_string(enum radeon_bo_priority priority) ITEM(IB2), ITEM(DRAW_INDIRECT), ITEM(INDEX_BUFFER), - ITEM(VCE), - ITEM(UVD), - ITEM(SDMA_BUFFER), - ITEM(SDMA_TEXTURE), ITEM(CP_DMA), ITEM(CONST_BUFFER), ITEM(DESCRIPTORS), diff --git a/src/gallium/drivers/radeonsi/si_dma_cs.c b/src/gallium/drivers/radeonsi/si_dma_cs.c index 0308112cbb..3bb769309e 100644 --- a/src/gallium/drivers/radeonsi/si_dma_cs.c +++ b/src/gallium/drivers/radeonsi/si_dma_cs.c @@ -93,13 +93,11 @@ void si_need_dma_space(struct si_context *ctx, unsigned num_dw, if (dst) { radeon_add_to_buffer_list(ctx, ctx->dma_cs, dst, - RADEON_USAGE_WRITE, - RADEON_PRIO_SDMA_BUFFER); + RADEON_USAGE_WRITE, 0); } if (src) { radeon_add_to_buffer_list(ctx, ctx->dma_cs, src, - RADEON_USAGE_READ, - RADEON_PRIO_SDMA_BUFFER); + RADEON_USAGE_READ, 0); } /* this function is called before all DMA calls, so increment this. */ _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
