From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7EEBA237FEB; Thu, 12 Dec 2024 16:23:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734020582; cv=none; b=kP+0Y8yNP4gM0cDAe4RpSwD+kHMAZ5f8oooQafVik41eV6nliJwub/+GulSa+76SnNldu7Vz8jqgWoVkcSVeqaJUBT/5epwrLWYpm1/6QQT9NftFLV62MuSeXHg9/rJIua3mkHU1PUS8rAbeWe0jaxaHUI24TGqKRMuB84nvno4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734020582; c=relaxed/simple; bh=W2MR3z9uXk/bGhlbSU/BIuWV5Lzu8Nf6a6h460hcqHg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=g6GCV6NKG7bpIfbF/B8kw4DkRxnwrDjn29EGqo3nkiuM/Z/3TT1+wHUzw8xfdeeLSQxQKToiPba9RY0LHBvjIxv8Hf05/kcAuItoV/MzGfLcjUMflETwBKSHp6DbEA/eHHSReeMVIyf3YaJ3IDI562JAq3KVXhvOOHVpuZzIN14= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=BoE4y42q; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="BoE4y42q" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E0DC8C4CECE; Thu, 12 Dec 2024 16:23:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1734020582; bh=W2MR3z9uXk/bGhlbSU/BIuWV5Lzu8Nf6a6h460hcqHg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BoE4y42qdLYML6Q5+J4uIOPSF/KsA5oAA/6Axqr1w6+PQG9201caxO81KJgzOw5WF bvLTyscRMohMFdsjrSvfucXnC+NllGuhLJN8ZnmjWXePTd/7ZYjtMIE7yr3FlCEkqC 3bTpupIeZveani9K+JVgYKT1TYycoU7av0npfGoM= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Christian Gmeiner , Lucas Stach Subject: [PATCH 6.1 505/772] drm/etnaviv: flush shader L1 cache after user commandstream Date: Thu, 12 Dec 2024 15:57:30 +0100 Message-ID: <20241212144410.826079974@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241212144349.797589255@linuxfoundation.org> References: <20241212144349.797589255@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ 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);