radeonsi: remove r600_emit_reloc
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
This commit is contained in:
parent
da61946cb1
commit
345f04ed92
|
@ -113,21 +113,6 @@ radeon_add_to_buffer_list_check_mem(struct r600_common_context *rctx,
|
|||
return radeon_add_to_buffer_list(rctx, ring, rbo, usage, priority);
|
||||
}
|
||||
|
||||
static inline void r600_emit_reloc(struct r600_common_context *rctx,
|
||||
struct r600_ring *ring, struct r600_resource *rbo,
|
||||
enum radeon_bo_usage usage,
|
||||
enum radeon_bo_priority priority)
|
||||
{
|
||||
struct radeon_winsys_cs *cs = ring->cs;
|
||||
bool has_vm = ((struct r600_common_screen*)rctx->b.screen)->info.has_virtual_memory;
|
||||
unsigned reloc = radeon_add_to_buffer_list(rctx, ring, rbo, usage, priority);
|
||||
|
||||
if (!has_vm) {
|
||||
radeon_emit(cs, PKT3(PKT3_NOP, 0, 0));
|
||||
radeon_emit(cs, reloc);
|
||||
}
|
||||
}
|
||||
|
||||
static inline void radeon_set_config_reg_seq(struct radeon_winsys_cs *cs, unsigned reg, unsigned num)
|
||||
{
|
||||
assert(reg < R600_CONTEXT_REG_OFFSET);
|
||||
|
|
|
@ -169,9 +169,10 @@ void si_gfx_write_event_eop(struct r600_common_context *ctx,
|
|||
radeon_emit(cs, 0); /* unused */
|
||||
}
|
||||
|
||||
if (buf)
|
||||
r600_emit_reloc(ctx, &ctx->gfx, buf, RADEON_USAGE_WRITE,
|
||||
RADEON_PRIO_QUERY);
|
||||
if (buf) {
|
||||
radeon_add_to_buffer_list(ctx, &ctx->gfx, buf, RADEON_USAGE_WRITE,
|
||||
RADEON_PRIO_QUERY);
|
||||
}
|
||||
}
|
||||
|
||||
unsigned si_gfx_write_fence_dwords(struct r600_common_screen *screen)
|
||||
|
|
|
@ -791,8 +791,8 @@ static void r600_query_hw_do_emit_start(struct r600_common_context *ctx,
|
|||
default:
|
||||
assert(0);
|
||||
}
|
||||
r600_emit_reloc(ctx, &ctx->gfx, query->buffer.buf, RADEON_USAGE_WRITE,
|
||||
RADEON_PRIO_QUERY);
|
||||
radeon_add_to_buffer_list(ctx, &ctx->gfx, query->buffer.buf, RADEON_USAGE_WRITE,
|
||||
RADEON_PRIO_QUERY);
|
||||
}
|
||||
|
||||
static void r600_query_hw_emit_start(struct r600_common_context *ctx,
|
||||
|
@ -884,8 +884,8 @@ static void r600_query_hw_do_emit_stop(struct r600_common_context *ctx,
|
|||
default:
|
||||
assert(0);
|
||||
}
|
||||
r600_emit_reloc(ctx, &ctx->gfx, query->buffer.buf, RADEON_USAGE_WRITE,
|
||||
RADEON_PRIO_QUERY);
|
||||
radeon_add_to_buffer_list(ctx, &ctx->gfx, query->buffer.buf, RADEON_USAGE_WRITE,
|
||||
RADEON_PRIO_QUERY);
|
||||
|
||||
if (fence_va)
|
||||
si_gfx_write_event_eop(ctx, EVENT_TYPE_BOTTOM_OF_PIPE_TS, 0,
|
||||
|
@ -937,8 +937,8 @@ static void emit_set_predicate(struct r600_common_context *ctx,
|
|||
radeon_emit(cs, va);
|
||||
radeon_emit(cs, op | ((va >> 32) & 0xFF));
|
||||
}
|
||||
r600_emit_reloc(ctx, &ctx->gfx, buf, RADEON_USAGE_READ,
|
||||
RADEON_PRIO_QUERY);
|
||||
radeon_add_to_buffer_list(ctx, &ctx->gfx, buf, RADEON_USAGE_READ,
|
||||
RADEON_PRIO_QUERY);
|
||||
}
|
||||
|
||||
static void r600_emit_query_predication(struct r600_common_context *ctx,
|
||||
|
|
|
@ -295,8 +295,10 @@ static void si_emit_streamout_begin(struct r600_common_context *rctx, struct r60
|
|||
radeon_emit(cs, va); /* src address lo */
|
||||
radeon_emit(cs, va >> 32); /* src address hi */
|
||||
|
||||
r600_emit_reloc(&sctx->b, &sctx->b.gfx, t[i]->buf_filled_size,
|
||||
RADEON_USAGE_READ, RADEON_PRIO_SO_FILLED_SIZE);
|
||||
radeon_add_to_buffer_list(&sctx->b, &sctx->b.gfx,
|
||||
t[i]->buf_filled_size,
|
||||
RADEON_USAGE_READ,
|
||||
RADEON_PRIO_SO_FILLED_SIZE);
|
||||
} else {
|
||||
/* Start from the beginning. */
|
||||
radeon_emit(cs, PKT3(PKT3_STRMOUT_BUFFER_UPDATE, 4, 0));
|
||||
|
@ -335,8 +337,10 @@ void si_emit_streamout_end(struct si_context *sctx)
|
|||
radeon_emit(cs, 0); /* unused */
|
||||
radeon_emit(cs, 0); /* unused */
|
||||
|
||||
r600_emit_reloc(&sctx->b, &sctx->b.gfx, t[i]->buf_filled_size,
|
||||
RADEON_USAGE_WRITE, RADEON_PRIO_SO_FILLED_SIZE);
|
||||
radeon_add_to_buffer_list(&sctx->b, &sctx->b.gfx,
|
||||
t[i]->buf_filled_size,
|
||||
RADEON_USAGE_WRITE,
|
||||
RADEON_PRIO_SO_FILLED_SIZE);
|
||||
|
||||
/* Zero the buffer size. The counters (primitives generated,
|
||||
* primitives emitted) may be enabled even if there is not
|
||||
|
|
Loading…
Reference in New Issue