From 83c4597f19e7e1d200e44c8d6ea2fe0a55ddb09d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Tue, 25 Jun 2019 18:59:50 -0400 Subject: [PATCH] radeonsi: don't set READ_ONLY for const_uploader to fix bindless texture hangs Bindless textures can update descriptors with WRITE_DATA. Cc: 19.1 Acked-by: Pierre-Eric Pelloux-Prayer Acked-by: Dave Airlie airlied@redhat.com (cherry picked from commit 5058d62b05d4f619ccb4f6ea9f6d5c5c33e3b968) --- src/gallium/drivers/radeonsi/si_pipe.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c index 7dd4a7378f1..2f484f7052a 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.c +++ b/src/gallium/drivers/radeonsi/si_pipe.c @@ -464,9 +464,7 @@ static struct pipe_context *si_create_context(struct pipe_screen *screen, 0, PIPE_USAGE_DEFAULT, SI_RESOURCE_FLAG_32BIT | (use_sdma_upload ? - SI_RESOURCE_FLAG_UPLOAD_FLUSH_EXPLICIT_VIA_SDMA : - (sscreen->cpdma_prefetch_writes_memory ? - 0 : SI_RESOURCE_FLAG_READ_ONLY))); + SI_RESOURCE_FLAG_UPLOAD_FLUSH_EXPLICIT_VIA_SDMA : 0)); if (!sctx->b.const_uploader) goto fail;