From 092b442bc4f6dbaf69ed2d2f3c68e9861b70e8dd Mon Sep 17 00:00:00 2001 From: Roland Scheidegger Date: Wed, 30 Aug 2006 23:17:55 +0100 Subject: [PATCH] --- yaml --- r: 33711 b: refs/heads/master c: 18f2905fcec3e06deafd25a02e37eabaaaaef744 h: refs/heads/master i: 33709: 085163831bda1edc3066bdbd088ff1f3ac514737 33707: 8d6f41ab10093703b1311cc0f5a97f6c7406e056 33703: 163b9789f60c0c806297768c7eaf5f0930412fc3 33695: dae2834dad33bae9635f523079f03ef332f6714c v: v3 --- [refs] | 2 +- trunk/drivers/char/drm/radeon_state.c | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d6e690a8bb21..0a54dae60fc4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a7dec1e0dbb9e8e032b56a62d07ab6ac009109d3 +refs/heads/master: 18f2905fcec3e06deafd25a02e37eabaaaaef744 diff --git a/trunk/drivers/char/drm/radeon_state.c b/trunk/drivers/char/drm/radeon_state.c index 5bb2234a9094..39a7f685e3fd 100644 --- a/trunk/drivers/char/drm/radeon_state.c +++ b/trunk/drivers/char/drm/radeon_state.c @@ -175,6 +175,14 @@ static __inline__ int radeon_check_and_fixup_packets(drm_radeon_private_t * } break; + case R200_EMIT_VAP_CTL:{ + RING_LOCALS; + BEGIN_RING(2); + OUT_RING_REG(RADEON_SE_TCL_STATE_FLUSH, 0); + ADVANCE_RING(); + } + break; + case RADEON_EMIT_RB3D_COLORPITCH: case RADEON_EMIT_RE_LINE_PATTERN: case RADEON_EMIT_SE_LINE_WIDTH: @@ -202,7 +210,6 @@ static __inline__ int radeon_check_and_fixup_packets(drm_radeon_private_t * case R200_EMIT_TCL_LIGHT_MODEL_CTL_0: case R200_EMIT_TFACTOR_0: case R200_EMIT_VTX_FMT_0: - case R200_EMIT_VAP_CTL: case R200_EMIT_MATRIX_SELECT_0: case R200_EMIT_TEX_PROC_CTL_2: case R200_EMIT_TCL_UCP_VERT_BLEND_CTL: