diff options
| -rw-r--r-- | drivers/char/drm/radeon_drv.h | 4 | ||||
| -rw-r--r-- | drivers/char/drm/radeon_state.c | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/drivers/char/drm/radeon_drv.h b/drivers/char/drm/radeon_drv.h index 78345cee8f8e..b2a6f92d1f0f 100644 --- a/drivers/char/drm/radeon_drv.h +++ b/drivers/char/drm/radeon_drv.h | |||
| @@ -38,7 +38,7 @@ | |||
| 38 | 38 | ||
| 39 | #define DRIVER_NAME "radeon" | 39 | #define DRIVER_NAME "radeon" |
| 40 | #define DRIVER_DESC "ATI Radeon" | 40 | #define DRIVER_DESC "ATI Radeon" |
| 41 | #define DRIVER_DATE "20060225" | 41 | #define DRIVER_DATE "20060519" |
| 42 | 42 | ||
| 43 | /* Interface history: | 43 | /* Interface history: |
| 44 | * | 44 | * |
| @@ -884,6 +884,8 @@ extern int r300_do_cp_cmdbuf(drm_device_t * dev, DRMFILE filp, | |||
| 884 | #define RADEON_PP_CUBIC_OFFSET_T1_0 0x1e00 | 884 | #define RADEON_PP_CUBIC_OFFSET_T1_0 0x1e00 |
| 885 | #define RADEON_PP_CUBIC_OFFSET_T2_0 0x1e14 | 885 | #define RADEON_PP_CUBIC_OFFSET_T2_0 0x1e14 |
| 886 | 886 | ||
| 887 | #define RADEON_SE_TCL_STATE_FLUSH 0x2284 | ||
| 888 | |||
| 887 | #define SE_VAP_CNTL__TCL_ENA_MASK 0x00000001 | 889 | #define SE_VAP_CNTL__TCL_ENA_MASK 0x00000001 |
| 888 | #define SE_VAP_CNTL__FORCE_W_TO_ONE_MASK 0x00010000 | 890 | #define SE_VAP_CNTL__FORCE_W_TO_ONE_MASK 0x00010000 |
| 889 | #define SE_VAP_CNTL__VF_MAX_VTX_NUM__SHIFT 0x00000012 | 891 | #define SE_VAP_CNTL__VF_MAX_VTX_NUM__SHIFT 0x00000012 |
diff --git a/drivers/char/drm/radeon_state.c b/drivers/char/drm/radeon_state.c index c5b8f774a599..4ca6bd13d589 100644 --- a/drivers/char/drm/radeon_state.c +++ b/drivers/char/drm/radeon_state.c | |||
| @@ -2595,7 +2595,8 @@ static __inline__ int radeon_emit_vectors(drm_radeon_private_t *dev_priv, | |||
| 2595 | int stride = header.vectors.stride; | 2595 | int stride = header.vectors.stride; |
| 2596 | RING_LOCALS; | 2596 | RING_LOCALS; |
| 2597 | 2597 | ||
| 2598 | BEGIN_RING(3 + sz); | 2598 | BEGIN_RING(5 + sz); |
| 2599 | OUT_RING_REG(RADEON_SE_TCL_STATE_FLUSH, 0); | ||
| 2599 | OUT_RING(CP_PACKET0(RADEON_SE_TCL_VECTOR_INDX_REG, 0)); | 2600 | OUT_RING(CP_PACKET0(RADEON_SE_TCL_VECTOR_INDX_REG, 0)); |
| 2600 | OUT_RING(start | (stride << RADEON_VEC_INDX_OCTWORD_STRIDE_SHIFT)); | 2601 | OUT_RING(start | (stride << RADEON_VEC_INDX_OCTWORD_STRIDE_SHIFT)); |
| 2601 | OUT_RING(CP_PACKET0_TABLE(RADEON_SE_TCL_VECTOR_DATA_REG, (sz - 1))); | 2602 | OUT_RING(CP_PACKET0_TABLE(RADEON_SE_TCL_VECTOR_DATA_REG, (sz - 1))); |
