r600g: remove some magic numbers
This commit is contained in:
parent
1251e1df0f
commit
9bcce02f47
|
@ -1290,14 +1290,22 @@ void r600_init_config(struct r600_pipe_context *rctx)
|
||||||
|
|
||||||
if (family >= CHIP_RV770) {
|
if (family >= CHIP_RV770) {
|
||||||
r600_pipe_state_add_reg(rstate, R_008D8C_SQ_DYN_GPR_CNTL_PS_FLUSH_REQ, 0x00004000, 0xFFFFFFFF, NULL);
|
r600_pipe_state_add_reg(rstate, R_008D8C_SQ_DYN_GPR_CNTL_PS_FLUSH_REQ, 0x00004000, 0xFFFFFFFF, NULL);
|
||||||
r600_pipe_state_add_reg(rstate, R_009508_TA_CNTL_AUX, 0x07000002, 0xFFFFFFFF, NULL);
|
r600_pipe_state_add_reg(rstate, R_009508_TA_CNTL_AUX,
|
||||||
|
S_009508_DISABLE_CUBE_ANISO(1) |
|
||||||
|
S_009508_SYNC_GRADIENT(1) |
|
||||||
|
S_009508_SYNC_WALKER(1) |
|
||||||
|
S_009508_SYNC_ALIGNER(1), 0xFFFFFFFF, NULL);
|
||||||
r600_pipe_state_add_reg(rstate, R_009830_DB_DEBUG, 0x00000000, 0xFFFFFFFF, NULL);
|
r600_pipe_state_add_reg(rstate, R_009830_DB_DEBUG, 0x00000000, 0xFFFFFFFF, NULL);
|
||||||
r600_pipe_state_add_reg(rstate, R_009838_DB_WATERMARKS, 0x00420204, 0xFFFFFFFF, NULL);
|
r600_pipe_state_add_reg(rstate, R_009838_DB_WATERMARKS, 0x00420204, 0xFFFFFFFF, NULL);
|
||||||
r600_pipe_state_add_reg(rstate, R_0286C8_SPI_THREAD_GROUPING, 0x00000000, 0xFFFFFFFF, NULL);
|
r600_pipe_state_add_reg(rstate, R_0286C8_SPI_THREAD_GROUPING, 0x00000000, 0xFFFFFFFF, NULL);
|
||||||
r600_pipe_state_add_reg(rstate, R_028A4C_PA_SC_MODE_CNTL, 0x00514002, 0xFFFFFFFF, NULL);
|
r600_pipe_state_add_reg(rstate, R_028A4C_PA_SC_MODE_CNTL, 0x00514002, 0xFFFFFFFF, NULL);
|
||||||
} else {
|
} else {
|
||||||
r600_pipe_state_add_reg(rstate, R_008D8C_SQ_DYN_GPR_CNTL_PS_FLUSH_REQ, 0x00000000, 0xFFFFFFFF, NULL);
|
r600_pipe_state_add_reg(rstate, R_008D8C_SQ_DYN_GPR_CNTL_PS_FLUSH_REQ, 0x00000000, 0xFFFFFFFF, NULL);
|
||||||
r600_pipe_state_add_reg(rstate, R_009508_TA_CNTL_AUX, 0x07000003, 0xFFFFFFFF, NULL);
|
r600_pipe_state_add_reg(rstate, R_009508_TA_CNTL_AUX,
|
||||||
|
S_009508_DISABLE_CUBE_ANISO(1) |
|
||||||
|
S_009508_SYNC_GRADIENT(1) |
|
||||||
|
S_009508_SYNC_WALKER(1) |
|
||||||
|
S_009508_SYNC_ALIGNER(1), 0xFFFFFFFF, NULL);
|
||||||
r600_pipe_state_add_reg(rstate, R_009830_DB_DEBUG, 0x82000000, 0xFFFFFFFF, NULL);
|
r600_pipe_state_add_reg(rstate, R_009830_DB_DEBUG, 0x82000000, 0xFFFFFFFF, NULL);
|
||||||
r600_pipe_state_add_reg(rstate, R_009838_DB_WATERMARKS, 0x01020204, 0xFFFFFFFF, NULL);
|
r600_pipe_state_add_reg(rstate, R_009838_DB_WATERMARKS, 0x01020204, 0xFFFFFFFF, NULL);
|
||||||
r600_pipe_state_add_reg(rstate, R_0286C8_SPI_THREAD_GROUPING, 0x00000001, 0xFFFFFFFF, NULL);
|
r600_pipe_state_add_reg(rstate, R_0286C8_SPI_THREAD_GROUPING, 0x00000001, 0xFFFFFFFF, NULL);
|
||||||
|
|
|
@ -2556,6 +2556,9 @@
|
||||||
#define S_009508_DISABLE_CUBE_WRAP(x) (((x) & 0x1) << 0)
|
#define S_009508_DISABLE_CUBE_WRAP(x) (((x) & 0x1) << 0)
|
||||||
#define G_009508_DISABLE_CUBE_WRAP(x) (((x) >> 0) & 0x1)
|
#define G_009508_DISABLE_CUBE_WRAP(x) (((x) >> 0) & 0x1)
|
||||||
#define C_009508_DISABLE_CUBE_WRAP 0xFFFFFFFE
|
#define C_009508_DISABLE_CUBE_WRAP 0xFFFFFFFE
|
||||||
|
#define S_009508_DISABLE_CUBE_ANISO(x) (((x) & 0x1) << 1)
|
||||||
|
#define G_009508_DISABLE_CUBE_ANISO(x) (((x) >> 1) & 0x1)
|
||||||
|
#define C_009508_DISABLE_CUBE_ANISO (~(1 << 1))
|
||||||
#define S_009508_SYNC_GRADIENT(x) (((x) & 0x1) << 24)
|
#define S_009508_SYNC_GRADIENT(x) (((x) & 0x1) << 24)
|
||||||
#define G_009508_SYNC_GRADIENT(x) (((x) >> 24) & 0x1)
|
#define G_009508_SYNC_GRADIENT(x) (((x) >> 24) & 0x1)
|
||||||
#define C_009508_SYNC_GRADIENT 0xFEFFFFFF
|
#define C_009508_SYNC_GRADIENT 0xFEFFFFFF
|
||||||
|
|
Loading…
Reference in New Issue