summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/vc4/vc4_simulator.c
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2014-07-31 12:46:13 -0700
committerEric Anholt <eric@anholt.net>2014-08-11 14:45:30 -0700
commit771d86abd6c204cef82c5838b1ed20e4b8dbfa85 (patch)
tree4ed0537fd3cc7f5c66f81a8507c7666ab13cddc5 /src/gallium/drivers/vc4/vc4_simulator.c
parentc58f35393e9505ec8694b87579037f58df607865 (diff)
downloadexternal_mesa3d-771d86abd6c204cef82c5838b1ed20e4b8dbfa85.zip
external_mesa3d-771d86abd6c204cef82c5838b1ed20e4b8dbfa85.tar.gz
external_mesa3d-771d86abd6c204cef82c5838b1ed20e4b8dbfa85.tar.bz2
vc4: Compute the proper end address of the relocated command lists.
render_cl_size/bin_cl_size includes relocations, while the hardware buffer doesn't. If you don't emit a HALT packet, the command parser continues until the end register's value. We can't allow executing unvalidated buffer contents (and it's actually harmful in the render lists Mesa is emitting, since VC4_PACKET_STORE_MS_TILE_BUFFER_AND_EOF doesn't trigger a halt).
Diffstat (limited to 'src/gallium/drivers/vc4/vc4_simulator.c')
-rw-r--r--src/gallium/drivers/vc4/vc4_simulator.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/gallium/drivers/vc4/vc4_simulator.c b/src/gallium/drivers/vc4/vc4_simulator.c
index 633e809..b2f2b66 100644
--- a/src/gallium/drivers/vc4/vc4_simulator.c
+++ b/src/gallium/drivers/vc4/vc4_simulator.c
@@ -184,9 +184,7 @@ vc4_cl_validate(struct drm_device *dev, struct exec_info *exec)
#endif
exec->ct0ca = exec->exec_bo->paddr + bin_offset;
- exec->ct0ea = exec->ct0ca + args->bin_cl_size;
exec->ct1ca = exec->exec_bo->paddr + render_offset;
- exec->ct1ea = exec->ct1ca + args->render_cl_size;
exec->shader_rec_v = exec->exec_bo->vaddr + shader_rec_offset;
exec->shader_rec_p = exec->exec_bo->paddr + shader_rec_offset;