6.1-stable patches

added patches:
	drm-amd-pm-update-current_socclk-and-current_uclk-in-gpu_metrics-on-smu-v13.0.7.patch
	drm-etnaviv-flush-shader-l1-cache-after-user-commandstream.patch
	drm-sti-avoid-potential-dereference-of-error-pointers-in-sti_gdp_atomic_check.patch
	drm-sti-avoid-potential-dereference-of-error-pointers-in-sti_hqvdp_atomic_check.patch
	drm-sti-avoid-potential-dereference-of-error-pointers.patch

diff --git a/queue-6.1/drm-amd-pm-update-current_socclk-and-current_uclk-in-gpu_metrics-on-smu-v13.0.7.patch b/queue-6.1/drm-amd-pm-update-current_socclk-and-current_uclk-in-gpu_metrics-on-smu-v13.0.7.patch
new file mode 100644 (file)
index 0000000..16d58b0
--- /dev/null
+++ b/queue-6.1/drm-amd-pm-update-current_socclk-and-current_uclk-in-gpu_metrics-on-smu-v13.0.7.patch
@@ -0,0 +1,31 @@
+From 2abf2f7032df4c4e7f6cf7906da59d0e614897d6 Mon Sep 17 00:00:00 2001
+From: Umio Yasuno <coelacanth_dream@protonmail.com>
+Date: Thu, 14 Nov 2024 16:15:27 +0900
+Subject: drm/amd/pm: update current_socclk and current_uclk in gpu_metrics on smu v13.0.7
+
+From: Umio Yasuno <coelacanth_dream@protonmail.com>
+
+commit 2abf2f7032df4c4e7f6cf7906da59d0e614897d6 upstream.
+
+These were missed before.
+
+Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/3751
+Signed-off-by: Umio Yasuno <coelacanth_dream@protonmail.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+Cc: stable@vger.kernel.org
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c
++++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c
+@@ -1314,6 +1314,8 @@ static ssize_t smu_v13_0_7_get_gpu_metri
+       gpu_metrics->average_dclk1_frequency = metrics->AverageDclk1Frequency;
+ 
+       gpu_metrics->current_gfxclk = metrics->CurrClock[PPCLK_GFXCLK];
++      gpu_metrics->current_socclk = metrics->CurrClock[PPCLK_SOCCLK];
++      gpu_metrics->current_uclk = metrics->CurrClock[PPCLK_UCLK];
+       gpu_metrics->current_vclk0 = metrics->CurrClock[PPCLK_VCLK_0];
+       gpu_metrics->current_dclk0 = metrics->CurrClock[PPCLK_DCLK_0];
+       gpu_metrics->current_vclk1 = metrics->CurrClock[PPCLK_VCLK_1];

diff --git a/queue-6.1/drm-etnaviv-flush-shader-l1-cache-after-user-commandstream.patch b/queue-6.1/drm-etnaviv-flush-shader-l1-cache-after-user-commandstream.patch
new file mode 100644 (file)
index 0000000..b0505a8
--- /dev/null
+++ b/queue-6.1/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 <l.stach@pengutronix.de>
+Date: Fri, 25 Oct 2024 17:14:46 +0200
+Subject: drm/etnaviv: flush shader L1 cache after user commandstream
+
+From: Lucas Stach <l.stach@pengutronix.de>
+
+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 <cgmeiner@igalia.com>
+Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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-6.1/drm-sti-avoid-potential-dereference-of-error-pointers-in-sti_gdp_atomic_check.patch b/queue-6.1/drm-sti-avoid-potential-dereference-of-error-pointers-in-sti_gdp_atomic_check.patch
new file mode 100644 (file)
index 0000000..8242d99
--- /dev/null
+++ b/queue-6.1/drm-sti-avoid-potential-dereference-of-error-pointers-in-sti_gdp_atomic_check.patch
@@ -0,0 +1,36 @@
+From e965e771b069421c233d674c3c8cd8c7f7245f42 Mon Sep 17 00:00:00 2001
+From: Ma Ke <make24@iscas.ac.cn>
+Date: Mon, 9 Sep 2024 14:33:59 +0800
+Subject: drm/sti: avoid potential dereference of error pointers in sti_gdp_atomic_check
+
+From: Ma Ke <make24@iscas.ac.cn>
+
+commit e965e771b069421c233d674c3c8cd8c7f7245f42 upstream.
+
+The return value of drm_atomic_get_crtc_state() needs to be
+checked. To avoid use of error pointer 'crtc_state' in case
+of the failure.
+
+Cc: stable@vger.kernel.org
+Fixes: dd86dc2f9ae1 ("drm/sti: implement atomic_check for the planes")
+Signed-off-by: Ma Ke <make24@iscas.ac.cn>
+Acked-by: Alain Volmat <alain.volmat@foss.st.com>
+Link: https://patchwork.freedesktop.org/patch/msgid/20240909063359.1197065-1-make24@iscas.ac.cn
+Signed-off-by: Alain Volmat <alain.volmat@foss.st.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/gpu/drm/sti/sti_gdp.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/drivers/gpu/drm/sti/sti_gdp.c
++++ b/drivers/gpu/drm/sti/sti_gdp.c
+@@ -638,6 +638,9 @@ static int sti_gdp_atomic_check(struct d
+ 
+       mixer = to_sti_mixer(crtc);
+       crtc_state = drm_atomic_get_crtc_state(state, crtc);
++      if (IS_ERR(crtc_state))
++              return PTR_ERR(crtc_state);
++
+       mode = &crtc_state->mode;
+       dst_x = new_plane_state->crtc_x;
+       dst_y = new_plane_state->crtc_y;

diff --git a/queue-6.1/drm-sti-avoid-potential-dereference-of-error-pointers-in-sti_hqvdp_atomic_check.patch b/queue-6.1/drm-sti-avoid-potential-dereference-of-error-pointers-in-sti_hqvdp_atomic_check.patch
new file mode 100644 (file)
index 0000000..17748f1
--- /dev/null
+++ b/queue-6.1/drm-sti-avoid-potential-dereference-of-error-pointers-in-sti_hqvdp_atomic_check.patch
@@ -0,0 +1,35 @@
+From c1ab40a1fdfee732c7e6ff2fb8253760293e47e8 Mon Sep 17 00:00:00 2001
+From: Ma Ke <make24@iscas.ac.cn>
+Date: Fri, 13 Sep 2024 17:09:26 +0800
+Subject: drm/sti: avoid potential dereference of error pointers in sti_hqvdp_atomic_check
+
+From: Ma Ke <make24@iscas.ac.cn>
+
+commit c1ab40a1fdfee732c7e6ff2fb8253760293e47e8 upstream.
+
+The return value of drm_atomic_get_crtc_state() needs to be
+checked. To avoid use of error pointer 'crtc_state' in case
+of the failure.
+
+Cc: stable@vger.kernel.org
+Fixes: dd86dc2f9ae1 ("drm/sti: implement atomic_check for the planes")
+Signed-off-by: Ma Ke <make24@iscas.ac.cn>
+Link: https://patchwork.freedesktop.org/patch/msgid/20240913090926.2023716-1-make24@iscas.ac.cn
+Signed-off-by: Alain Volmat <alain.volmat@foss.st.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/gpu/drm/sti/sti_hqvdp.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/drivers/gpu/drm/sti/sti_hqvdp.c
++++ b/drivers/gpu/drm/sti/sti_hqvdp.c
+@@ -1037,6 +1037,9 @@ static int sti_hqvdp_atomic_check(struct
+               return 0;
+ 
+       crtc_state = drm_atomic_get_crtc_state(state, crtc);
++      if (IS_ERR(crtc_state))
++              return PTR_ERR(crtc_state);
++
+       mode = &crtc_state->mode;
+       dst_x = new_plane_state->crtc_x;
+       dst_y = new_plane_state->crtc_y;

diff --git a/queue-6.1/drm-sti-avoid-potential-dereference-of-error-pointers.patch b/queue-6.1/drm-sti-avoid-potential-dereference-of-error-pointers.patch
new file mode 100644 (file)
index 0000000..ab3840c
--- /dev/null
+++ b/queue-6.1/drm-sti-avoid-potential-dereference-of-error-pointers.patch
@@ -0,0 +1,35 @@
+From 831214f77037de02afc287eae93ce97f218d8c04 Mon Sep 17 00:00:00 2001
+From: Ma Ke <make24@iscas.ac.cn>
+Date: Fri, 13 Sep 2024 17:04:12 +0800
+Subject: drm/sti: avoid potential dereference of error pointers
+
+From: Ma Ke <make24@iscas.ac.cn>
+
+commit 831214f77037de02afc287eae93ce97f218d8c04 upstream.
+
+The return value of drm_atomic_get_crtc_state() needs to be
+checked. To avoid use of error pointer 'crtc_state' in case
+of the failure.
+
+Cc: stable@vger.kernel.org
+Fixes: dd86dc2f9ae1 ("drm/sti: implement atomic_check for the planes")
+Signed-off-by: Ma Ke <make24@iscas.ac.cn>
+Link: https://patchwork.freedesktop.org/patch/msgid/20240913090412.2022848-1-make24@iscas.ac.cn
+Signed-off-by: Alain Volmat <alain.volmat@foss.st.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/gpu/drm/sti/sti_cursor.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/drivers/gpu/drm/sti/sti_cursor.c
++++ b/drivers/gpu/drm/sti/sti_cursor.c
+@@ -200,6 +200,9 @@ static int sti_cursor_atomic_check(struc
+               return 0;
+ 
+       crtc_state = drm_atomic_get_crtc_state(state, crtc);
++      if (IS_ERR(crtc_state))
++              return PTR_ERR(crtc_state);
++
+       mode = &crtc_state->mode;
+       dst_x = new_plane_state->crtc_x;
+       dst_y = new_plane_state->crtc_y;

diff --git a/queue-6.1/series b/queue-6.1/series
index 28f02fc30f0ff6be96463e24455ffda55989cf59..1104066af411bbc86f92ef8350c167f738a7df02 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -504,3 +504,8 @@ iio-adc-ad7923-fix-buffer-overflow-for-tx_buf-and-ring_xfer.patch
 powerpc-fix-stack-protector-kconfig-test-for-clang.patch
 powerpc-adjust-adding-stack-protector-flags-to-kbuild_clags-for-clang.patch
 btrfs-don-t-bug_on-on-enomem-from-btrfs_lookup_extent_info-in-walk_down_proc.patch
+drm-sti-avoid-potential-dereference-of-error-pointers-in-sti_hqvdp_atomic_check.patch
+drm-sti-avoid-potential-dereference-of-error-pointers-in-sti_gdp_atomic_check.patch
+drm-sti-avoid-potential-dereference-of-error-pointers.patch
+drm-etnaviv-flush-shader-l1-cache-after-user-commandstream.patch
+drm-amd-pm-update-current_socclk-and-current_uclk-in-gpu_metrics-on-smu-v13.0.7.patch