diff options
| author | Jason Ekstrand <[email protected]> | 2016-02-05 14:21:13 -0800 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2016-02-05 14:21:13 -0800 |
| commit | 9645b8eb1f1b79e537ad8ddb683507df7bc9da58 (patch) | |
| tree | 8e554a43a136b5f7951ff8734d42deb5e81c262b /src/gallium/drivers/radeonsi/si_compute.c | |
| parent | 3eebf3686be3de10cbeda8acd884e82df3e1438a (diff) | |
| parent | 41875ac4edd8c884225c44c0840bd20291b410ca (diff) | |
Merge branch mesa-public/master into vulkan
Diffstat (limited to 'src/gallium/drivers/radeonsi/si_compute.c')
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_compute.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/drivers/radeonsi/si_compute.c b/src/gallium/drivers/radeonsi/si_compute.c index 5a08cbfb198..6ef6eeec178 100644 --- a/src/gallium/drivers/radeonsi/si_compute.c +++ b/src/gallium/drivers/radeonsi/si_compute.c @@ -61,7 +61,7 @@ static void init_scratch_buffer(struct si_context *sctx, struct si_compute *prog /* Compute the scratch buffer size using the maximum number of waves. * This way we don't need to recompute it for each kernel launch. */ - unsigned scratch_waves = 32 * sctx->screen->b.info.max_compute_units; + unsigned scratch_waves = 32 * sctx->screen->b.info.num_good_compute_units; for (i = 0; i < program->shader.binary.global_symbol_count; i++) { unsigned offset = program->shader.binary.global_symbol_offsets[i]; @@ -402,7 +402,7 @@ static void si_launch_grid( num_waves_for_scratch = MIN2(num_waves_for_scratch, - 32 * sctx->screen->b.info.max_compute_units); + 32 * sctx->screen->b.info.num_good_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 |