AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vc4: Handle stride==0 in VBO validation

Browse Source
This commit is contained in:
Eric Anholt
2014-08-04 18:30:33 -07:00
parent 0f034055f9
commit f5f8dd29c3
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/vc4/vc4_simulator_validate.c
+9 -7
View File
@@ -942,18 +942,20 @@ validate_shader_rec(struct drm_device *dev,
stride |= (*(uint32_t *)(pkt_u + 100 + i * 4)) & ~0xff;
if (vbo->base.size < offset ||
vbo->base.size - offset < attr_size ||
stride == 0) {
vbo->base.size - offset < attr_size) {
DRM_ERROR("BO offset overflow (%d + %d > %d)\n",
offset, attr_size, vbo->base.size);
return -EINVAL;
}
max_index = (vbo->base.size - offset - attr_size) / stride;
if (state->max_index > max_index) {
DRM_ERROR("primitives use index %d out of supplied %d\n",
state->max_index, max_index);
return -EINVAL;
if (stride != 0) {
max_index = ((vbo->base.size - offset - attr_size) /
stride);
if (state->max_index > max_index) {
DRM_ERROR("primitives use index %d out of supplied %d\n",
state->max_index, max_index);
return -EINVAL;
}
}
*(uint32_t *)(pkt_v + o) = vbo->paddr + offset;