summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Randrianasulu <randrik@mail.ru>2010-01-20 11:36:30 -0500
committerDave Airlie <airlied@linux.ie>2010-01-21 08:17:13 +1000
commitf3d1ccc14f37a07614c67a270f05a8d94ec3667c (patch)
tree22a22e8fcac232f351a3884b2948431408b0e50a
parent700a0cc088a42a2ed92c6f961534fdb38588af87 (diff)
downloadop-kernel-dev-f3d1ccc14f37a07614c67a270f05a8d94ec3667c.zip
op-kernel-dev-f3d1ccc14f37a07614c67a270f05a8d94ec3667c.tar.gz
drm/radeon/kms/r200: fix bug in CS parser
The checks for CUBE and 3D textures were inverted. fixes fdo bug 24159 agd5f: added comments for clarity. Signed-off-by: Alex Deucher <alexdeucher@gmail.com> Signed-off-by: Dave Airlie <airlied@linux.ie>
-rw-r--r--drivers/gpu/drm/radeon/r200.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/r200.c b/drivers/gpu/drm/radeon/r200.c
index 2094212..ff1e0cd 100644
--- a/drivers/gpu/drm/radeon/r200.c
+++ b/drivers/gpu/drm/radeon/r200.c
@@ -371,13 +371,16 @@ int r200_packet0_check(struct radeon_cs_parser *p,
case 5:
case 6:
case 7:
+ /* 1D/2D */
track->textures[i].tex_coord_type = 0;
break;
case 1:
- track->textures[i].tex_coord_type = 1;
+ /* CUBE */
+ track->textures[i].tex_coord_type = 2;
break;
case 2:
- track->textures[i].tex_coord_type = 2;
+ /* 3D */
+ track->textures[i].tex_coord_type = 1;
break;
}
break;
OpenPOWER on IntegriCloud