From d86101f04874fb6da4261eb2759209040a0d3e33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Wed, 24 May 2023 16:59:10 -0400 Subject: [PATCH] winsys/radeon: set has_image_opcodes to unbreak gfx6-7 Fixes: 96913bbf3eba74 - ac/surface: force linear image layout for chips not supporting image opcodes Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/9073 Reviewed-by: Dave Airlie Part-of: (cherry picked from commit fe03351bee36ac47f318ab46d2ca9d99e11a1ec8) --- .pick_status.json | 2 +- src/gallium/winsys/radeon/drm/radeon_drm_winsys.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index c7e7301a4ce..b6b4403115f 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -625,7 +625,7 @@ "description": "winsys/radeon: set has_image_opcodes to unbreak gfx6-7", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "96913bbf3eba74e2bf509fe7196be073eaf2ea60" }, diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c index 12db4f2a20f..ce099dc841e 100644 --- a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c +++ b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c @@ -581,6 +581,7 @@ 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.has_image_opcodes = true; ws->info.spi_cu_en_has_effect = false; ws->info.spi_cu_en = 0xffff; ws->info.never_stop_sq_perf_counters = false;