aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/r100.c
diff options
context:
space:
mode:
authorMarek Olšák <maraeo@gmail.com>2010-02-21 15:24:15 -0500
committerDave Airlie <airlied@redhat.com>2010-04-19 00:17:02 -0400
commitcae94b0ad9d147152af77b971a7234faf20027a9 (patch)
tree491a54b19a794476512fa68bb76f53799674266d /drivers/gpu/drm/radeon/r100.c
parentf12eebb0acbaa6dcb60ed34451f5b159f509b2c0 (diff)
drm/radeon/kms: allow R500 regs VAP_ALT_NUM_VERTICES and VAP_INDEX_OFFSET
[airlied: fix V_A_N_V to not be safe and fix check to make sure only r500 - bump userspace version] Signed-off-by: Marek Olšák <maraeo@gmail.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/r100.c')
-rw-r--r--drivers/gpu/drm/radeon/r100.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
index e40dbdc4ebb3..c06207e4085c 100644
--- a/drivers/gpu/drm/radeon/r100.c
+++ b/drivers/gpu/drm/radeon/r100.c
@@ -3011,7 +3011,11 @@ int r100_cs_track_check(struct radeon_device *rdev, struct r100_cs_track *track)
3011 } 3011 }
3012 } 3012 }
3013 prim_walk = (track->vap_vf_cntl >> 4) & 0x3; 3013 prim_walk = (track->vap_vf_cntl >> 4) & 0x3;
3014 nverts = (track->vap_vf_cntl >> 16) & 0xFFFF; 3014 if (track->vap_vf_cntl & (1 << 14)) {
3015 nverts = track->vap_alt_nverts;
3016 } else {
3017 nverts = (track->vap_vf_cntl >> 16) & 0xFFFF;
3018 }
3015 switch (prim_walk) { 3019 switch (prim_walk) {
3016 case 1: 3020 case 1:
3017 for (i = 0; i < track->num_arrays; i++) { 3021 for (i = 0; i < track->num_arrays; i++) {