drop queue-6.1/drm-amd-display-increase-num-voltage-states-to-40.patch

breaks the build.

diff --git a/queue-6.1/drm-amd-display-increase-num-voltage-states-to-40.patch b/queue-6.1/drm-amd-display-increase-num-voltage-states-to-40.patch
deleted file mode 100644 (file)
index cbfbea3..0000000
--- a/queue-6.1/drm-amd-display-increase-num-voltage-states-to-40.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 7d3753da147bad48fff2c5a1b9b2a8b11f4b1760 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 8 Nov 2023 17:16:28 -0500
-Subject: drm/amd/display: Increase num voltage states to 40
-
-From: Alvin Lee <alvin.lee2@amd.com>
-
-[ Upstream commit 67e38874b85b8df7b23d29f78ac3d7ecccd9519d ]
-
-[Description]
-If during driver init stage there are greater than 20
-intermediary voltage states while constructing the SOC
-BB we could hit issues because we will index outside of the
-clock_limits array and start overwriting data. Increase the
-total number of states to 40 to avoid this issue.
-
-Cc: stable@vger.kernel.org # 6.1+
-Reviewed-by: Samson Tam <samson.tam@amd.com>
-Acked-by: Hamza Mahfooz <hamza.mahfooz@amd.com>
-Signed-off-by: Alvin Lee <alvin.lee2@amd.com>
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/gpu/drm/amd/display/dc/dml/dc_features.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/gpu/drm/amd/display/dc/dml/dc_features.h b/drivers/gpu/drm/amd/display/dc/dml/dc_features.h
-index 2cbdd75429ffd..6e669a2c5b2d4 100644
---- a/drivers/gpu/drm/amd/display/dc/dml/dc_features.h
-+++ b/drivers/gpu/drm/amd/display/dc/dml/dc_features.h
-@@ -36,7 +36,7 @@
-  * Define the maximum amount of states supported by the ASIC. Every ASIC has a
-  * specific number of states; this macro defines the maximum number of states.
-  */
--#define DC__VOLTAGE_STATES 20
-+#define DC__VOLTAGE_STATES 40
- #define DC__NUM_DPP__4 1
- #define DC__NUM_DPP__0_PRESENT 1
- #define DC__NUM_DPP__1_PRESENT 1
--- 
-2.42.0
-

diff --git a/queue-6.1/series b/queue-6.1/series
index 536ce2595e5b3517e79c16503d03bb9feec4f6ba..f1788c78898214194e0a6d9e4bae18f771b80c0d 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -96,7 +96,6 @@ drm-amd-pm-fix-a-memleak-in-aldebaran_tables_init.patch
 mmc-core-add-helpers-mmc_regulator_enable-disable_vq.patch
 mmc-sdhci-sprd-fix-vqmmc-not-shutting-down-after-the.patch
 drm-amd-display-expand-kernel-doc-for-dc.patch
-drm-amd-display-increase-num-voltage-states-to-40.patch
 drm-amd-display-clean-code-style-issues-in-dcn30_set.patch
 drm-amd-display-fix-the-delta-clamping-for-shaper-lu.patch
 drm-amd-display-fix-mpcc-1dlut-programming.patch