Module: Mesa Branch: master Commit: e93fe403bc0e85994d1be59ad3ad5bf65ecbf971 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e93fe403bc0e85994d1be59ad3ad5bf65ecbf971
Author: Marek Olšák <[email protected]> Date: Tue Jun 5 01:20:23 2018 -0400 radeonsi: properly compute an LS-HS thread group size limit "64 / max * 4" is less than "64 * 4 / max". Tested-by: Dieter Nützel <[email protected]> --- src/gallium/drivers/radeonsi/si_state_draw.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_state_draw.c b/src/gallium/drivers/radeonsi/si_state_draw.c index 942cb3c799..e7f8389caf 100644 --- a/src/gallium/drivers/radeonsi/si_state_draw.c +++ b/src/gallium/drivers/radeonsi/si_state_draw.c @@ -146,7 +146,8 @@ static bool si_emit_derived_tess_state(struct si_context *sctx, * resource usage. Also ensures that the number of tcs in and out * vertices per threadgroup are at most 256. */ - *num_patches = 64 / MAX2(num_tcs_input_cp, num_tcs_output_cp) * 4; + unsigned max_verts_per_patch = MAX2(num_tcs_input_cp, num_tcs_output_cp); + *num_patches = 256 / max_verts_per_patch; /* Make sure that the data fits in LDS. This assumes the shaders only * use LDS for the inputs and outputs. @@ -173,7 +174,7 @@ static bool si_emit_derived_tess_state(struct si_context *sctx, /* SI bug workaround, related to power management. Limit LS-HS * threadgroups to only one wave. */ - unsigned one_wave = 64 / MAX2(num_tcs_input_cp, num_tcs_output_cp); + unsigned one_wave = 64 / max_verts_per_patch; *num_patches = MIN2(*num_patches, one_wave); } _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
