diff options
| author | Tom Stellard <thomas.stellard@amd.com> | 2014-12-05 23:59:11 +0000 |
|---|---|---|
| committer | Tom Stellard <thomas.stellard@amd.com> | 2014-12-08 17:20:50 -0500 |
| commit | c16436149c1ca78f86ba992977fe6083b732bc1d (patch) | |
| tree | c9a4946f38dc58f51d965b642bd4400af1544c7c /src/gallium/drivers/radeonsi/si_compute.c | |
| parent | 0e1c085f17fdd774ff6b060dd03422e74ea3e2cc (diff) | |
| download | external_mesa3d-c16436149c1ca78f86ba992977fe6083b732bc1d.zip external_mesa3d-c16436149c1ca78f86ba992977fe6083b732bc1d.tar.gz external_mesa3d-c16436149c1ca78f86ba992977fe6083b732bc1d.tar.bz2 | |
radeonsi/compute: Clamp COMPUTE_TMPRING_SIZE.WAVES to: num_cu * 32
This is the maximum value allowed for this field.
Diffstat (limited to 'src/gallium/drivers/radeonsi/si_compute.c')
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_compute.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gallium/drivers/radeonsi/si_compute.c b/src/gallium/drivers/radeonsi/si_compute.c index 6ddb478..bf935dc 100644 --- a/src/gallium/drivers/radeonsi/si_compute.c +++ b/src/gallium/drivers/radeonsi/si_compute.c @@ -371,6 +371,9 @@ static void si_launch_grid( | S_00B85C_SH1_CU_EN(0xffff /* Default value */)) ; + num_waves_for_scratch = + MIN2(num_waves_for_scratch, + 32 * sctx->screen->b.info.max_compute_units); si_pm4_set_reg(pm4, R_00B860_COMPUTE_TMPRING_SIZE, /* The maximum value for WAVES is 32 * num CU. * If you program this value incorrectly, the GPU will hang if |