fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-03 07:10:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

r600g: cs init fixes

Browse source 
- all asics need to emit CONTEXT_CONTROL
- all r6xx asics need to emit 3D_START_CMDBUF

The ddx and r600c already do this. r600g should as well.

Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
This commit is contained in:
Alex Deucher 2011-05-31 10:43:31 -04:00
parent c4175c811e
commit b5518834e3
3 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gallium/winsys/r600/drm/evergreen_hw_context.c
View file

@ -1003,6 +1003,8 @@ int evergreen_context_init(struct r600_context *ctx, struct radeon *radeon)
r = -ENOMEM;
goto out_err;
}
r600_init_cs(ctx);
/* save 16dwords space for fence mecanism */
ctx->pm4_ndwords -= 16;

14
src/gallium/winsys/r600/drm/r600_hw_context.c
View file

@ -40,8 +40,14 @@
#define GROUP_FORCE_NEW_BLOCK 0
static void r600_init_cs(struct r600_context *ctx)
void r600_init_cs(struct r600_context *ctx)
{
/* R6xx requires this packet at the start of each command buffer */
if (ctx->radeon->family < CHIP_RV770) {
ctx->pm4[ctx->pm4_cdwords++] = PKT3(PKT3_START_3D_CMDBUF, 0, 0);
ctx->pm4[ctx->pm4_cdwords++] = 0x00000000;
}
/* All asics require this one */
ctx->pm4[ctx->pm4_cdwords++] = PKT3(PKT3_CONTEXT_CONTROL, 1, 0);
ctx->pm4[ctx->pm4_cdwords++] = 0x80000000;
ctx->pm4[ctx->pm4_cdwords++] = 0x80000000;
@ -788,8 +794,7 @@ int r600_context_init(struct r600_context *ctx, struct radeon *radeon)
goto out_err;
}
if (ctx->radeon->family == CHIP_R600)
r600_init_cs(ctx);
r600_init_cs(ctx);
/* save 16dwords space for fence mecanism */
ctx->pm4_ndwords -= 16;
@ -1395,8 +1400,7 @@ void r600_context_flush(struct r600_context *ctx)
ctx->pm4_cdwords = 0;
ctx->flags = 0;
if (ctx->radeon->family == CHIP_R600)
r600_init_cs(ctx);
r600_init_cs(ctx);
/* resume queries */
r600_context_queries_resume(ctx);

1
src/gallium/winsys/r600/drm/r600_priv.h
View file

@ -166,6 +166,7 @@ int r600_setup_block_table(struct r600_context *ctx);
void r600_context_reg(struct r600_context *ctx,
unsigned offset, unsigned value,
unsigned mask);
void r600_init_cs(struct r600_context *ctx);
/*
* r600_bo.c
*/