From: Greg Kroah-Hartman Date: Thu, 5 Sep 2024 06:48:03 +0000 (+0200) Subject: drop drm patch that broke the build on 5.10 and 5.15 X-Git-Tag: v6.1.109~18 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=68fe33e81866a622bdcca71c96605747c4db5ff5;p=thirdparty%2Fkernel%2Fstable-queue.git 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 index 08f437821e1..00000000000 --- 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 -Date: Mon, 27 May 2024 08:51:19 -0400 -Subject: drm/amd/display: added NULL check at start of dc_validate_stream - -From: winstang - -[ Upstream commit 26c56049cc4f1705b498df013949427692a4b0d5 ] - -[Why] -prevent invalid memory access - -[How] -check if dc and stream are NULL - -Co-authored-by: winstang -Reviewed-by: Alvin Lee -Acked-by: Zaeem Mohamed -Signed-off-by: winstang -Tested-by: Daniel Wheeler -Signed-off-by: Alex Deucher -Signed-off-by: Sasha Levin ---- - 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 c2ba099b3de..7a76d30e7cd 100644 --- 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 index 4e80f2e18f4..00000000000 --- 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 -Date: Mon, 27 May 2024 08:51:19 -0400 -Subject: drm/amd/display: added NULL check at start of dc_validate_stream - -From: winstang - -[ Upstream commit 26c56049cc4f1705b498df013949427692a4b0d5 ] - -[Why] -prevent invalid memory access - -[How] -check if dc and stream are NULL - -Co-authored-by: winstang -Reviewed-by: Alvin Lee -Acked-by: Zaeem Mohamed -Signed-off-by: winstang -Tested-by: Daniel Wheeler -Signed-off-by: Alex Deucher -Signed-off-by: Sasha Levin ---- - 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 b4d98a36cee..7d993dad287 100644 --- 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