diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2022-02-18 22:23:55 -0500 |
|---|---|---|
| committer | Dylan Baker <dylan.c.baker@intel.com> | 2022-02-24 14:56:51 -0800 |
| commit | d1e61f595d461302a92c598cbedef767375f8d28 (patch) | |
| tree | 5ee71502ef80d03af7bffa83bbfe2b2c459701a8 | |
| parent | 6f56bad4dd4ff25e78e5404de50518fd0817f1e5 (diff) | |
winsys/radeon: fix a hang due to introducing spi_cu_en
Fixes: 5406ad93 "radeonsi: set COMPUTE_DESTINATION_EN_SEn to spi_cu_en"
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/5989
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15098>
(cherry picked from commit 707a94f3c5d25601972dcf7c3f569acf8145324f)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/gallium/winsys/radeon/drm/radeon_drm_winsys.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/.pick_status.json b/.pick_status.json index b7435fae9ac..d53ac8ea0ae 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -472,7 +472,7 @@ "description": "winsys/radeon: fix a hang due to introducing spi_cu_en", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "5406ad93a9e61cc2088c7fd4b5d038db794bd4f5" }, diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c index 22d8b98ac0d..cad5282106e 100644 --- a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c +++ b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c @@ -608,6 +608,8 @@ static bool do_winsys_init(struct radeon_drm_winsys *ws) ws->info.num_physical_sgprs_per_simd = 512; ws->info.num_physical_wave64_vgprs_per_simd = 256; ws->info.has_3d_cube_border_color_mipmap = true; + ws->info.spi_cu_en_has_effect = false; + ws->info.spi_cu_en = 0xffff; ws->check_vm = strstr(debug_get_option("R600_DEBUG", ""), "check_vm") != NULL || strstr(debug_get_option("AMD_DEBUG", ""), "check_vm") != NULL; |