OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vc4: Sync with kernel changes to relax BCL versus RCL validation.

Browse Source 
There was no reason to tie the two packets' values together.
This commit is contained in:
Eric Anholt
2015-04-09 13:41:29 -07:00
parent cb88d2cfcb
commit 725620f21d
1 changed files with 3 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/gallium/drivers/vc4/kernel/vc4_validate.c
View File

@@ -589,21 +589,6 @@ validate_tile_rendering_mode_config(VALIDATE_ARGS)
exec->fb_width = *(uint16_t *)(untrusted + 4); exec->fb_width = *(uint16_t *)(untrusted + 4);
exec->fb_height = *(uint16_t *)(untrusted + 6); exec->fb_height = *(uint16_t *)(untrusted + 6);
/* Make sure that the fb width/height matches the binning config -- we
* rely on being able to interchange these for various assertions.
* (Within a tile, loads and stores will be clipped to the
* width/height, but we allow load/storing to any binned tile).
*/
if (exec->fb_width <= (exec->bin_tiles_x - 1) * 64 ||
exec->fb_width > exec->bin_tiles_x * 64 ||
exec->fb_height <= (exec->bin_tiles_y - 1) * 64 ||
exec->fb_height > exec->bin_tiles_y * 64) {
DRM_ERROR("bin config %dx%d doesn't match FB %dx%d\n",
exec->bin_tiles_x, exec->bin_tiles_y,
exec->fb_width, exec->fb_height);
return -EINVAL;
}
flags = *(uint16_t *)(untrusted + 8); flags = *(uint16_t *)(untrusted + 8);
if ((flags & VC4_RENDER_CONFIG_FORMAT_MASK) == if ((flags & VC4_RENDER_CONFIG_FORMAT_MASK) ==
VC4_RENDER_CONFIG_FORMAT_RGBA8888) { VC4_RENDER_CONFIG_FORMAT_RGBA8888) {
@@ -632,13 +617,9 @@ validate_tile_coordinates(VALIDATE_ARGS)
uint8_t tile_x = *(uint8_t *)(untrusted + 0); uint8_t tile_x = *(uint8_t *)(untrusted + 0);
uint8_t tile_y = *(uint8_t *)(untrusted + 1); uint8_t tile_y = *(uint8_t *)(untrusted + 1);
if (tile_x >= exec->bin_tiles_x || if (tile_x * 64 >= exec->fb_width || tile_y * 64 >= exec->fb_height) {
tile_y >= exec->bin_tiles_y) { DRM_ERROR("Tile coordinates %d,%d > render config %dx%d\n",
DRM_ERROR("Tile coordinates %d,%d > bin config %d,%d\n", tile_x, tile_y, exec->fb_width, exec->fb_height);
tile_x,
tile_y,
exec->bin_tiles_x,
exec->bin_tiles_y);
return -EINVAL; return -EINVAL;
} }