From: Greg Kroah-Hartman Date: Fri, 6 Dec 2024 13:23:59 +0000 (+0100) Subject: 5.4-stable patches X-Git-Tag: v6.6.64~8 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=07db7bfc53cf867a883dcdfc3549e48d5b4e52d7;p=thirdparty%2Fkernel%2Fstable-queue.git 5.4-stable patches added patches: drm-etnaviv-flush-shader-l1-cache-after-user-commandstream.patch --- diff --git a/queue-5.4/drm-etnaviv-flush-shader-l1-cache-after-user-commandstream.patch b/queue-5.4/drm-etnaviv-flush-shader-l1-cache-after-user-commandstream.patch new file mode 100644 index 00000000000..b0505a84ac4 --- /dev/null +++ b/queue-5.4/drm-etnaviv-flush-shader-l1-cache-after-user-commandstream.patch @@ -0,0 +1,33 @@ +From 4f8dbadef085ab447a01a8d4806a3f629fea05ed Mon Sep 17 00:00:00 2001 +From: Lucas Stach +Date: Fri, 25 Oct 2024 17:14:46 +0200 +Subject: drm/etnaviv: flush shader L1 cache after user commandstream + +From: Lucas Stach + +commit 4f8dbadef085ab447a01a8d4806a3f629fea05ed upstream. + +The shader L1 cache is a writeback cache for shader loads/stores +and thus must be flushed before any BOs backing the shader buffers +are potentially freed. + +Cc: stable@vger.kernel.org +Reviewed-by: Christian Gmeiner +Signed-off-by: Lucas Stach +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/etnaviv/etnaviv_buffer.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/drivers/gpu/drm/etnaviv/etnaviv_buffer.c ++++ b/drivers/gpu/drm/etnaviv/etnaviv_buffer.c +@@ -481,7 +481,8 @@ void etnaviv_buffer_queue(struct etnaviv + } else { + CMD_LOAD_STATE(buffer, VIVS_GL_FLUSH_CACHE, + VIVS_GL_FLUSH_CACHE_DEPTH | +- VIVS_GL_FLUSH_CACHE_COLOR); ++ VIVS_GL_FLUSH_CACHE_COLOR | ++ VIVS_GL_FLUSH_CACHE_SHADER_L1); + if (has_blt) { + CMD_LOAD_STATE(buffer, VIVS_BLT_ENABLE, 0x1); + CMD_LOAD_STATE(buffer, VIVS_BLT_SET_COMMAND, 0x1); diff --git a/queue-5.4/series b/queue-5.4/series index 5badb470ac6..fecc5c70227 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -217,3 +217,4 @@ i3c-master-fix-miss-free-init_dyn_addr-at-i3c_master_put_i3c_addrs.patch dm-thin-add-missing-destroy_work_on_stack.patch nfsd-make-sure-exp-active-before-svc_export_show.patch nfsd-fix-nfs4_openowner-leak-when-concurrent-nfsd4_open-occur.patch +drm-etnaviv-flush-shader-l1-cache-after-user-commandstream.patch