diff options
| author | Eric Anholt <eric@anholt.net> | 2016-08-30 22:57:38 +0200 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2016-08-30 23:01:21 +0200 |
| commit | 313a61d30761217ce4383018de1cc0d5d503a376 (patch) | |
| tree | 597a8949b6ed31b2bbbf87004f666a6b0d5bdc03 /drivers/gpu | |
| parent | drm/vc4: Fix oops when userspace hands in a bad BO. (diff) | |
| download | linux-313a61d30761217ce4383018de1cc0d5d503a376.tar.xz linux-313a61d30761217ce4383018de1cc0d5d503a376.zip | |
drm/vc4: Allow some more signals to be packed with uniform resets.
The intent was to make sure people don't sneak in a small immediate or
something to change the interpretation of the uniform update args, but
these signals are just fine.
Fixes a validation failure in the current X server on some Render
operation.
Signed-off-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/vc4/vc4_validate_shaders.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/gpu/drm/vc4/vc4_validate_shaders.c b/drivers/gpu/drm/vc4/vc4_validate_shaders.c index 46527e989ce3..2543cf5b8b51 100644 --- a/drivers/gpu/drm/vc4/vc4_validate_shaders.c +++ b/drivers/gpu/drm/vc4/vc4_validate_shaders.c @@ -309,8 +309,14 @@ validate_uniform_address_write(struct vc4_validated_shader_info *validated_shade * of uniforms on each side. However, this scheme is easy to * validate so it's all we allow for now. */ - - if (QPU_GET_FIELD(inst, QPU_SIG) != QPU_SIG_NONE) { + switch (QPU_GET_FIELD(inst, QPU_SIG)) { + case QPU_SIG_NONE: + case QPU_SIG_SCOREBOARD_UNLOCK: + case QPU_SIG_COLOR_LOAD: + case QPU_SIG_LOAD_TMU0: + case QPU_SIG_LOAD_TMU1: + break; + default: DRM_ERROR("uniforms address change must be " "normal math\n"); return false; |