drm/vc4: Allow some more signals to be packed with uniform resets.
Subsystems (3)
PATCH 1/1 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 <[email protected]>
--- drivers/gpu/drm/vc4/vc4_validate_shaders.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/gpu/drm/vc4/vc4_validate_shaders.c +8 -2
@@ -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;
Signature · 6 lines
2.9.3 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel