From: Greg Kroah-Hartman Date: Tue, 11 Nov 2025 00:39:15 +0000 (+0900) Subject: 6.12-stable patches X-Git-Tag: v6.12.58~10 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=67069cc09f5c644f253423c73ea30ef31de3d8f0;p=thirdparty%2Fkernel%2Fstable-queue.git 6.12-stable patches added patches: acpi-spcr-check-for-table-version-when-using-precise-baudrate.patch drm-amd-display-fix-black-screen-with-hdmi-outputs.patch drm-amdgpu-fix-function-header-names-in-amdgpu_connectors.c.patch drm-amdgpu-fix-unintended-error-log-in-vcn5_0_0.patch extcon-adc-jack-cleanup-wakeup-source-only-if-it-was-enabled.patch net-phy-fix-phy_disable_eee.patch --- diff --git a/queue-6.12/acpi-spcr-check-for-table-version-when-using-precise-baudrate.patch b/queue-6.12/acpi-spcr-check-for-table-version-when-using-precise-baudrate.patch new file mode 100644 index 0000000000..38f95a191b --- /dev/null +++ b/queue-6.12/acpi-spcr-check-for-table-version-when-using-precise-baudrate.patch @@ -0,0 +1,41 @@ +From 543d35004007a06ef247acf2fc55efa8388aa741 Mon Sep 17 00:00:00 2001 +From: Punit Agrawal +Date: Fri, 24 Oct 2025 13:31:25 +0100 +Subject: ACPI: SPCR: Check for table version when using precise baudrate + +From: Punit Agrawal + +commit 543d35004007a06ef247acf2fc55efa8388aa741 upstream. + +Commit 4d330fe54145 ("ACPI: SPCR: Support Precise Baud Rate field") +added support to use the precise baud rate available since SPCR 1.09 +(revision 4) but failed to check the version of the table provided by +the firmware. + +Accessing an older version of SPCR table causes accesses beyond the +end of the table and can lead to garbage data to be used for the baud +rate. + +Check the version of the firmware provided SPCR to ensure that the +precise baudrate is vaild before using it. + +Fixes: 4d330fe54145 ("ACPI: SPCR: Support Precise Baud Rate field") +Signed-off-by: Punit Agrawal +Link: https://patch.msgid.link/20251024123125.1081612-1-punit.agrawal@oss.qualcomm.com +Signed-off-by: Rafael J. Wysocki +Signed-off-by: Greg Kroah-Hartman +--- + drivers/acpi/spcr.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/acpi/spcr.c ++++ b/drivers/acpi/spcr.c +@@ -152,7 +152,7 @@ int __init acpi_parse_spcr(bool enable_e + * Baud Rate field. If this field is zero or not present, Configured + * Baud Rate is used. + */ +- if (table->precise_baudrate) ++ if (table->header.revision >= 4 && table->precise_baudrate) + baud_rate = table->precise_baudrate; + else switch (table->baud_rate) { + case 0: diff --git a/queue-6.12/drm-amd-display-fix-black-screen-with-hdmi-outputs.patch b/queue-6.12/drm-amd-display-fix-black-screen-with-hdmi-outputs.patch new file mode 100644 index 0000000000..40ef7fed57 --- /dev/null +++ b/queue-6.12/drm-amd-display-fix-black-screen-with-hdmi-outputs.patch @@ -0,0 +1,44 @@ +From fdc93beeadc2439e5e85d056a8fe681dcced09da Mon Sep 17 00:00:00 2001 +From: Alex Hung +Date: Wed, 22 Oct 2025 16:19:34 -0600 +Subject: drm/amd/display: Fix black screen with HDMI outputs +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Alex Hung + +commit fdc93beeadc2439e5e85d056a8fe681dcced09da upstream. + +[Why & How] +This fixes the black screen issue on certain APUs with HDMI, +accompanied by the following messages: + +amdgpu 0000:c4:00.0: amdgpu: [drm] Failed to setup vendor info + frame on connector DP-1: -22 +amdgpu 0000:c4:00.0: [drm] Cannot find any crtc or sizes [drm] + Cannot find any crtc or sizes + +Fixes: 489f0f600ce2 ("drm/amd/display: Fix DVI-D/HDMI adapters") +Suggested-by: Timur Kristóf +Reviewed-by: Harry Wentland +Signed-off-by: Alex Hung +Signed-off-by: Ray Wu +Tested-by: Daniel Wheeler +Signed-off-by: Alex Deucher +(cherry picked from commit 678c901443a6d2e909e3b51331a20f9d8f84ce82) +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/amd/display/dc/link/link_detection.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/gpu/drm/amd/display/dc/link/link_detection.c ++++ b/drivers/gpu/drm/amd/display/dc/link/link_detection.c +@@ -1133,6 +1133,7 @@ static bool detect_link_and_local_sink(s + !sink->edid_caps.edid_hdmi) + sink->sink_signal = SIGNAL_TYPE_DVI_SINGLE_LINK; + else if (dc_is_dvi_signal(sink->sink_signal) && ++ dc_is_dvi_signal(link->connector_signal) && + aud_support->hdmi_audio_native && + sink->edid_caps.edid_hdmi) + sink->sink_signal = SIGNAL_TYPE_HDMI_TYPE_A; diff --git a/queue-6.12/drm-amdgpu-fix-function-header-names-in-amdgpu_connectors.c.patch b/queue-6.12/drm-amdgpu-fix-function-header-names-in-amdgpu_connectors.c.patch new file mode 100644 index 0000000000..20fd1969cd --- /dev/null +++ b/queue-6.12/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 +@@ -1196,7 +1196,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) + { +@@ -1209,8 +1212,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.12/drm-amdgpu-fix-unintended-error-log-in-vcn5_0_0.patch b/queue-6.12/drm-amdgpu-fix-unintended-error-log-in-vcn5_0_0.patch new file mode 100644 index 0000000000..2417c909eb --- /dev/null +++ b/queue-6.12/drm-amdgpu-fix-unintended-error-log-in-vcn5_0_0.patch @@ -0,0 +1,35 @@ +From 46b0e6b9d749cfa891e6969d6565be1131c53aa2 Mon Sep 17 00:00:00 2001 +From: Sathishkumar S +Date: Mon, 28 Jul 2025 18:27:06 +0530 +Subject: drm/amdgpu: Fix unintended error log in VCN5_0_0 + +From: Sathishkumar S + +commit 46b0e6b9d749cfa891e6969d6565be1131c53aa2 upstream. + +The error log is supposed to be gaurded under if failure condition. + +Fixes: faab5ea08367 ("drm/amdgpu: Check vcn sram load return value") +Signed-off-by: Sathishkumar S +Reviewed-by: Leo Liu +Signed-off-by: Alex Deucher +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +--- a/drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c +@@ -721,9 +721,10 @@ static int vcn_v5_0_0_start_dpg_mode(str + + if (indirect) { + ret = amdgpu_vcn_psp_update_sram(adev, inst_idx, 0); +- dev_err(adev->dev, "%s: vcn sram load failed %d\n", __func__, ret); +- if (ret) ++ if (ret) { ++ dev_err(adev->dev, "%s: vcn sram load failed %d\n", __func__, ret); + return ret; ++ } + } + + ring = &adev->vcn.inst[inst_idx].ring_enc[0]; diff --git a/queue-6.12/extcon-adc-jack-cleanup-wakeup-source-only-if-it-was-enabled.patch b/queue-6.12/extcon-adc-jack-cleanup-wakeup-source-only-if-it-was-enabled.patch new file mode 100644 index 0000000000..79f699265d --- /dev/null +++ b/queue-6.12/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 +@@ -164,7 +164,8 @@ static void adc_jack_remove(struct platf + { + 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.12/net-phy-fix-phy_disable_eee.patch b/queue-6.12/net-phy-fix-phy_disable_eee.patch new file mode 100644 index 0000000000..6b4bb8bf7b --- /dev/null +++ b/queue-6.12/net-phy-fix-phy_disable_eee.patch @@ -0,0 +1,39 @@ +From c83ca5a4df7cf0ce9ccc25e8481043e05aed6ad0 Mon Sep 17 00:00:00 2001 +From: Heiner Kallweit +Date: Fri, 20 Dec 2024 23:02:06 +0100 +Subject: net: phy: fix phy_disable_eee + +From: Heiner Kallweit + +commit c83ca5a4df7cf0ce9ccc25e8481043e05aed6ad0 upstream. + +genphy_c45_write_eee_adv() becomes a no-op if phydev->supported_eee +is cleared. That's not what we want because this function is still +needed to clear the EEE advertisement register(s). +Fill phydev->eee_broken_modes instead to ensure that userspace +can't re-enable EEE advertising. + +Fixes: b55498ff14bd ("net: phy: add phy_disable_eee") +Signed-off-by: Heiner Kallweit +Link: https://patch.msgid.link/57e2ae5f-4319-413c-b5c4-ebc8d049bc23@gmail.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/phy/phy_device.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/drivers/net/phy/phy_device.c ++++ b/drivers/net/phy/phy_device.c +@@ -3054,10 +3054,11 @@ EXPORT_SYMBOL(phy_support_eee); + */ + void phy_disable_eee(struct phy_device *phydev) + { +- linkmode_zero(phydev->supported_eee); + linkmode_zero(phydev->advertising_eee); + phydev->eee_cfg.tx_lpi_enabled = false; + phydev->eee_cfg.eee_enabled = false; ++ /* don't let userspace re-enable EEE advertisement */ ++ linkmode_fill(phydev->eee_broken_modes); + } + EXPORT_SYMBOL_GPL(phy_disable_eee); + diff --git a/queue-6.12/series b/queue-6.12/series index 1f18f7b5ee..5f419f0858 100644 --- a/queue-6.12/series +++ b/queue-6.12/series @@ -557,3 +557,9 @@ scsi-ufs-ufs-pci-fix-s0ix-s3-for-intel-controllers.patch scsi-ufs-ufs-pci-set-ufshcd_quirk_perform_link_startup_once-for-intel-adl.patch scsi-ufs-core-add-a-quirk-to-suppress-link_startup_again.patch drm-amd-display-update-color-on-atomic-commit-time.patch +extcon-adc-jack-cleanup-wakeup-source-only-if-it-was-enabled.patch +acpi-spcr-check-for-table-version-when-using-precise-baudrate.patch +drm-amdgpu-fix-unintended-error-log-in-vcn5_0_0.patch +drm-amdgpu-fix-function-header-names-in-amdgpu_connectors.c.patch +drm-amd-display-fix-black-screen-with-hdmi-outputs.patch +net-phy-fix-phy_disable_eee.patch