diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-09-20 08:29:21 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-09-20 08:29:21 +0200 |
| commit | b2c16e1efddeb517c62d242fb8ec30a383843468 (patch) | |
| tree | fbfbe6f124a9423abf9a288ad46feb6db7469c42 /drivers/gpu/drm/vc4/vc4_validate_shaders.c | |
| parent | 81539169f283329fd8bc58457cc15754f683ba69 (diff) | |
| parent | d2ffb0103aaefa9b169da042cf39ce27bfb6cdbb (diff) | |
| download | linux-b2c16e1efddeb517c62d242fb8ec30a383843468.tar.gz linux-b2c16e1efddeb517c62d242fb8ec30a383843468.tar.bz2 linux-b2c16e1efddeb517c62d242fb8ec30a383843468.zip | |
Merge branch 'linus' into x86/asm, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/vc4/vc4_validate_shaders.c')
| -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; |