diff --git a/src/radeon_textured_videofuncs.c b/src/radeon_textured_videofuncs.c
index fce8efd..320ed0c 100644
--- a/src/radeon_textured_videofuncs.c
+++ b/src/radeon_textured_videofuncs.c
@@ -1179,20 +1179,16 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
 		BEGIN_RING(3 * vtx_count + 2);
 		OUT_RING(CP_PACKET3(R200_CP_PACKET3_3D_DRAW_IMMD_2,
 				3 * vtx_count));
-		OUT_RING(RADEON_CP_VC_CNTL_PRIM_TYPE_QUAD_LIST |
+		OUT_RING(RADEON_CP_VC_CNTL_PRIM_TYPE_RECT_LIST |
 		     RADEON_CP_VC_CNTL_PRIM_WALK_RING |
 		     (3 << RADEON_CP_VC_CNTL_NUM_SHIFT));
 	    }
 	}
 #else /* ACCEL_CP */
-	if (info->ChipFamily < CHIP_FAMILY_R200)
+	if (IS_R300_3D || IS_R500_3D)
+	    BEGIN_ACCEL(2 + vtx_count * 4);
+	else
 	    BEGIN_ACCEL(1 + vtx_count * 3);
-	else {
-	    if (IS_R300_3D || IS_R500_3D)
-		BEGIN_ACCEL(2 + vtx_count * 4);
-	    else
-		BEGIN_ACCEL(1 + vtx_count * 3);
-	}
 
 	if (info->ChipFamily < CHIP_FAMILY_R200)
 	    OUT_ACCEL_REG(RADEON_SE_VF_CNTL, (RADEON_VF_PRIM_TYPE_RECTANGLE_LIST |
@@ -1205,7 +1201,7 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
 					      RADEON_VF_PRIM_WALK_DATA |
 					      (4 << RADEON_VF_NUM_VERTICES_SHIFT)));
 	    else
-		OUT_ACCEL_REG(RADEON_SE_VF_CNTL, (RADEON_VF_PRIM_TYPE_QUAD_LIST |
+		OUT_ACCEL_REG(RADEON_SE_VF_CNTL, (RADEON_VF_PRIM_TYPE_RECTANGLE_LIST |
 					      RADEON_VF_PRIM_WALK_DATA |
 					      (3 << RADEON_VF_NUM_VERTICES_SHIFT)));
 	}