Module: Mesa
Branch: master
Commit: 725620f21d19365d7a8a34d0c72694384c680afc
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=725620f21d19365d7a8a34d0c72694384c680afc
Author: Eric Anholt <e...@anholt.net>
Date: Thu Apr 9 13:41:29 2015 -0700
vc4: Sync with kernel changes to relax BCL versus RCL validation.
There was no reason to tie the two packets' values together.
---
src/gallium/drivers/vc4/kernel/vc4_validate.c | 25 +++----------------------
1 file changed, 3 insertions(+), 22 deletions(-)
diff --git a/src/gallium/drivers/vc4/kernel/vc4_validate.c
b/src/gallium/drivers/vc4/kernel/vc4_validate.c
index 568b625..6b73587 100644
--- a/src/gallium/drivers/vc4/kernel/vc4_validate.c
+++ b/src/gallium/drivers/vc4/kernel/vc4_validate.c
@@ -589,21 +589,6 @@ validate_tile_rendering_mode_config(VALIDATE_ARGS)
exec->fb_width = *(uint16_t *)(untrusted + 4);
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);
if ((flags & VC4_RENDER_CONFIG_FORMAT_MASK) ==
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_y = *(uint8_t *)(untrusted + 1);
- if (tile_x >= exec->bin_tiles_x ||
- tile_y >= exec->bin_tiles_y) {
- DRM_ERROR("Tile coordinates %d,%d > bin config %d,%d\n",
- tile_x,
- tile_y,
- exec->bin_tiles_x,
- exec->bin_tiles_y);
+ if (tile_x * 64 >= exec->fb_width || tile_y * 64 >= exec->fb_height) {
+ DRM_ERROR("Tile coordinates %d,%d > render config %dx%d\n",
+ tile_x, tile_y, exec->fb_width, exec->fb_height);
return -EINVAL;
}
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
