diff options
| author | Tom Stellard <[email protected]> | 2013-06-12 14:38:59 -0700 |
|---|---|---|
| committer | Tom Stellard <[email protected]> | 2013-06-28 08:33:11 -0700 |
| commit | 2840bec56f79347b95dec5458b20d4a46d1aa445 (patch) | |
| tree | c49c4c6a610869ffed879b9e74f426a7c9bc99a0 /src/gallium/drivers/r600/evergreen_state.c | |
| parent | 2639fca1f017907af7ce446fba60b520aa376abc (diff) | |
r600g/compute: Accept LDS size from the LLVM backend
And allocate the correct amount before dispatching the kernel.
Tested-by: Aaron Watry <[email protected]>
Diffstat (limited to 'src/gallium/drivers/r600/evergreen_state.c')
| -rw-r--r-- | src/gallium/drivers/r600/evergreen_state.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/drivers/r600/evergreen_state.c b/src/gallium/drivers/r600/evergreen_state.c index 3ebb157b530..72a2fe2b6b1 100644 --- a/src/gallium/drivers/r600/evergreen_state.c +++ b/src/gallium/drivers/r600/evergreen_state.c @@ -2974,9 +2974,6 @@ void evergreen_init_common_regs(struct r600_command_buffer *cb, r600_store_value(cb, tmp); /* R_008C0C_SQ_GPR_RESOURCE_MGMT_3 */ } - r600_store_config_reg(cb, R_008E2C_SQ_LDS_RESOURCE_MGMT, - S_008E2C_NUM_PS_LDS(0x1000) | S_008E2C_NUM_LS_LDS(0x1000)); - r600_store_context_reg(cb, R_028A4C_PA_SC_MODE_CNTL_1, 0); /* The cs checker requires this register to be set. */ @@ -3195,6 +3192,9 @@ void evergreen_init_atom_start_cs(struct r600_context *rctx) tmp |= S_008C28_NUM_LS_STACK_ENTRIES(num_ls_stack_entries); r600_store_value(cb, tmp); /* R_008C28_SQ_STACK_RESOURCE_MGMT_3 */ + r600_store_config_reg(cb, R_008E2C_SQ_LDS_RESOURCE_MGMT, + S_008E2C_NUM_PS_LDS(0x1000) | S_008E2C_NUM_LS_LDS(0x1000)); + r600_store_config_reg(cb, R_009100_SPI_CONFIG_CNTL, 0); r600_store_config_reg(cb, R_00913C_SPI_CONFIG_CNTL_1, S_00913C_VTX_DONE_DELAY(4)); |