From 0cd193d52470672f68284843295884bcdf79ce16 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 11 Nov 2025 09:41:18 +0900 Subject: [PATCH] 6.1-stable patches added patches: drm-amdgpu-fix-function-header-names-in-amdgpu_connectors.c.patch extcon-adc-jack-cleanup-wakeup-source-only-if-it-was-enabled.patch selftests-netdevsim-set-test-timeout-to-10-minutes.patch --- ...-header-names-in-amdgpu_connectors.c.patch | 64 +++++++++++++++++++ ...wakeup-source-only-if-it-was-enabled.patch | 36 +++++++++++ ...evsim-set-test-timeout-to-10-minutes.patch | 32 ++++++++++ queue-6.1/series | 3 + 4 files changed, 135 insertions(+) create mode 100644 queue-6.1/drm-amdgpu-fix-function-header-names-in-amdgpu_connectors.c.patch create mode 100644 queue-6.1/extcon-adc-jack-cleanup-wakeup-source-only-if-it-was-enabled.patch create mode 100644 queue-6.1/selftests-netdevsim-set-test-timeout-to-10-minutes.patch diff --git a/queue-6.1/drm-amdgpu-fix-function-header-names-in-amdgpu_connectors.c.patch b/queue-6.1/drm-amdgpu-fix-function-header-names-in-amdgpu_connectors.c.patch new file mode 100644 index 0000000000..4a44519855 --- /dev/null +++ b/queue-6.1/drm-amdgpu-fix-function-header-names-in-amdgpu_connectors.c.patch @@ -0,0 +1,64 @@ +From 38ab33dbea594700c8d6cc81eec0a54e95d3eb2f Mon Sep 17 00:00:00 2001 +From: Srinivasan Shanmugam +Date: Sun, 31 Aug 2025 15:29:56 +0530 +Subject: drm/amdgpu: Fix function header names in amdgpu_connectors.c +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Srinivasan Shanmugam + +commit 38ab33dbea594700c8d6cc81eec0a54e95d3eb2f upstream. + +Align the function headers for `amdgpu_max_hdmi_pixel_clock` and +`amdgpu_connector_dvi_mode_valid` with the function implementations so +they match the expected kdoc style. + +Fixes the below: +drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c:1199: warning: This comment starts with '/**', but isn't a kernel-doc comment. Refer Documentation/doc-guide/kernel-doc.rst + * Returns the maximum supported HDMI (TMDS) pixel clock in KHz. +drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c:1212: warning: This comment starts with '/**', but isn't a kernel-doc comment. Refer Documentation/doc-guide/kernel-doc.rst + * Validates the given display mode on DVI and HDMI connectors. + +Fixes: 585b2f685c56 ("drm/amdgpu: Respect max pixel clock for HDMI and DVI-D (v2)") +Cc: Christian König +Cc: Alex Deucher +Signed-off-by: Srinivasan Shanmugam +Reviewed-by: Alex Deucher +Signed-off-by: Alex Deucher +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 15 ++++++++++++--- + 1 file changed, 12 insertions(+), 3 deletions(-) + +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c +@@ -1166,7 +1166,10 @@ static void amdgpu_connector_dvi_force(s + } + + /** +- * Returns the maximum supported HDMI (TMDS) pixel clock in KHz. ++ * amdgpu_max_hdmi_pixel_clock - Return max supported HDMI (TMDS) pixel clock ++ * @adev: pointer to amdgpu_device ++ * ++ * Return: maximum supported HDMI (TMDS) pixel clock in KHz. + */ + static int amdgpu_max_hdmi_pixel_clock(const struct amdgpu_device *adev) + { +@@ -1179,8 +1182,14 @@ static int amdgpu_max_hdmi_pixel_clock(c + } + + /** +- * Validates the given display mode on DVI and HDMI connectors, +- * including analog signals on DVI-I. ++ * amdgpu_connector_dvi_mode_valid - Validate a mode on DVI/HDMI connectors ++ * @connector: DRM connector to validate the mode on ++ * @mode: display mode to validate ++ * ++ * Validate the given display mode on DVI and HDMI connectors, including ++ * analog signals on DVI-I. ++ * ++ * Return: drm_mode_status indicating whether the mode is valid. + */ + static enum drm_mode_status amdgpu_connector_dvi_mode_valid(struct drm_connector *connector, + struct drm_display_mode *mode) diff --git a/queue-6.1/extcon-adc-jack-cleanup-wakeup-source-only-if-it-was-enabled.patch b/queue-6.1/extcon-adc-jack-cleanup-wakeup-source-only-if-it-was-enabled.patch new file mode 100644 index 0000000000..d5e0ea2cfb --- /dev/null +++ b/queue-6.1/extcon-adc-jack-cleanup-wakeup-source-only-if-it-was-enabled.patch @@ -0,0 +1,36 @@ +From 92bac7d4de9c07933f6b76d8f1c7f8240f911f4f Mon Sep 17 00:00:00 2001 +From: Krzysztof Kozlowski +Date: Fri, 9 May 2025 09:17:04 +0200 +Subject: extcon: adc-jack: Cleanup wakeup source only if it was enabled + +From: Krzysztof Kozlowski + +commit 92bac7d4de9c07933f6b76d8f1c7f8240f911f4f upstream. + +Driver in the probe enables wakeup source conditionally, so the cleanup +path should do the same - do not release the wakeup source memory if it +was not allocated. + +Link: https://lore.kernel.org/lkml/20250509071703.39442-2-krzysztof.kozlowski@linaro.org/ +Reported-by: Christophe JAILLET +Closes: https://lore.kernel.org/r/22aaebb7-553b-4571-8a43-58a523241082@wanadoo.fr/ +Fixes: 78b6a991eb6c ("extcon: adc-jack: Fix wakeup source leaks on device unbind") +Signed-off-by: Krzysztof Kozlowski +Signed-off-by: Chanwoo Choi +Signed-off-by: Greg Kroah-Hartman +--- + drivers/extcon/extcon-adc-jack.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/drivers/extcon/extcon-adc-jack.c ++++ b/drivers/extcon/extcon-adc-jack.c +@@ -162,7 +162,8 @@ static int adc_jack_remove(struct platfo + { + struct adc_jack_data *data = platform_get_drvdata(pdev); + +- device_init_wakeup(&pdev->dev, false); ++ if (data->wakeup_source) ++ device_init_wakeup(&pdev->dev, false); + free_irq(data->irq, data); + cancel_work_sync(&data->handler.work); + diff --git a/queue-6.1/selftests-netdevsim-set-test-timeout-to-10-minutes.patch b/queue-6.1/selftests-netdevsim-set-test-timeout-to-10-minutes.patch new file mode 100644 index 0000000000..2a8166f4ce --- /dev/null +++ b/queue-6.1/selftests-netdevsim-set-test-timeout-to-10-minutes.patch @@ -0,0 +1,32 @@ +From afbf75e8da8ce8a0698212953d350697bb4355a6 Mon Sep 17 00:00:00 2001 +From: Jakub Kicinski +Date: Mon, 25 Mar 2024 08:56:11 -0700 +Subject: selftests: netdevsim: set test timeout to 10 minutes + +From: Jakub Kicinski + +commit afbf75e8da8ce8a0698212953d350697bb4355a6 upstream. + +The longest running netdevsim test, nexthop.sh, currently takes +5 min to finish. Around 260s to be exact, and 310s on a debug kernel. +The default timeout in selftest is 45sec, so we need an explicit +config. Give ourselves some headroom and use 10min. + +Commit under Fixes isn't really to "blame" but prior to that +netdevsim tests weren't integrated with kselftest infra +so blaming the tests themselves doesn't seem right, either. + +Fixes: 8ff25dac88f6 ("netdevsim: add Makefile for selftests") +Signed-off-by: Jakub Kicinski +Reviewed-by: Simon Horman +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman +--- + tools/testing/selftests/drivers/net/netdevsim/settings | 1 + + 1 file changed, 1 insertion(+) + create mode 100644 tools/testing/selftests/drivers/net/netdevsim/settings + +--- /dev/null ++++ b/tools/testing/selftests/drivers/net/netdevsim/settings +@@ -0,0 +1 @@ ++timeout=600 diff --git a/queue-6.1/series b/queue-6.1/series index ee27a3569b..e4881f63db 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -328,3 +328,6 @@ rtc-rx8025-fix-incorrect-register-reference.patch smb-client-validate-change-notify-buffer-before-copy.patch lib-crypto-curve25519-hacl64-fix-older-clang-kasan-workaround-for-gcc.patch scsi-ufs-ufs-pci-fix-s0ix-s3-for-intel-controllers.patch +extcon-adc-jack-cleanup-wakeup-source-only-if-it-was-enabled.patch +drm-amdgpu-fix-function-header-names-in-amdgpu_connectors.c.patch +selftests-netdevsim-set-test-timeout-to-10-minutes.patch -- 2.47.3