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

diff --git a/queue-6.6/drm-amd-display-increase-num-voltage-states-to-40.patch b/queue-6.6/drm-amd-display-increase-num-voltage-states-to-40.patch
deleted file mode 100644 (file)
index e2861e4..0000000
--- a/queue-6.6/drm-amd-display-increase-num-voltage-states-to-40.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 2ad2b53e6f5b836815feafbfd156ab73320c8360 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.6/series b/queue-6.6/series
index 0a01e79c83fdf3b713568d067dc164c5af37c82d..62f7d5ffcbb4adacc54c4ac49f220419a50b86df 100644 (file)
--- a/queue-6.6/series
+++ b/queue-6.6/series
@@ -127,7 +127,6 @@ iommu-fix-printk-arg-in-of_iommu_get_resv_regions.patch
 drm-amd-display-refactor-ilr-to-make-it-work.patch
 drm-amd-display-reduce-default-backlight-min-from-5-.patch
 drm-amd-display-simplify-brightness-initialization.patch
-drm-amd-display-increase-num-voltage-states-to-40.patch
 drm-amd-display-fix-mpcc-1dlut-programming.patch
 vfio-pds-fix-mutex-lock-magic-lock-warning.patch
 vfio-pds-fix-possible-sleep-while-in-atomic-context.patch