[Mesa-dev] [PATCH v2 2/2] radeonsi: Enable loading into CE RAM.

[Nicolai Hähnle]

For the series:

Reviewed-by: Nicolai Hähnle <nicolai.haehnle at amd.com>

On 21.04.2016 05:12, Bas Nieuwenhuizen wrote:
> We need to enable a bit in the CONTEXT_CONTROL packet for the
> loads to work.
>
> v2: Style issues.
>
> Signed-off-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
> ---
>   src/gallium/drivers/radeonsi/si_descriptors.c | 7 +++++++
>   src/gallium/drivers/radeonsi/si_hw_context.c  | 5 +++++
>   src/gallium/drivers/radeonsi/si_state.h       | 1 +
>   3 files changed, 13 insertions(+)
>
> diff --git a/src/gallium/drivers/radeonsi/si_descriptors.c b/src/gallium/drivers/radeonsi/si_descriptors.c
> index 1580e61..9ad630b 100644
> --- a/src/gallium/drivers/radeonsi/si_descriptors.c
> +++ b/src/gallium/drivers/radeonsi/si_descriptors.c
> @@ -185,6 +185,13 @@ static void si_reinitialize_ce_ram(struct si_context *sctx,
>   	desc->ce_ram_dirty = false;
>   }
>
> +void si_ce_enable_loads(struct radeon_winsys_cs *ib)
> +{
> +	radeon_emit(ib, PKT3(PKT3_CONTEXT_CONTROL, 1, 0));
> +	radeon_emit(ib, LOAD_CONTROL_LOAD_ENABLE(1) | LOAD_CONTROL_LOAD_CE_RAM(1));
> +	radeon_emit(ib, SHADOW_ENABLE_SHADOW_ENABLE(1));
> +}
> +
>   static bool si_upload_descriptors(struct si_context *sctx,
>   				  struct si_descriptors *desc,
>   				  struct r600_atom * atom)
> diff --git a/src/gallium/drivers/radeonsi/si_hw_context.c b/src/gallium/drivers/radeonsi/si_hw_context.c
> index e3abb7f..e6018f3 100644
> --- a/src/gallium/drivers/radeonsi/si_hw_context.c
> +++ b/src/gallium/drivers/radeonsi/si_hw_context.c
> @@ -202,6 +202,11 @@ void si_begin_new_cs(struct si_context *ctx)
>   	if (ctx->init_config_gs_rings)
>   		si_pm4_emit(ctx, ctx->init_config_gs_rings);
>
> +	if (ctx->ce_preamble_ib)
> +		si_ce_enable_loads(ctx->ce_preamble_ib);
> +	else if (ctx->ce_ib)
> +		si_ce_enable_loads(ctx->ce_ib);
> +
>   	ctx->framebuffer.dirty_cbufs = (1 << 8) - 1;
>   	ctx->framebuffer.dirty_zsbuf = true;
>   	si_mark_atom_dirty(ctx, &ctx->framebuffer.atom);
> diff --git a/src/gallium/drivers/radeonsi/si_state.h b/src/gallium/drivers/radeonsi/si_state.h
> index c4b2b45..cbe91dd 100644
> --- a/src/gallium/drivers/radeonsi/si_state.h
> +++ b/src/gallium/drivers/radeonsi/si_state.h
> @@ -251,6 +251,7 @@ struct si_buffer_resources {
>   	} while(0)
>
>   /* si_descriptors.c */
> +void si_ce_enable_loads(struct radeon_winsys_cs *ib);
>   void si_set_ring_buffer(struct pipe_context *ctx, uint shader, uint slot,
>   			struct pipe_resource *buffer,
>   			unsigned stride, unsigned num_records,
>