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

vc4: Fix accidental dropping of the low bits of the store tilebuffer packet.

Browse Source 
Notably this included the EOF flag (the other bits are the full buffer
dump selection, but we don't do full dumps), which caused the kernel
checking for frame completion to trigger.
This commit is contained in:
Eric Anholt
2014-10-17 12:14:11 +01:00
parent afc3aa373d
commit 1f7048419e
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/vc4/kernel/vc4_validate.c
+5 -3
View File
@@ -268,7 +268,7 @@ validate_loadstore_tile_buffer_general(VALIDATE_ARGS)
uint32_t packet_b1 = *(uint8_t *)(untrusted + 1);
struct drm_gem_cma_object *fbo;
uint32_t buffer_type = packet_b0 & 0xf;
uint32_t offset, cpp;
uint32_t untrusted_address, offset, cpp;
switch (buffer_type) {
case VC4_LOADSTORE_TILE_BUFFER_NONE:
@@ -295,7 +295,8 @@ validate_loadstore_tile_buffer_general(VALIDATE_ARGS)
if (!vc4_use_handle(exec, 0, VC4_MODE_RENDER, &fbo))
return -EINVAL;
offset = *(uint32_t *)(untrusted + 2) & ~0xf;
untrusted_address = *(uint32_t *)(untrusted + 2);
offset = untrusted_address & ~0xf;
if (!check_tex_size(exec, fbo, offset,
((packet_b0 &
@@ -305,7 +306,8 @@ validate_loadstore_tile_buffer_general(VALIDATE_ARGS)
return -EINVAL;
}
*(uint32_t *)(validated + 2) = offset + fbo->paddr;
*(uint32_t *)(validated + 2) = (offset + fbo->paddr +
(untrusted_address & 0xf));
return 0;
}