diff options
| author | Dave Airlie <[email protected]> | 2013-12-24 05:30:37 +0000 |
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2014-02-05 10:49:39 +1000 |
| commit | 2b0be2015d6501d0f03ea1c6b0c36ffb301ac15a (patch) | |
| tree | 3f20f521206860ac5c5bc3c8e70b7045e09cde4c /src/gallium | |
| parent | f4652babbde7bd9a7660ece7fe38ed16e294595e (diff) | |
r600g: enable instance cnt register with new enough kernel
The instance cnt register was missing for a few kernels,
with a new enough kernel we can output it.
Signed-off-by: Dave Airlie <[email protected]>
Reviewed-by: Alex Deucher <[email protected]>
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/drivers/r600/evergreen_state.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gallium/drivers/r600/evergreen_state.c b/src/gallium/drivers/r600/evergreen_state.c index c206c08c9c9..057852029ff 100644 --- a/src/gallium/drivers/r600/evergreen_state.c +++ b/src/gallium/drivers/r600/evergreen_state.c @@ -3595,6 +3595,7 @@ void evergreen_update_es_state(struct pipe_context *ctx, struct r600_pipe_shader void evergreen_update_gs_state(struct pipe_context *ctx, struct r600_pipe_shader *shader) { + struct r600_context *rctx = (struct r600_context *)ctx; struct r600_command_buffer *cb = &shader->command_buffer; struct r600_shader *rshader = &shader->shader; struct r600_shader *cp_shader = &shader->gs_copy_shader->shader; @@ -3611,12 +3612,11 @@ void evergreen_update_gs_state(struct pipe_context *ctx, struct r600_pipe_shader r600_store_context_reg(cb, R_028B38_VGT_GS_MAX_VERT_OUT, S_028B38_MAX_VERT_OUT(rshader->gs_max_out_vertices)); - -/* XXX kernel checker fails - r600_store_context_reg(cb, R_028B90_VGT_GS_INSTANCE_CNT, - S_028B90_CNT(0) | - S_028B90_ENABLE(0)); -*/ + if (rctx->screen->b.info.drm_minor >= 35) { + r600_store_context_reg(cb, R_028B90_VGT_GS_INSTANCE_CNT, + S_028B90_CNT(0) | + S_028B90_ENABLE(0)); + } r600_store_context_reg_seq(cb, R_02891C_SQ_GS_VERT_ITEMSIZE, 4); r600_store_value(cb, cp_shader->ring_item_size >> 2); r600_store_value(cb, 0); |