aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorAlex Deucher <alexdeucher@gmail.com>2010-01-18 20:20:07 -0500
committerDave Airlie <airlied@linux.ie>2010-01-21 08:18:18 +1000
commitcf57fc7aa2ac61d02a29550b99db6a01ccd7917c (patch)
treef266175928615dc0543d0ee4911f939e3e8d549c /drivers/gpu
parent828153e29206196552c2cc34461ad7e5b93e3f22 (diff)
downloadkernel_samsung_tuna-cf57fc7aa2ac61d02a29550b99db6a01ccd7917c.zip
kernel_samsung_tuna-cf57fc7aa2ac61d02a29550b99db6a01ccd7917c.tar.gz
kernel_samsung_tuna-cf57fc7aa2ac61d02a29550b99db6a01ccd7917c.tar.bz2
drm/radeon/kms/r100: fix bug in CS parser
The first dword of PACKET3_3D_DRAW_IMMD maps to SE_VTX_FMT so the vertex size is part of the draw packet. This patch fixes a possible case where you have a command buffer that does not contain SE_VTX_FMT register write, but does contain PACKET3_3D_DRAW_IMMD. Signed-off-by: Alex Deucher <alexdeucher@gmail.com> Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/radeon/r100.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
index 62b27be..11c9a3f 100644
--- a/drivers/gpu/drm/radeon/r100.c
+++ b/drivers/gpu/drm/radeon/r100.c
@@ -1504,6 +1504,7 @@ static int r100_packet3_check(struct radeon_cs_parser *p,
DRM_ERROR("PRIM_WALK must be 3 for IMMD draw\n");
return -EINVAL;
}
+ track->vtx_size = r100_get_vtx_size(radeon_get_ib_value(p, idx + 0));
track->vap_vf_cntl = radeon_get_ib_value(p, idx + 1);
track->immd_dwords = pkt->count - 1;
r = r100_cs_track_check(p->rdev, track);