From c42b829ac4bc3559c8413e13e1b799c4290b48d1 Mon Sep 17 00:00:00 2001 From: Karol Herbst Date: Sun, 20 Apr 2025 16:46:35 +0200 Subject: [PATCH] r600: fix r600_buffer_from_user_memory for rusticl MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Not entirely sure if it's actually required, but this makes it consistence with r600_resource_create also calling r600_compute_global_buffer_create for global memory buffers. Cc: mesa-stable Acked-by: Mike Blumenkrantz Reviewed-by: Marek Olšák Patrick Lerda Part-of: (cherry picked from commit f6e3c967d9a1f1c680613d53306a415afb977247) --- .pick_status.json | 2 +- src/gallium/drivers/r600/r600_buffer_common.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 90ce9d42aa8..31327123692 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -284,7 +284,7 @@ "description": "r600: fix r600_buffer_from_user_memory for rusticl", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/gallium/drivers/r600/r600_buffer_common.c b/src/gallium/drivers/r600/r600_buffer_common.c index 5ff88b5afa4..a49b76baf27 100644 --- a/src/gallium/drivers/r600/r600_buffer_common.c +++ b/src/gallium/drivers/r600/r600_buffer_common.c @@ -600,8 +600,7 @@ r600_buffer_from_user_memory(struct pipe_screen *screen, struct radeon_winsys *ws = rscreen->ws; struct r600_resource *rbuffer; - if ((templ->bind & PIPE_BIND_GLOBAL) && - (templ->bind & PIPE_BIND_COMPUTE_RESOURCE)) { + if (templ->bind & PIPE_BIND_GLOBAL) { rbuffer = r600_resource(r600_compute_global_buffer_create(screen, templ)); ((struct r600_resource_global *)rbuffer)->chunk->real_buffer = rbuffer; } else {