drop drm patch that broke the build on 5.10 and 5.15

diff --git a/queue-5.10/drm-amd-display-added-null-check-at-start-of-dc_vali.patch b/queue-5.10/drm-amd-display-added-null-check-at-start-of-dc_vali.patch
deleted file mode 100644 (file)
index 08f4378..0000000
--- a/queue-5.10/drm-amd-display-added-null-check-at-start-of-dc_vali.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 1c6d4cc4e77bbd5f549bcb02de6e2196cd74bbe1 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 27 May 2024 08:51:19 -0400
-Subject: drm/amd/display: added NULL check at start of dc_validate_stream
-
-From: winstang <winstang@amd.com>
-
-[ Upstream commit 26c56049cc4f1705b498df013949427692a4b0d5 ]
-
-[Why]
-prevent invalid memory access
-
-[How]
-check if dc and stream are NULL
-
-Co-authored-by: winstang <winstang@amd.com>
-Reviewed-by: Alvin Lee <alvin.lee2@amd.com>
-Acked-by: Zaeem Mohamed <zaeem.mohamed@amd.com>
-Signed-off-by: winstang <winstang@amd.com>
-Tested-by: Daniel Wheeler <daniel.wheeler@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/core/dc_resource.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
-index 0a13c06eea44..6a993cdb101e 100644
---- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
-+++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
-@@ -2914,6 +2914,9 @@ void resource_build_bit_depth_reduction_params(struct dc_stream_state *stream,
- 
- enum dc_status dc_validate_stream(struct dc *dc, struct dc_stream_state *stream)
- {
-+      if (dc == NULL || stream == NULL)
-+              return DC_ERROR_UNEXPECTED;
-+
-       struct dc_link *link = stream->link;
-       struct timing_generator *tg = dc->res_pool->timing_generators[0];
-       enum dc_status res = DC_OK;
--- 
-2.43.0
-

diff --git a/queue-5.10/series b/queue-5.10/series
index c2ba099b3de73b82249bbd6f58f8a81033e61df9..7a76d30e7cd80db3f3938847562a914a675e20a6 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -39,6 +39,5 @@ smack-tcp-ipv4-fix-incorrect-labeling.patch
 drm-meson-plane-add-error-handling.patch
 wifi-cfg80211-make-hash-table-duplicates-more-surviv.patch
 block-remove-the-blk_flush_integrity-call-in-blk_int.patch
-drm-amd-display-added-null-check-at-start-of-dc_vali.patch
 drm-amd-display-skip-wbscl_set_scaler_filter-if-filt.patch
 media-uvcvideo-enforce-alignment-of-frame-and-interv.patch

diff --git a/queue-5.15/drm-amd-display-added-null-check-at-start-of-dc_vali.patch b/queue-5.15/drm-amd-display-added-null-check-at-start-of-dc_vali.patch
deleted file mode 100644 (file)
index 4e80f2e..0000000
--- a/queue-5.15/drm-amd-display-added-null-check-at-start-of-dc_vali.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From b696861409d0da093e08f89812e5bd570e68bbe6 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 27 May 2024 08:51:19 -0400
-Subject: drm/amd/display: added NULL check at start of dc_validate_stream
-
-From: winstang <winstang@amd.com>
-
-[ Upstream commit 26c56049cc4f1705b498df013949427692a4b0d5 ]
-
-[Why]
-prevent invalid memory access
-
-[How]
-check if dc and stream are NULL
-
-Co-authored-by: winstang <winstang@amd.com>
-Reviewed-by: Alvin Lee <alvin.lee2@amd.com>
-Acked-by: Zaeem Mohamed <zaeem.mohamed@amd.com>
-Signed-off-by: winstang <winstang@amd.com>
-Tested-by: Daniel Wheeler <daniel.wheeler@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/core/dc_resource.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
-index 42432af34db2..df84f3b521e2 100644
---- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
-+++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
-@@ -2872,6 +2872,9 @@ void resource_build_bit_depth_reduction_params(struct dc_stream_state *stream,
- 
- enum dc_status dc_validate_stream(struct dc *dc, struct dc_stream_state *stream)
- {
-+      if (dc == NULL || stream == NULL)
-+              return DC_ERROR_UNEXPECTED;
-+
-       struct dc_link *link = stream->link;
-       struct timing_generator *tg = dc->res_pool->timing_generators[0];
-       enum dc_status res = DC_OK;
--- 
-2.43.0
-

diff --git a/queue-5.15/series b/queue-5.15/series
index b4d98a36cee72eec8787499e0418f8c2ec1856c4..7d993dad28722c5d9bd51bab8c18997cce5fe449 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -51,6 +51,5 @@ drm-meson-plane-add-error-handling.patch
 drm-bridge-tc358767-check-if-fully-initialized-befor.patch
 wifi-cfg80211-make-hash-table-duplicates-more-surviv.patch
 block-remove-the-blk_flush_integrity-call-in-blk_int.patch
-drm-amd-display-added-null-check-at-start-of-dc_vali.patch
 drm-amd-display-skip-wbscl_set_scaler_filter-if-filt.patch
 media-uvcvideo-enforce-alignment-of-frame-and-interv.patch