From 20b9eece6ef4e76a02b6c2bcce8f2f17f75d2446 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Date: Fri, 21 Oct 2022 12:57:53 +0200 Subject: [PATCH] winsys/amdgpu: Set RADEON_FLAG_32BIT again MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Avoids hang running rendercheck -t cacomposite -f a8r8g8b8 via glamor on Navi 14. Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/7167 Fixes: 7833c5139a54 ("winsys/amdgpu: use cached GTT for command buffers and don't set the 32BIT flag") Reviewed-by: Marek Olšák Part-of: --- src/gallium/winsys/amdgpu/drm/amdgpu_cs.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c b/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c index 3b6f3ab326f..40b8c5850f0 100644 --- a/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c +++ b/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c @@ -740,6 +740,15 @@ static bool amdgpu_ib_new_buffer(struct amdgpu_winsys *ws, enum radeon_bo_domain domain = RADEON_DOMAIN_GTT; unsigned flags = RADEON_FLAG_NO_INTERPROCESS_SHARING; + if (cs->ip_type == AMD_IP_GFX || + cs->ip_type == AMD_IP_COMPUTE || + cs->ip_type == AMD_IP_SDMA) { + /* Avoids hangs with "rendercheck -t cacomposite -f a8r8g8b8" via glamor + * on Navi 14 + */ + flags |= RADEON_FLAG_32BIT; + } + pb = amdgpu_bo_create(ws, buffer_size, ws->info.gart_page_size, domain, flags);