Commit 75c9436d authored by Lucas Stach's avatar Lucas Stach Committed by Wen Zhiwei
Browse files

drm/etnaviv: flush shader L1 cache after user commandstream 

stable inclusion
from stable-v6.6.64
commit 65bea1cb02303cf36e8d98fa5d681b3315e607b2
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IBL4B6

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=65bea1cb02303cf36e8d98fa5d681b3315e607b2



--------------------------------

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: default avatarChristian Gmeiner <cgmeiner@igalia.com>
Signed-off-by: default avatarLucas Stach <l.stach@pengutronix.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarWen Zhiwei <wenzhiwei@kylinos.cn>
parent 7216c8bb

drivers/gpu/drm/etnaviv/etnaviv_buffer.c

+2 −1
Original line number Diff line number Diff line
@@ -482,7 +482,8 @@ void etnaviv_buffer_queue(struct etnaviv_gpu *gpu, u32 exec_state, 
	} 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);