drm: amdgpu: backport suspend fixes for CI
v2 cover drm: amdgpu: backport suspend fixes for CI
Work that completed in kernel 6.18 resulted in working suspend with DC on old hardware. This series aims to backport it to 6.12 to have working suspend there as well.
All commits were applied with git cherry-pick, the only changes being adding upstream commit, and signing off.
Tested on AMD HD7750 with:
radeon.si_support=0 amdgpu.si_support=1 amdgpu.dc=1 on Arch Linux.
v2: add extra upstream fix.
Charlene Liu (1):
drm/amd/display: Correct logic check error for fastboot
Kenneth Feng (2):
drm/amd/amdgpu: decouple ASPM with pcie dpm
drm/amd/amdgpu: disable ASPM in some situations
Timur Kristóf (7):
drm/amd/display: Disable fastboot on DCE 6 too drm/amd/display: Reject modes with too high pixel clock on DCE6-10 drm/amd/display: Keep PLL0 running on DCE 6.0 and 6.4 drm/amd/display: Fix DCE 6.0 and 6.4 PLL programming. drm/amd/display: Adjust DCE 8-10 clock, don't overclock by 15% drm/amd/display: Disable scaling on DCE6 for now drm/amd: Disable ASPM on SI
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 39 +++++++++++- .../display/dc/clk_mgr/dce100/dce_clk_mgr.c | 20 ++++--- .../display/dc/clk_mgr/dce60/dce60_clk_mgr.c | 5 ++ .../drm/amd/display/dc/dce60/dce60_resource.c | 59 +++++++++++++------ .../amd/display/dc/hwss/dce110/dce110_hwseq.c | 6 +- .../dc/resource/dce100/dce100_resource.c | 10 +++- .../dc/resource/dce80/dce80_resource.c | 10 +++- 7 files changed, 117 insertions(+), 32 deletions(-)
--
2.53.0
PATCH v2 1/10 drm/amd/amdgpu: decouple ASPM with pcie dpm
From: Kenneth Feng <[email protected]>
[ Upstream commit df0e722fbdbedb6f2b682dc2fad9e0c221e3622d ]
ASPM doesn't need to be disabled if pcie dpm is disabled. So ASPM can be independantly enabled.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 -- 1 file changed, 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0 -2
@@ -1782,8 +1782,6 @@ bool amdgpu_device_should_use_aspm(struct amdgpu_device *adev) }if (adev->flags &AMD_IS_APU )return false; -if (!(adev->pm.pp_feature &PP_PCIE_DPM_MASK )) -return false;return pcie_aspm_enabled (adev->pdev); }
Signature · 1 line
2.53.0
Patch "drm/amd/amdgpu: decouple ASPM with pcie dpm" has been added to the 6.12-stable tree
This is a note to let you know that I've just added the patch titled
drm/amd/amdgpu: decouple ASPM with pcie dpm
to the 6.12-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-amd-amdgpu-decouple-aspm-with-pcie-dpm.patch
and it can be found in the queue-6.12 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
From [email protected] Wed Apr 1 02:41:51 2026
From: Rosen Penev <[email protected]>
Date: Tue, 31 Mar 2026 17:38:59 -0700
Subject: drm/amd/amdgpu: decouple ASPM with pcie dpm
To: [email protected]
Cc: "Alex Deucher" <[email protected]>, "Christian König" <[email protected]>, "Xinhui Pan" <[email protected]>, "David Airlie" <[email protected]>, "Simona Vetter" <[email protected]>, "Harry Wentland" <[email protected]>, "Leo Li" <[email protected]>, "Rodrigo Siqueira" <[email protected]>, "Ray Wu" <[email protected]>, "Wayne Lin" <[email protected]>, "Mario Limonciello" <[email protected]>, "Roman Li" <[email protected]>, "Eric Yang" <[email protected]>, "Tony Cheng" <[email protected]>, "Mauro Rossi" <[email protected]>, "Timur Kristóf" <[email protected]>, "Alex Hung" <[email protected]>, [email protected] (open list:RADEON and AMDGPU DRM DRIVERS), [email protected] (open list:DRM DRIVERS), [email protected] (open list)
Message-ID: <[email protected]>
From: Kenneth Feng <[email protected]>
[ Upstream commit df0e722fbdbedb6f2b682dc2fad9e0c221e3622d ]
ASPM doesn't need to be disabled if pcie dpm is disabled. So ASPM can be independantly enabled.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 -- 1 file changed, 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0 -2
@@ -1782,8 +1782,6 @@ bool amdgpu_device_should_use_aspm(struc }if (adev->flags &AMD_IS_APU )return false; -if (!(adev->pm.pp_feature &PP_PCIE_DPM_MASK )) -return false;return pcie_aspm_enabled (adev->pdev); }
Patches currently in stable-queue which might be from [email protected] are
queue-6.12/drm-amd-amdgpu-decouple-aspm-with-pcie-dpm.patch queue-6.12/drm-amd-display-reject-modes-with-too-high-pixel-clock-on-dce6-10.patch queue-6.12/drm-amd-display-fix-dce-6.0-and-6.4-pll-programming.patch queue-6.12/drm-amd-display-disable-scaling-on-dce6-for-now.patch queue-6.12/drm-amd-display-disable-fastboot-on-dce-6-too.patch queue-6.12/drm-amd-display-correct-logic-check-error-for-fastboot.patch queue-6.12/drm-amd-amdgpu-disable-aspm-in-some-situations.patch queue-6.12/drm-amd-display-keep-pll0-running-on-dce-6.0-and-6.4.patch queue-6.12/drm-amd-display-adjust-dce-8-10-clock-don-t-overclock-by-15.patch queue-6.12/drm-amd-disable-aspm-on-si.patch
PATCH v2 2/10 drm/amd/amdgpu: disable ASPM in some situations
In reply to Rosen PenevFrom: Kenneth Feng <[email protected]>
[ Upstream commit c770ef19673fb1defcbde2ee2b91c3c89bfcf164 ]
disable ASPM with some ASICs on some specific platforms. required from PCIe controller owner.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +32 -0
@@ -84,6 +84,7 @@#if IS_ENABLED (CONFIG_X86 )#include <asm/intel-family.h> +#include <asm/cpu_device_id.h> #endif MODULE_FIRMWARE ("amdgpu/vega10_gpu_info.bin" );
@@ -1758,6 +1759,35 @@ static bool amdgpu_device_pcie_dynamic_switching_supported(struct amdgpu_devicereturn true; } +static bool amdgpu_device_aspm_support_quirk (struct amdgpu_device *adev) +{ +#if IS_ENABLED (CONFIG_X86 ) +struct cpuinfo_x86 *c = &cpu_data (0 ); + +if (!(amdgpu_ip_version (adev,GC_HWIP ,0 ) ==IP_VERSION (12 ,0 ,0 ) || +amdgpu_ip_version (adev,GC_HWIP ,0 ) ==IP_VERSION (12 ,0 ,1 ))) +return false; + +if (c->x86 ==6 && + adev->pm.pcie_gen_mask &CAIL_PCIE_LINK_SPEED_SUPPORT_GEN5 ) { +switch (c->x86_model) { +case VFM_MODEL (INTEL_ALDERLAKE ): +case VFM_MODEL (INTEL_ALDERLAKE_L ): +case VFM_MODEL (INTEL_RAPTORLAKE ): +case VFM_MODEL (INTEL_RAPTORLAKE_P ): +case VFM_MODEL (INTEL_RAPTORLAKE_S ): +return true; +default : +return false; + } + }else { +return false; + } +#else +return false; +#endif +} +/** * amdgpu_device_should_use_aspm - check if the device should program ASPM *
@@ -1782,6 +1812,8 @@ bool amdgpu_device_should_use_aspm(struct amdgpu_device *adev) }if (adev->flags &AMD_IS_APU )return false; +if (amdgpu_device_aspm_support_quirk (adev)) +return false;return pcie_aspm_enabled (adev->pdev); }
Signature · 1 line
2.53.0
Patch "drm/amd/amdgpu: disable ASPM in some situations" has been added to the 6.12-stable tree
This is a note to let you know that I've just added the patch titled
drm/amd/amdgpu: disable ASPM in some situations
to the 6.12-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-amd-amdgpu-disable-aspm-in-some-situations.patch
and it can be found in the queue-6.12 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
From [email protected] Wed Apr 1 02:42:32 2026
From: Rosen Penev <[email protected]>
Date: Tue, 31 Mar 2026 17:39:00 -0700
Subject: drm/amd/amdgpu: disable ASPM in some situations
To: [email protected]
Cc: "Alex Deucher" <[email protected]>, "Christian König" <[email protected]>, "Xinhui Pan" <[email protected]>, "David Airlie" <[email protected]>, "Simona Vetter" <[email protected]>, "Harry Wentland" <[email protected]>, "Leo Li" <[email protected]>, "Rodrigo Siqueira" <[email protected]>, "Ray Wu" <[email protected]>, "Wayne Lin" <[email protected]>, "Mario Limonciello" <[email protected]>, "Roman Li" <[email protected]>, "Eric Yang" <[email protected]>, "Tony Cheng" <[email protected]>, "Mauro Rossi" <[email protected]>, "Timur Kristóf" <[email protected]>, "Alex Hung" <[email protected]>, [email protected] (open list:RADEON and AMDGPU DRM DRIVERS), [email protected] (open list:DRM DRIVERS), [email protected] (open list)
Message-ID: <[email protected]>
From: Kenneth Feng <[email protected]>
[ Upstream commit c770ef19673fb1defcbde2ee2b91c3c89bfcf164 ]
disable ASPM with some ASICs on some specific platforms. required from PCIe controller owner.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 32 +++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +32 -0
@@ -84,6 +84,7 @@#if IS_ENABLED (CONFIG_X86 )#include <asm/intel-family.h> +#include <asm/cpu_device_id.h> #endif MODULE_FIRMWARE ("amdgpu/vega10_gpu_info.bin" );
@@ -1758,6 +1759,35 @@ static bool amdgpu_device_pcie_dynamic_sreturn true; } +static bool amdgpu_device_aspm_support_quirk (struct amdgpu_device *adev) +{ +#if IS_ENABLED (CONFIG_X86 ) +struct cpuinfo_x86 *c = &cpu_data (0 ); + +if (!(amdgpu_ip_version (adev,GC_HWIP ,0 ) ==IP_VERSION (12 ,0 ,0 ) || +amdgpu_ip_version (adev,GC_HWIP ,0 ) ==IP_VERSION (12 ,0 ,1 ))) +return false; + +if (c->x86 ==6 && + adev->pm.pcie_gen_mask &CAIL_PCIE_LINK_SPEED_SUPPORT_GEN5 ) { +switch (c->x86_model) { +case VFM_MODEL (INTEL_ALDERLAKE ): +case VFM_MODEL (INTEL_ALDERLAKE_L ): +case VFM_MODEL (INTEL_RAPTORLAKE ): +case VFM_MODEL (INTEL_RAPTORLAKE_P ): +case VFM_MODEL (INTEL_RAPTORLAKE_S ): +return true; +default : +return false; + } + }else { +return false; + } +#else +return false; +#endif +} +/** * amdgpu_device_should_use_aspm - check if the device should program ASPM *
@@ -1782,6 +1812,8 @@ bool amdgpu_device_should_use_aspm(struc }if (adev->flags &AMD_IS_APU )return false; +if (amdgpu_device_aspm_support_quirk (adev)) +return false;return pcie_aspm_enabled (adev->pdev); }
Patches currently in stable-queue which might be from [email protected] are
queue-6.12/drm-amd-amdgpu-decouple-aspm-with-pcie-dpm.patch queue-6.12/drm-amd-display-reject-modes-with-too-high-pixel-clock-on-dce6-10.patch queue-6.12/drm-amd-display-fix-dce-6.0-and-6.4-pll-programming.patch queue-6.12/drm-amd-display-disable-scaling-on-dce6-for-now.patch queue-6.12/drm-amd-display-disable-fastboot-on-dce-6-too.patch queue-6.12/drm-amd-display-correct-logic-check-error-for-fastboot.patch queue-6.12/drm-amd-amdgpu-disable-aspm-in-some-situations.patch queue-6.12/drm-amd-display-keep-pll0-running-on-dce-6.0-and-6.4.patch queue-6.12/drm-amd-display-adjust-dce-8-10-clock-don-t-overclock-by-15.patch queue-6.12/drm-amd-disable-aspm-on-si.patch
PATCH v2 3/10 drm/amd/display: Disable fastboot on DCE 6 too
In reply to Rosen PenevFrom: Timur Kristóf <[email protected]>
[ Upstream commit 7495962cbceb967e095233a5673ea71f3bcdee7e ]
It already didn't work on DCE 8,
so there is no reason to assume it would on DCE 6.
--- drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +2 -4
@@ -1910,10 +1910,8 @@ void dce110_enable_accelerated_mode(struct dc *dc, struct dc_state *context)get_edp_streams (context, edp_streams, &edp_stream_num); -// Check fastboot support, disable on DCE8 because of blank screens -if (edp_num && edp_stream_num && dc->ctx->dce_version !=DCE_VERSION_8_0 && - dc->ctx->dce_version !=DCE_VERSION_8_1 && - dc->ctx->dce_version !=DCE_VERSION_8_3 ) { +/* Check fastboot support, disable on DCE 6-8 because of blank screens */ +if (edp_num && edp_stream_num && dc->ctx->dce_version <DCE_VERSION_10_0 ) {for (i =0 ; i < edp_num; i++) { edp_link = edp_links[i];if (edp_link != edp_streams[0 ]->link)
Signature · 1 line
2.53.0
Patch "drm/amd/display: Disable fastboot on DCE 6 too" has been added to the 6.12-stable tree
This is a note to let you know that I've just added the patch titled
drm/amd/display: Disable fastboot on DCE 6 too
to the 6.12-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-amd-display-disable-fastboot-on-dce-6-too.patch
and it can be found in the queue-6.12 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
From [email protected] Wed Apr 1 02:43:13 2026
From: Rosen Penev <[email protected]>
Date: Tue, 31 Mar 2026 17:39:01 -0700
Subject: drm/amd/display: Disable fastboot on DCE 6 too
To: [email protected]
Cc: "Alex Deucher" <[email protected]>, "Christian König" <[email protected]>, "Xinhui Pan" <[email protected]>, "David Airlie" <[email protected]>, "Simona Vetter" <[email protected]>, "Harry Wentland" <[email protected]>, "Leo Li" <[email protected]>, "Rodrigo Siqueira" <[email protected]>, "Ray Wu" <[email protected]>, "Wayne Lin" <[email protected]>, "Mario Limonciello" <[email protected]>, "Roman Li" <[email protected]>, "Eric Yang" <[email protected]>, "Tony Cheng" <[email protected]>, "Mauro Rossi" <[email protected]>, "Timur Kristóf" <[email protected]>, "Alex Hung" <[email protected]>, [email protected] (open list:RADEON and AMDGPU DRM DRIVERS), [email protected] (open list:DRM DRIVERS), [email protected] (open list)
Message-ID: <[email protected]>
From: Timur Kristóf <[email protected]>
[ Upstream commit 7495962cbceb967e095233a5673ea71f3bcdee7e ]
It already didn't work on DCE 8,
so there is no reason to assume it would on DCE 6.
--- drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +2 -4
@@ -1910,10 +1910,8 @@ void dce110_enable_accelerated_mode(struget_edp_streams (context, edp_streams, &edp_stream_num); -// Check fastboot support, disable on DCE8 because of blank screens -if (edp_num && edp_stream_num && dc->ctx->dce_version !=DCE_VERSION_8_0 && - dc->ctx->dce_version !=DCE_VERSION_8_1 && - dc->ctx->dce_version !=DCE_VERSION_8_3 ) { +/* Check fastboot support, disable on DCE 6-8 because of blank screens */ +if (edp_num && edp_stream_num && dc->ctx->dce_version <DCE_VERSION_10_0 ) {for (i =0 ; i < edp_num; i++) { edp_link = edp_links[i];if (edp_link != edp_streams[0 ]->link)
Patches currently in stable-queue which might be from [email protected] are
queue-6.12/drm-amd-amdgpu-decouple-aspm-with-pcie-dpm.patch queue-6.12/drm-amd-display-reject-modes-with-too-high-pixel-clock-on-dce6-10.patch queue-6.12/drm-amd-display-fix-dce-6.0-and-6.4-pll-programming.patch queue-6.12/drm-amd-display-disable-scaling-on-dce6-for-now.patch queue-6.12/drm-amd-display-disable-fastboot-on-dce-6-too.patch queue-6.12/drm-amd-display-correct-logic-check-error-for-fastboot.patch queue-6.12/drm-amd-amdgpu-disable-aspm-in-some-situations.patch queue-6.12/drm-amd-display-keep-pll0-running-on-dce-6.0-and-6.4.patch queue-6.12/drm-amd-display-adjust-dce-8-10-clock-don-t-overclock-by-15.patch queue-6.12/drm-amd-disable-aspm-on-si.patch
PATCH v2 4/10 drm/amd/display: Reject modes with too high pixel clock on DCE6-10
In reply to Rosen PenevFrom: Timur Kristóf <[email protected]>
[ Upstream commit 118800b0797a046adaa2a8e9dee9b971b78802a7 ]
Reject modes with a pixel clock higher than the maximum display clock. Use 400 MHz as a fallback value when the maximum display clock is not known. Pixel clocks that are higher than the display clock just won't work and are not supported.
With the addition of the YUV422 fallback, DC can now accidentally
select a mode requiring higher pixel clock than actually supported when the DP version supports the required bandwidth but the clock is otherwise too high for the display engine. DCE 6-10 don't support these modes but they don't have a bandwidth calculation to reject them properly.
--- .../drm/amd/display/dc/clk_mgr/dce100/dce_clk_mgr.c | 3 +++ .../drm/amd/display/dc/clk_mgr/dce60/dce60_clk_mgr.c | 5 +++++ drivers/gpu/drm/amd/display/dc/dce60/dce60_resource.c | 10 +++++++++- .../amd/display/dc/resource/dce100/dce100_resource.c | 10 +++++++++- .../drm/amd/display/dc/resource/dce80/dce80_resource.c | 10 +++++++++- 5 files changed, 35 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/display/dc/clk_mgr/dce100/dce_clk_mgr.c +3 -0
@@ -460,6 +460,9 @@ void dce_clk_mgr_construct( clk_mgr->max_clks_state =DM_PP_CLOCKS_STATE_NOMINAL ; clk_mgr->cur_min_clks_state =DM_PP_CLOCKS_STATE_INVALID ; + base->clks.max_supported_dispclk_khz = + clk_mgr->max_clks_by_state[DM_PP_CLOCKS_STATE_PERFORMANCE ].display_clk_khz; +dce_clock_read_integrated_info (clk_mgr);dce_clock_read_ss_info (clk_mgr); }
drivers/gpu/drm/amd/display/dc/clk_mgr/dce60/dce60_clk_mgr.c +5 -0
@@ -147,6 +147,8 @@ void dce60_clk_mgr_construct(struct dc_context *ctx, struct clk_mgr_internal *clk_mgr) { + struct clk_mgr *base = &clk_mgr->base; +dce_clk_mgr_construct (ctx, clk_mgr); memcpy(clk_mgr->max_clks_by_state,
@@ -157,5 +159,8 @@ void dce60_clk_mgr_construct( clk_mgr->clk_mgr_shift = &disp_clk_shift; clk_mgr->clk_mgr_mask = &disp_clk_mask; clk_mgr->base.funcs = &dce60_funcs; + + base->clks.max_supported_dispclk_khz = + clk_mgr->max_clks_by_state[DM_PP_CLOCKS_STATE_PERFORMANCE ].display_clk_khz; }
drivers/gpu/drm/amd/display/dc/dce60/dce60_resource.c +9 -1
@@ -34,6 +34,7 @@#include "stream_encoder.h" #include "resource.h" +#include "clk_mgr.h" #include "include/irq_service_interface.h" #include "irq/dce60/irq_service_dce60.h" #include "dce110/dce110_timing_generator.h"
@@ -870,10 +871,17 @@ static bool dce60_validate_bandwidth( {int i;bool at_least_one_pipe = false; +struct dc_stream_state *stream =NULL ; +const uint32_t max_pix_clk_khz =max (dc->clk_mgr->clks.max_supported_dispclk_khz,400000 );for (i =0 ; i < dc->res_pool->pipe_count; i++) { -if (context->res_ctx.pipe_ctx[i].stream) + stream = context->res_ctx.pipe_ctx[i].stream; +if (stream) { at_least_one_pipe = true; + +if (stream->timing.pix_clk_100hz >= max_pix_clk_khz *10 ) +return DC_FAIL_BANDWIDTH_VALIDATE ; + } }if (at_least_one_pipe) {
drivers/gpu/drm/amd/display/dc/resource/dce100/dce100_resource.c +9 -1
@@ -29,6 +29,7 @@#include "stream_encoder.h" #include "resource.h" +#include "clk_mgr.h" #include "include/irq_service_interface.h" #include "virtual/virtual_stream_encoder.h" #include "dce110/dce110_resource.h"
@@ -843,10 +844,17 @@ static bool dce100_validate_bandwidth( {int i;bool at_least_one_pipe = false; +struct dc_stream_state *stream =NULL ; +const uint32_t max_pix_clk_khz =max (dc->clk_mgr->clks.max_supported_dispclk_khz,400000 );for (i =0 ; i < dc->res_pool->pipe_count; i++) { -if (context->res_ctx.pipe_ctx[i].stream) + stream = context->res_ctx.pipe_ctx[i].stream; +if (stream) { at_least_one_pipe = true; + +if (stream->timing.pix_clk_100hz >= max_pix_clk_khz *10 ) +return DC_FAIL_BANDWIDTH_VALIDATE ; + } }if (at_least_one_pipe) {
drivers/gpu/drm/amd/display/dc/resource/dce80/dce80_resource.c +9 -1
@@ -32,6 +32,7 @@#include "stream_encoder.h" #include "resource.h" +#include "clk_mgr.h" #include "include/irq_service_interface.h" #include "irq/dce80/irq_service_dce80.h" #include "dce110/dce110_timing_generator.h"
@@ -876,10 +877,17 @@ static bool dce80_validate_bandwidth( {int i;bool at_least_one_pipe = false; +struct dc_stream_state *stream =NULL ; +const uint32_t max_pix_clk_khz =max (dc->clk_mgr->clks.max_supported_dispclk_khz,400000 );for (i =0 ; i < dc->res_pool->pipe_count; i++) { -if (context->res_ctx.pipe_ctx[i].stream) + stream = context->res_ctx.pipe_ctx[i].stream; +if (stream) { at_least_one_pipe = true; + +if (stream->timing.pix_clk_100hz >= max_pix_clk_khz *10 ) +return DC_FAIL_BANDWIDTH_VALIDATE ; + } }if (at_least_one_pipe) {
Signature · 1 line
2.53.0
Patch "drm/amd/display: Reject modes with too high pixel clock on DCE6-10" has been added to the 6.12-stable tree
This is a note to let you know that I've just added the patch titled
drm/amd/display: Reject modes with too high pixel clock on DCE6-10
to the 6.12-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-amd-display-reject-modes-with-too-high-pixel-clock-on-dce6-10.patch
and it can be found in the queue-6.12 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
From [email protected] Wed Apr 1 02:43:45 2026
From: Rosen Penev <[email protected]>
Date: Tue, 31 Mar 2026 17:39:02 -0700
Subject: drm/amd/display: Reject modes with too high pixel clock on DCE6-10
To: [email protected]
Cc: "Alex Deucher" <[email protected]>, "Christian König" <[email protected]>, "Xinhui Pan" <[email protected]>, "David Airlie" <[email protected]>, "Simona Vetter" <[email protected]>, "Harry Wentland" <[email protected]>, "Leo Li" <[email protected]>, "Rodrigo Siqueira" <[email protected]>, "Ray Wu" <[email protected]>, "Wayne Lin" <[email protected]>, "Mario Limonciello" <[email protected]>, "Roman Li" <[email protected]>, "Eric Yang" <[email protected]>, "Tony Cheng" <[email protected]>, "Mauro Rossi" <[email protected]>, "Timur Kristóf" <[email protected]>, "Alex Hung" <[email protected]>, [email protected] (open list:RADEON and AMDGPU DRM DRIVERS), [email protected] (open list:DRM DRIVERS), [email protected] (open list)
Message-ID: <[email protected]>
From: Timur Kristóf <[email protected]>
[ Upstream commit 118800b0797a046adaa2a8e9dee9b971b78802a7 ]
Reject modes with a pixel clock higher than the maximum display clock. Use 400 MHz as a fallback value when the maximum display clock is not known. Pixel clocks that are higher than the display clock just won't work and are not supported.
With the addition of the YUV422 fallback, DC can now accidentally
select a mode requiring higher pixel clock than actually supported when the DP version supports the required bandwidth but the clock is otherwise too high for the display engine. DCE 6-10 don't support these modes but they don't have a bandwidth calculation to reject them properly.
--- drivers/gpu/drm/amd/display/dc/clk_mgr/dce100/dce_clk_mgr.c | 3 +++ drivers/gpu/drm/amd/display/dc/clk_mgr/dce60/dce60_clk_mgr.c | 5 +++++ drivers/gpu/drm/amd/display/dc/dce60/dce60_resource.c | 10 +++++++++- drivers/gpu/drm/amd/display/dc/resource/dce100/dce100_resource.c | 10 +++++++++- drivers/gpu/drm/amd/display/dc/resource/dce80/dce80_resource.c | 10 +++++++++- 5 files changed, 35 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/display/dc/clk_mgr/dce100/dce_clk_mgr.c +3 -0
@@ -460,6 +460,9 @@ void dce_clk_mgr_construct( clk_mgr->max_clks_state =DM_PP_CLOCKS_STATE_NOMINAL ; clk_mgr->cur_min_clks_state =DM_PP_CLOCKS_STATE_INVALID ; + base->clks.max_supported_dispclk_khz = + clk_mgr->max_clks_by_state[DM_PP_CLOCKS_STATE_PERFORMANCE ].display_clk_khz; +dce_clock_read_integrated_info (clk_mgr);dce_clock_read_ss_info (clk_mgr); }
drivers/gpu/drm/amd/display/dc/clk_mgr/dce60/dce60_clk_mgr.c +5 -0
@@ -147,6 +147,8 @@ void dce60_clk_mgr_construct(struct dc_context *ctx, struct clk_mgr_internal *clk_mgr) { + struct clk_mgr *base = &clk_mgr->base; +dce_clk_mgr_construct (ctx, clk_mgr); memcpy(clk_mgr->max_clks_by_state,
@@ -157,5 +159,8 @@ void dce60_clk_mgr_construct( clk_mgr->clk_mgr_shift = &disp_clk_shift; clk_mgr->clk_mgr_mask = &disp_clk_mask; clk_mgr->base.funcs = &dce60_funcs; + + base->clks.max_supported_dispclk_khz = + clk_mgr->max_clks_by_state[DM_PP_CLOCKS_STATE_PERFORMANCE ].display_clk_khz; }
drivers/gpu/drm/amd/display/dc/dce60/dce60_resource.c +9 -1
@@ -34,6 +34,7 @@#include "stream_encoder.h" #include "resource.h" +#include "clk_mgr.h" #include "include/irq_service_interface.h" #include "irq/dce60/irq_service_dce60.h" #include "dce110/dce110_timing_generator.h"
@@ -870,10 +871,17 @@ static bool dce60_validate_bandwidth( {int i;bool at_least_one_pipe = false; +struct dc_stream_state *stream =NULL ; +const uint32_t max_pix_clk_khz =max (dc->clk_mgr->clks.max_supported_dispclk_khz,400000 );for (i =0 ; i < dc->res_pool->pipe_count; i++) { -if (context->res_ctx.pipe_ctx[i].stream) + stream = context->res_ctx.pipe_ctx[i].stream; +if (stream) { at_least_one_pipe = true; + +if (stream->timing.pix_clk_100hz >= max_pix_clk_khz *10 ) +return DC_FAIL_BANDWIDTH_VALIDATE ; + } }if (at_least_one_pipe) {
drivers/gpu/drm/amd/display/dc/resource/dce100/dce100_resource.c +9 -1
@@ -29,6 +29,7 @@#include "stream_encoder.h" #include "resource.h" +#include "clk_mgr.h" #include "include/irq_service_interface.h" #include "virtual/virtual_stream_encoder.h" #include "dce110/dce110_resource.h"
@@ -843,10 +844,17 @@ static bool dce100_validate_bandwidth( {int i;bool at_least_one_pipe = false; +struct dc_stream_state *stream =NULL ; +const uint32_t max_pix_clk_khz =max (dc->clk_mgr->clks.max_supported_dispclk_khz,400000 );for (i =0 ; i < dc->res_pool->pipe_count; i++) { -if (context->res_ctx.pipe_ctx[i].stream) + stream = context->res_ctx.pipe_ctx[i].stream; +if (stream) { at_least_one_pipe = true; + +if (stream->timing.pix_clk_100hz >= max_pix_clk_khz *10 ) +return DC_FAIL_BANDWIDTH_VALIDATE ; + } }if (at_least_one_pipe) {
drivers/gpu/drm/amd/display/dc/resource/dce80/dce80_resource.c +9 -1
@@ -32,6 +32,7 @@#include "stream_encoder.h" #include "resource.h" +#include "clk_mgr.h" #include "include/irq_service_interface.h" #include "irq/dce80/irq_service_dce80.h" #include "dce110/dce110_timing_generator.h"
@@ -876,10 +877,17 @@ static bool dce80_validate_bandwidth( {int i;bool at_least_one_pipe = false; +struct dc_stream_state *stream =NULL ; +const uint32_t max_pix_clk_khz =max (dc->clk_mgr->clks.max_supported_dispclk_khz,400000 );for (i =0 ; i < dc->res_pool->pipe_count; i++) { -if (context->res_ctx.pipe_ctx[i].stream) + stream = context->res_ctx.pipe_ctx[i].stream; +if (stream) { at_least_one_pipe = true; + +if (stream->timing.pix_clk_100hz >= max_pix_clk_khz *10 ) +return DC_FAIL_BANDWIDTH_VALIDATE ; + } }if (at_least_one_pipe) {
Patches currently in stable-queue which might be from [email protected] are
queue-6.12/drm-amd-amdgpu-decouple-aspm-with-pcie-dpm.patch queue-6.12/drm-amd-display-reject-modes-with-too-high-pixel-clock-on-dce6-10.patch queue-6.12/drm-amd-display-fix-dce-6.0-and-6.4-pll-programming.patch queue-6.12/drm-amd-display-disable-scaling-on-dce6-for-now.patch queue-6.12/drm-amd-display-disable-fastboot-on-dce-6-too.patch queue-6.12/drm-amd-display-correct-logic-check-error-for-fastboot.patch queue-6.12/drm-amd-amdgpu-disable-aspm-in-some-situations.patch queue-6.12/drm-amd-display-keep-pll0-running-on-dce-6.0-and-6.4.patch queue-6.12/drm-amd-display-adjust-dce-8-10-clock-don-t-overclock-by-15.patch queue-6.12/drm-amd-disable-aspm-on-si.patch
PATCH v2 5/10 drm/amd/display: Keep PLL0 running on DCE 6.0 and 6.4
In reply to Rosen PenevFrom: Timur Kristóf <[email protected]>
[ Upstream commit 0449726b58ea64ec96b95f95944f0a3650204059 ]
DC can turn off the display clock when no displays are connected or when all displays are off, for reference see:
- dce*_validate_bandwidth
DC also assumes that the DP clock is always on and never powers it down, for reference see:
- dce110_clock_source_power_down
In case of DCE 6.0 and 6.4, PLL0 is the clock source for both the engine clock and DP clock, for reference see:
- radeon_atom_pick_pll
- atombios_crtc_set_disp_eng_pll
Therefore, PLL0 should be always kept running on DCE 6.0 and 6.4. This commit achieves that by ensuring that by setting the display clock to the corresponding value in low power state instead of zero.
This fixes a page flip timeout on SI with DC which happens when all connected displays are blanked.
--- drivers/gpu/drm/amd/display/dc/dce60/dce60_resource.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dce60/dce60_resource.c +10 -1
@@ -889,7 +889,16 @@ static bool dce60_validate_bandwidth( context->bw_ctx.bw.dce.dispclk_khz =681000 ; context->bw_ctx.bw.dce.yclk_khz =250000 *MEMORY_TYPE_MULTIPLIER_CZ ; }else { - context->bw_ctx.bw.dce.dispclk_khz =0 ; +/* On DCE 6.0 and 6.4 the PLL0 is both the display engine clock and +* the DP clock, and shouldn't be turned off. Just select the display +* clock value from its low power mode. +*/ +if (dc->ctx->dce_version ==DCE_VERSION_6_0 || + dc->ctx->dce_version ==DCE_VERSION_6_4 ) + context->bw_ctx.bw.dce.dispclk_khz =352000 ; +else + context->bw_ctx.bw.dce.dispclk_khz =0 ; + context->bw_ctx.bw.dce.yclk_khz =0 ; }
Signature · 1 line
2.53.0
Patch "drm/amd/display: Keep PLL0 running on DCE 6.0 and 6.4" has been added to the 6.12-stable tree
This is a note to let you know that I've just added the patch titled
drm/amd/display: Keep PLL0 running on DCE 6.0 and 6.4
to the 6.12-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-amd-display-keep-pll0-running-on-dce-6.0-and-6.4.patch
and it can be found in the queue-6.12 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
From [email protected] Wed Apr 1 02:44:15 2026
From: Rosen Penev <[email protected]>
Date: Tue, 31 Mar 2026 17:39:03 -0700
Subject: drm/amd/display: Keep PLL0 running on DCE 6.0 and 6.4
To: [email protected]
Cc: "Alex Deucher" <[email protected]>, "Christian König" <[email protected]>, "Xinhui Pan" <[email protected]>, "David Airlie" <[email protected]>, "Simona Vetter" <[email protected]>, "Harry Wentland" <[email protected]>, "Leo Li" <[email protected]>, "Rodrigo Siqueira" <[email protected]>, "Ray Wu" <[email protected]>, "Wayne Lin" <[email protected]>, "Mario Limonciello" <[email protected]>, "Roman Li" <[email protected]>, "Eric Yang" <[email protected]>, "Tony Cheng" <[email protected]>, "Mauro Rossi" <[email protected]>, "Timur Kristóf" <[email protected]>, "Alex Hung" <[email protected]>, [email protected] (open list:RADEON and AMDGPU DRM DRIVERS), [email protected] (open list:DRM DRIVERS), [email protected] (open list)
Message-ID: <[email protected]>
From: Timur Kristóf <[email protected]>
[ Upstream commit 0449726b58ea64ec96b95f95944f0a3650204059 ]
DC can turn off the display clock when no displays are connected or when all displays are off, for reference see:
- dce*_validate_bandwidth
DC also assumes that the DP clock is always on and never powers it down, for reference see:
- dce110_clock_source_power_down
In case of DCE 6.0 and 6.4, PLL0 is the clock source for both the engine clock and DP clock, for reference see:
- radeon_atom_pick_pll
- atombios_crtc_set_disp_eng_pll
Therefore, PLL0 should be always kept running on DCE 6.0 and 6.4. This commit achieves that by ensuring that by setting the display clock to the corresponding value in low power state instead of zero.
This fixes a page flip timeout on SI with DC which happens when all connected displays are blanked.
--- drivers/gpu/drm/amd/display/dc/dce60/dce60_resource.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dce60/dce60_resource.c +10 -1
@@ -889,7 +889,16 @@ static bool dce60_validate_bandwidth( context->bw_ctx.bw.dce.dispclk_khz =681000 ; context->bw_ctx.bw.dce.yclk_khz =250000 *MEMORY_TYPE_MULTIPLIER_CZ ; }else { - context->bw_ctx.bw.dce.dispclk_khz =0 ; +/* On DCE 6.0 and 6.4 the PLL0 is both the display engine clock and +* the DP clock, and shouldn't be turned off. Just select the display +* clock value from its low power mode. +*/ +if (dc->ctx->dce_version ==DCE_VERSION_6_0 || + dc->ctx->dce_version ==DCE_VERSION_6_4 ) + context->bw_ctx.bw.dce.dispclk_khz =352000 ; +else + context->bw_ctx.bw.dce.dispclk_khz =0 ; + context->bw_ctx.bw.dce.yclk_khz =0 ; }
Patches currently in stable-queue which might be from [email protected] are
queue-6.12/drm-amd-amdgpu-decouple-aspm-with-pcie-dpm.patch queue-6.12/drm-amd-display-reject-modes-with-too-high-pixel-clock-on-dce6-10.patch queue-6.12/drm-amd-display-fix-dce-6.0-and-6.4-pll-programming.patch queue-6.12/drm-amd-display-disable-scaling-on-dce6-for-now.patch queue-6.12/drm-amd-display-disable-fastboot-on-dce-6-too.patch queue-6.12/drm-amd-display-correct-logic-check-error-for-fastboot.patch queue-6.12/drm-amd-amdgpu-disable-aspm-in-some-situations.patch queue-6.12/drm-amd-display-keep-pll0-running-on-dce-6.0-and-6.4.patch queue-6.12/drm-amd-display-adjust-dce-8-10-clock-don-t-overclock-by-15.patch queue-6.12/drm-amd-disable-aspm-on-si.patch
PATCH v2 6/10 drm/amd/display: Fix DCE 6.0 and 6.4 PLL programming.
In reply to Rosen PenevFrom: Timur Kristóf <[email protected]>
[ Upstream commit 35222b5934ec8d762473592ece98659baf6bc48e ]
Apparently, both DCE 6.0 and 6.4 have 3 PLLs, but PLL0 can only be used for DP. Make sure to initialize the correct amount of PLLs in DC for these DCE versions and use PLL0 only for DP.
Also, on DCE 6.0 and 6.4, the PLL0 needs to be powered on at initialization as opposed to DCE 6.1 and 7.x which use a different clock source for DFS.
The following functions were used as reference from the old
radeon driver implementation of DCE 6.x:
- radeon_atom_pick_pll
- atombios_crtc_set_disp_eng_pll
--- .../display/dc/clk_mgr/dce100/dce_clk_mgr.c | 5 +++ .../drm/amd/display/dc/dce60/dce60_resource.c | 34 +++++++++++-------- 2 files changed, 25 insertions(+), 14 deletions(-)
drivers/gpu/drm/amd/display/dc/clk_mgr/dce100/dce_clk_mgr.c +5 -0
@@ -245,6 +245,11 @@ int dce_set_clock( pxl_clk_params.target_pixel_clock_100hz = requested_clk_khz *10 ; pxl_clk_params.pll_id =CLOCK_SOURCE_ID_DFS ; +/* DCE 6.0, DCE 6.4: engine clock is the same as PLL0 */ +if (clk_mgr_base->ctx->dce_version ==DCE_VERSION_6_0 || + clk_mgr_base->ctx->dce_version ==DCE_VERSION_6_4 ) + pxl_clk_params.pll_id =CLOCK_SOURCE_ID_PLL0 ; +if (clk_mgr_dce->dfs_bypass_active) pxl_clk_params.flags.SET_DISPCLK_DFS_BYPASS = true;
drivers/gpu/drm/amd/display/dc/dce60/dce60_resource.c +20 -14
@@ -374,7 +374,7 @@ static const struct resource_caps res_cap = { .num_timing_generator = 6, .num_audio = 6, .num_stream_encoder = 6, - .num_pll = 2, + .num_pll = 3, .num_ddc = 6, };
@@ -390,7 +390,7 @@ static const struct resource_caps res_cap_64 = { .num_timing_generator = 2, .num_audio = 2, .num_stream_encoder = 2, - .num_pll = 2, + .num_pll = 3, .num_ddc = 2, };
@@ -990,21 +990,24 @@ static bool dce60_construct(if (bp->fw_info_valid && bp->fw_info.external_clock_source_frequency_for_dp !=0 ) { pool->base.dp_clock_source = -dce60_clock_source_create (ctx, bp,CLOCK_SOURCE_ID_EXTERNAL ,NULL , true); +dce60_clock_source_create (ctx, bp,CLOCK_SOURCE_ID_EXTERNAL ,NULL , true); +/* DCE 6.0 and 6.4: PLL0 can only be used with DP. Don't initialize it here. */ pool->base.clock_sources[0 ] = -dce60_clock_source_create (ctx, bp,CLOCK_SOURCE_ID_PLL0 , &clk_src_regs[0 ], false); +dce60_clock_source_create (ctx, bp,CLOCK_SOURCE_ID_PLL1 , &clk_src_regs[1 ], false); pool->base.clock_sources[1 ] = -dce60_clock_source_create (ctx, bp,CLOCK_SOURCE_ID_PLL1 , &clk_src_regs[1 ], false); +dce60_clock_source_create (ctx, bp,CLOCK_SOURCE_ID_PLL2 , &clk_src_regs[2 ], false); pool->base.clk_src_count =2 ; }else { pool->base.dp_clock_source = -dce60_clock_source_create (ctx, bp,CLOCK_SOURCE_ID_PLL0 , &clk_src_regs[0 ], true); +dce60_clock_source_create (ctx, bp,CLOCK_SOURCE_ID_PLL0 , &clk_src_regs[0 ], true); pool->base.clock_sources[0 ] = -dce60_clock_source_create (ctx, bp,CLOCK_SOURCE_ID_PLL1 , &clk_src_regs[1 ], false); - pool->base.clk_src_count =1 ; +dce60_clock_source_create (ctx, bp,CLOCK_SOURCE_ID_PLL1 , &clk_src_regs[1 ], false); + pool->base.clock_sources[1 ] = +dce60_clock_source_create (ctx, bp,CLOCK_SOURCE_ID_PLL2 , &clk_src_regs[2 ], false); + pool->base.clk_src_count =2 ; }if (pool->base.dp_clock_source ==NULL ) {
@@ -1382,21 +1385,24 @@ static bool dce64_construct(if (bp->fw_info_valid && bp->fw_info.external_clock_source_frequency_for_dp !=0 ) { pool->base.dp_clock_source = -dce60_clock_source_create (ctx, bp,CLOCK_SOURCE_ID_EXTERNAL ,NULL , true); +dce60_clock_source_create (ctx, bp,CLOCK_SOURCE_ID_EXTERNAL ,NULL , true); +/* DCE 6.0 and 6.4: PLL0 can only be used with DP. Don't initialize it here. */ pool->base.clock_sources[0 ] = -dce60_clock_source_create (ctx, bp,CLOCK_SOURCE_ID_PLL1 , &clk_src_regs[0 ], false); +dce60_clock_source_create (ctx, bp,CLOCK_SOURCE_ID_PLL1 , &clk_src_regs[1 ], false); pool->base.clock_sources[1 ] = -dce60_clock_source_create (ctx, bp,CLOCK_SOURCE_ID_PLL2 , &clk_src_regs[1 ], false); +dce60_clock_source_create (ctx, bp,CLOCK_SOURCE_ID_PLL2 , &clk_src_regs[2 ], false); pool->base.clk_src_count =2 ; }else { pool->base.dp_clock_source = -dce60_clock_source_create (ctx, bp,CLOCK_SOURCE_ID_PLL1 , &clk_src_regs[0 ], true); +dce60_clock_source_create (ctx, bp,CLOCK_SOURCE_ID_PLL0 , &clk_src_regs[0 ], true); pool->base.clock_sources[0 ] = -dce60_clock_source_create (ctx, bp,CLOCK_SOURCE_ID_PLL2 , &clk_src_regs[1 ], false); - pool->base.clk_src_count =1 ; +dce60_clock_source_create (ctx, bp,CLOCK_SOURCE_ID_PLL1 , &clk_src_regs[1 ], false); + pool->base.clock_sources[1 ] = +dce60_clock_source_create (ctx, bp,CLOCK_SOURCE_ID_PLL2 , &clk_src_regs[2 ], false); + pool->base.clk_src_count =2 ; }if (pool->base.dp_clock_source ==NULL ) {
Signature · 1 line
2.53.0
Patch "drm/amd/display: Fix DCE 6.0 and 6.4 PLL programming." has been added to the 6.12-stable tree
This is a note to let you know that I've just added the patch titled
drm/amd/display: Fix DCE 6.0 and 6.4 PLL programming.
to the 6.12-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-amd-display-fix-dce-6.0-and-6.4-pll-programming.patch
and it can be found in the queue-6.12 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
From [email protected] Wed Apr 1 02:44:20 2026
From: Rosen Penev <[email protected]>
Date: Tue, 31 Mar 2026 17:39:04 -0700
Subject: drm/amd/display: Fix DCE 6.0 and 6.4 PLL programming.
To: [email protected]
Cc: "Alex Deucher" <[email protected]>, "Christian König" <[email protected]>, "Xinhui Pan" <[email protected]>, "David Airlie" <[email protected]>, "Simona Vetter" <[email protected]>, "Harry Wentland" <[email protected]>, "Leo Li" <[email protected]>, "Rodrigo Siqueira" <[email protected]>, "Ray Wu" <[email protected]>, "Wayne Lin" <[email protected]>, "Mario Limonciello" <[email protected]>, "Roman Li" <[email protected]>, "Eric Yang" <[email protected]>, "Tony Cheng" <[email protected]>, "Mauro Rossi" <[email protected]>, "Timur Kristóf" <[email protected]>, "Alex Hung" <[email protected]>, [email protected] (open list:RADEON and AMDGPU DRM DRIVERS), [email protected] (open list:DRM DRIVERS), [email protected] (open list)
Message-ID: <[email protected]>
From: Timur Kristóf <[email protected]>
[ Upstream commit 35222b5934ec8d762473592ece98659baf6bc48e ]
Apparently, both DCE 6.0 and 6.4 have 3 PLLs, but PLL0 can only be used for DP. Make sure to initialize the correct amount of PLLs in DC for these DCE versions and use PLL0 only for DP.
Also, on DCE 6.0 and 6.4, the PLL0 needs to be powered on at initialization as opposed to DCE 6.1 and 7.x which use a different clock source for DFS.
The following functions were used as reference from the old
radeon driver implementation of DCE 6.x:
- radeon_atom_pick_pll
- atombios_crtc_set_disp_eng_pll
--- drivers/gpu/drm/amd/display/dc/clk_mgr/dce100/dce_clk_mgr.c | 5 + drivers/gpu/drm/amd/display/dc/dce60/dce60_resource.c | 34 +++++++----- 2 files changed, 25 insertions(+), 14 deletions(-)
drivers/gpu/drm/amd/display/dc/clk_mgr/dce100/dce_clk_mgr.c +5 -0
@@ -245,6 +245,11 @@ int dce_set_clock( pxl_clk_params.target_pixel_clock_100hz = requested_clk_khz *10 ; pxl_clk_params.pll_id =CLOCK_SOURCE_ID_DFS ; +/* DCE 6.0, DCE 6.4: engine clock is the same as PLL0 */ +if (clk_mgr_base->ctx->dce_version ==DCE_VERSION_6_0 || + clk_mgr_base->ctx->dce_version ==DCE_VERSION_6_4 ) + pxl_clk_params.pll_id =CLOCK_SOURCE_ID_PLL0 ; +if (clk_mgr_dce->dfs_bypass_active) pxl_clk_params.flags.SET_DISPCLK_DFS_BYPASS = true;
drivers/gpu/drm/amd/display/dc/dce60/dce60_resource.c +20 -14
@@ -374,7 +374,7 @@ static const struct resource_caps res_ca .num_timing_generator = 6, .num_audio = 6, .num_stream_encoder = 6, - .num_pll = 2, + .num_pll = 3, .num_ddc = 6, };
@@ -390,7 +390,7 @@ static const struct resource_caps res_ca .num_timing_generator = 2, .num_audio = 2, .num_stream_encoder = 2, - .num_pll = 2, + .num_pll = 3, .num_ddc = 2, };
@@ -990,21 +990,24 @@ static bool dce60_construct(if (bp->fw_info_valid && bp->fw_info.external_clock_source_frequency_for_dp !=0 ) { pool->base.dp_clock_source = -dce60_clock_source_create (ctx, bp,CLOCK_SOURCE_ID_EXTERNAL ,NULL , true); +dce60_clock_source_create (ctx, bp,CLOCK_SOURCE_ID_EXTERNAL ,NULL , true); +/* DCE 6.0 and 6.4: PLL0 can only be used with DP. Don't initialize it here. */ pool->base.clock_sources[0 ] = -dce60_clock_source_create (ctx, bp,CLOCK_SOURCE_ID_PLL0 , &clk_src_regs[0 ], false); +dce60_clock_source_create (ctx, bp,CLOCK_SOURCE_ID_PLL1 , &clk_src_regs[1 ], false); pool->base.clock_sources[1 ] = -dce60_clock_source_create (ctx, bp,CLOCK_SOURCE_ID_PLL1 , &clk_src_regs[1 ], false); +dce60_clock_source_create (ctx, bp,CLOCK_SOURCE_ID_PLL2 , &clk_src_regs[2 ], false); pool->base.clk_src_count =2 ; }else { pool->base.dp_clock_source = -dce60_clock_source_create (ctx, bp,CLOCK_SOURCE_ID_PLL0 , &clk_src_regs[0 ], true); +dce60_clock_source_create (ctx, bp,CLOCK_SOURCE_ID_PLL0 , &clk_src_regs[0 ], true); pool->base.clock_sources[0 ] = -dce60_clock_source_create (ctx, bp,CLOCK_SOURCE_ID_PLL1 , &clk_src_regs[1 ], false); - pool->base.clk_src_count =1 ; +dce60_clock_source_create (ctx, bp,CLOCK_SOURCE_ID_PLL1 , &clk_src_regs[1 ], false); + pool->base.clock_sources[1 ] = +dce60_clock_source_create (ctx, bp,CLOCK_SOURCE_ID_PLL2 , &clk_src_regs[2 ], false); + pool->base.clk_src_count =2 ; }if (pool->base.dp_clock_source ==NULL ) {
@@ -1382,21 +1385,24 @@ static bool dce64_construct(if (bp->fw_info_valid && bp->fw_info.external_clock_source_frequency_for_dp !=0 ) { pool->base.dp_clock_source = -dce60_clock_source_create (ctx, bp,CLOCK_SOURCE_ID_EXTERNAL ,NULL , true); +dce60_clock_source_create (ctx, bp,CLOCK_SOURCE_ID_EXTERNAL ,NULL , true); +/* DCE 6.0 and 6.4: PLL0 can only be used with DP. Don't initialize it here. */ pool->base.clock_sources[0 ] = -dce60_clock_source_create (ctx, bp,CLOCK_SOURCE_ID_PLL1 , &clk_src_regs[0 ], false); +dce60_clock_source_create (ctx, bp,CLOCK_SOURCE_ID_PLL1 , &clk_src_regs[1 ], false); pool->base.clock_sources[1 ] = -dce60_clock_source_create (ctx, bp,CLOCK_SOURCE_ID_PLL2 , &clk_src_regs[1 ], false); +dce60_clock_source_create (ctx, bp,CLOCK_SOURCE_ID_PLL2 , &clk_src_regs[2 ], false); pool->base.clk_src_count =2 ; }else { pool->base.dp_clock_source = -dce60_clock_source_create (ctx, bp,CLOCK_SOURCE_ID_PLL1 , &clk_src_regs[0 ], true); +dce60_clock_source_create (ctx, bp,CLOCK_SOURCE_ID_PLL0 , &clk_src_regs[0 ], true); pool->base.clock_sources[0 ] = -dce60_clock_source_create (ctx, bp,CLOCK_SOURCE_ID_PLL2 , &clk_src_regs[1 ], false); - pool->base.clk_src_count =1 ; +dce60_clock_source_create (ctx, bp,CLOCK_SOURCE_ID_PLL1 , &clk_src_regs[1 ], false); + pool->base.clock_sources[1 ] = +dce60_clock_source_create (ctx, bp,CLOCK_SOURCE_ID_PLL2 , &clk_src_regs[2 ], false); + pool->base.clk_src_count =2 ; }if (pool->base.dp_clock_source ==NULL ) {
Patches currently in stable-queue which might be from [email protected] are
queue-6.12/drm-amd-amdgpu-decouple-aspm-with-pcie-dpm.patch queue-6.12/drm-amd-display-reject-modes-with-too-high-pixel-clock-on-dce6-10.patch queue-6.12/drm-amd-display-fix-dce-6.0-and-6.4-pll-programming.patch queue-6.12/drm-amd-display-disable-scaling-on-dce6-for-now.patch queue-6.12/drm-amd-display-disable-fastboot-on-dce-6-too.patch queue-6.12/drm-amd-display-correct-logic-check-error-for-fastboot.patch queue-6.12/drm-amd-amdgpu-disable-aspm-in-some-situations.patch queue-6.12/drm-amd-display-keep-pll0-running-on-dce-6.0-and-6.4.patch queue-6.12/drm-amd-display-adjust-dce-8-10-clock-don-t-overclock-by-15.patch queue-6.12/drm-amd-disable-aspm-on-si.patch
PATCH v2 7/10 drm/amd/display: Adjust DCE 8-10 clock, don't overclock by 15%
In reply to Rosen PenevFrom: Timur Kristóf <[email protected]>
[ Upstream commit 1ae45b5d4f371af8ae51a3827d0ec9fe27eeb867 ]
Adjust the nominal (and performance) clocks for DCE 8-10, and set them to 625 MHz, which is the value used by the legacy display code in amdgpu_atombios_get_clock_info.
This was tested with Hawaii, Tonga and Fiji. These GPUs can output 4K 60Hz (10-bit depth) at 625 MHz.
The extra 15% clock was added as a workaround for a Polaris issue which uses DCE 11, and should not have been used on DCE 8-10 which are already hardcoded to the highest possible display clock. Unfortunately, the extra 15% was mistakenly copied and kept even on code paths which don't affect Polaris.
This commit fixes that and also adds a check to make sure
not to exceed the maximum DCE 8-10 display clock.
--- .../drm/amd/display/dc/clk_mgr/dce100/dce_clk_mgr.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
drivers/gpu/drm/amd/display/dc/clk_mgr/dce100/dce_clk_mgr.c +5 -7
@@ -72,9 +72,9 @@ static const struct state_dependent_clocks dce80_max_clks_by_state[] = {/* ClocksStateLow */ { .display_clk_khz = 352000, .pixel_clk_khz = 330000}, /* ClocksStateNominal */ -{ .display_clk_khz = 600000, .pixel_clk_khz = 400000 }, +{ .display_clk_khz = 625000, .pixel_clk_khz = 400000 }, /* ClocksStatePerformance */ -{ .display_clk_khz = 600000, .pixel_clk_khz = 400000 } }; +{ .display_clk_khz = 625000, .pixel_clk_khz = 400000 } };int dentist_get_divider_from_did (int did) {
@@ -403,11 +403,9 @@ static void dce_update_clocks(struct clk_mgr *clk_mgr_base, {struct clk_mgr_internal *clk_mgr_dce =TO_CLK_MGR_INTERNAL (clk_mgr_base);struct dm_pp_power_level_change_request level_change_req; -int patched_disp_clk = context->bw_ctx.bw.dce.dispclk_khz; - -/*TODO: W/A for dal3 linux, investigate why this works */ -if (!clk_mgr_dce->dfs_bypass_active) - patched_disp_clk = patched_disp_clk *115 /100 ; +const int max_disp_clk = + clk_mgr_dce->max_clks_by_state[DM_PP_CLOCKS_STATE_PERFORMANCE ].display_clk_khz; +int patched_disp_clk =MIN (max_disp_clk, context->bw_ctx.bw.dce.dispclk_khz); level_change_req.power_level =dce_get_required_clocks_state (clk_mgr_base, context);/* get max clock state from PPLIB */
Signature · 1 line
2.53.0
Patch "drm/amd/display: Adjust DCE 8-10 clock, don't overclock by 15%" has been added to the 6.12-stable tree
This is a note to let you know that I've just added the patch titled
drm/amd/display: Adjust DCE 8-10 clock, don't overclock by 15%
to the 6.12-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-amd-display-adjust-dce-8-10-clock-don-t-overclock-by-15.patch
and it can be found in the queue-6.12 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
From [email protected] Wed Apr 1 02:45:17 2026
From: Rosen Penev <[email protected]>
Date: Tue, 31 Mar 2026 17:39:05 -0700
Subject: drm/amd/display: Adjust DCE 8-10 clock, don't overclock by 15%
To: [email protected]
Cc: "Alex Deucher" <[email protected]>, "Christian König" <[email protected]>, "Xinhui Pan" <[email protected]>, "David Airlie" <[email protected]>, "Simona Vetter" <[email protected]>, "Harry Wentland" <[email protected]>, "Leo Li" <[email protected]>, "Rodrigo Siqueira" <[email protected]>, "Ray Wu" <[email protected]>, "Wayne Lin" <[email protected]>, "Mario Limonciello" <[email protected]>, "Roman Li" <[email protected]>, "Eric Yang" <[email protected]>, "Tony Cheng" <[email protected]>, "Mauro Rossi" <[email protected]>, "Timur Kristóf" <[email protected]>, "Alex Hung" <[email protected]>, [email protected] (open list:RADEON and AMDGPU DRM DRIVERS), [email protected] (open list:DRM DRIVERS), [email protected] (open list)
Message-ID: <[email protected]>
From: Timur Kristóf <[email protected]>
[ Upstream commit 1ae45b5d4f371af8ae51a3827d0ec9fe27eeb867 ]
Adjust the nominal (and performance) clocks for DCE 8-10, and set them to 625 MHz, which is the value used by the legacy display code in amdgpu_atombios_get_clock_info.
This was tested with Hawaii, Tonga and Fiji. These GPUs can output 4K 60Hz (10-bit depth) at 625 MHz.
The extra 15% clock was added as a workaround for a Polaris issue which uses DCE 11, and should not have been used on DCE 8-10 which are already hardcoded to the highest possible display clock. Unfortunately, the extra 15% was mistakenly copied and kept even on code paths which don't affect Polaris.
This commit fixes that and also adds a check to make sure
not to exceed the maximum DCE 8-10 display clock.
--- drivers/gpu/drm/amd/display/dc/clk_mgr/dce100/dce_clk_mgr.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
drivers/gpu/drm/amd/display/dc/clk_mgr/dce100/dce_clk_mgr.c +5 -7
@@ -72,9 +72,9 @@ static const struct state_dependent_cloc/* ClocksStateLow */ { .display_clk_khz = 352000, .pixel_clk_khz = 330000}, /* ClocksStateNominal */ -{ .display_clk_khz = 600000, .pixel_clk_khz = 400000 }, +{ .display_clk_khz = 625000, .pixel_clk_khz = 400000 }, /* ClocksStatePerformance */ -{ .display_clk_khz = 600000, .pixel_clk_khz = 400000 } }; +{ .display_clk_khz = 625000, .pixel_clk_khz = 400000 } };int dentist_get_divider_from_did (int did) {
@@ -403,11 +403,9 @@ static void dce_update_clocks(struct clk {struct clk_mgr_internal *clk_mgr_dce =TO_CLK_MGR_INTERNAL (clk_mgr_base);struct dm_pp_power_level_change_request level_change_req; -int patched_disp_clk = context->bw_ctx.bw.dce.dispclk_khz; - -/*TODO: W/A for dal3 linux, investigate why this works */ -if (!clk_mgr_dce->dfs_bypass_active) - patched_disp_clk = patched_disp_clk *115 /100 ; +const int max_disp_clk = + clk_mgr_dce->max_clks_by_state[DM_PP_CLOCKS_STATE_PERFORMANCE ].display_clk_khz; +int patched_disp_clk =MIN (max_disp_clk, context->bw_ctx.bw.dce.dispclk_khz); level_change_req.power_level =dce_get_required_clocks_state (clk_mgr_base, context);/* get max clock state from PPLIB */
Patches currently in stable-queue which might be from [email protected] are
queue-6.12/drm-amd-amdgpu-decouple-aspm-with-pcie-dpm.patch queue-6.12/drm-amd-display-reject-modes-with-too-high-pixel-clock-on-dce6-10.patch queue-6.12/drm-amd-display-fix-dce-6.0-and-6.4-pll-programming.patch queue-6.12/drm-amd-display-disable-scaling-on-dce6-for-now.patch queue-6.12/drm-amd-display-disable-fastboot-on-dce-6-too.patch queue-6.12/drm-amd-display-correct-logic-check-error-for-fastboot.patch queue-6.12/drm-amd-amdgpu-disable-aspm-in-some-situations.patch queue-6.12/drm-amd-display-keep-pll0-running-on-dce-6.0-and-6.4.patch queue-6.12/drm-amd-display-adjust-dce-8-10-clock-don-t-overclock-by-15.patch queue-6.12/drm-amd-disable-aspm-on-si.patch
PATCH v2 8/10 drm/amd/display: Disable scaling on DCE6 for now
In reply to Rosen PenevFrom: Timur Kristóf <[email protected]>
[ Upstream commit 0e190a0446ec517666dab4691b296a9b758e590f ]
Scaling doesn't work on DCE6 at the moment, the current register programming produces incorrect output when using fractional scaling (between 100-200%) on resolutions higher than 1080p.
Disable it until we figure out how to program it properly.
--- drivers/gpu/drm/amd/display/dc/dce60/dce60_resource.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dc/dce60/dce60_resource.c +2 -2
@@ -404,13 +404,13 @@ static const struct dc_plane_cap plane_cap = { }, .max_upscale_factor = { - .argb8888 = 16000, + .argb8888 = 1, .nv12 = 1, .fp16 =1 }, .max_downscale_factor = { - .argb8888 = 250, + .argb8888 = 1, .nv12 = 1, .fp16 =1 }
Signature · 1 line
2.53.0
Patch "drm/amd/display: Disable scaling on DCE6 for now" has been added to the 6.12-stable tree
This is a note to let you know that I've just added the patch titled
drm/amd/display: Disable scaling on DCE6 for now
to the 6.12-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-amd-display-disable-scaling-on-dce6-for-now.patch
and it can be found in the queue-6.12 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
From [email protected] Wed Apr 1 02:45:16 2026
From: Rosen Penev <[email protected]>
Date: Tue, 31 Mar 2026 17:39:06 -0700
Subject: drm/amd/display: Disable scaling on DCE6 for now
To: [email protected]
Cc: "Alex Deucher" <[email protected]>, "Christian König" <[email protected]>, "Xinhui Pan" <[email protected]>, "David Airlie" <[email protected]>, "Simona Vetter" <[email protected]>, "Harry Wentland" <[email protected]>, "Leo Li" <[email protected]>, "Rodrigo Siqueira" <[email protected]>, "Ray Wu" <[email protected]>, "Wayne Lin" <[email protected]>, "Mario Limonciello" <[email protected]>, "Roman Li" <[email protected]>, "Eric Yang" <[email protected]>, "Tony Cheng" <[email protected]>, "Mauro Rossi" <[email protected]>, "Timur Kristóf" <[email protected]>, "Alex Hung" <[email protected]>, [email protected] (open list:RADEON and AMDGPU DRM DRIVERS), [email protected] (open list:DRM DRIVERS), [email protected] (open list)
Message-ID: <[email protected]>
From: Timur Kristóf <[email protected]>
[ Upstream commit 0e190a0446ec517666dab4691b296a9b758e590f ]
Scaling doesn't work on DCE6 at the moment, the current register programming produces incorrect output when using fractional scaling (between 100-200%) on resolutions higher than 1080p.
Disable it until we figure out how to program it properly.
--- drivers/gpu/drm/amd/display/dc/dce60/dce60_resource.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dc/dce60/dce60_resource.c +2 -2
@@ -404,13 +404,13 @@ static const struct dc_plane_cap plane_c }, .max_upscale_factor = { - .argb8888 = 16000, + .argb8888 = 1, .nv12 = 1, .fp16 =1 }, .max_downscale_factor = { - .argb8888 = 250, + .argb8888 = 1, .nv12 = 1, .fp16 =1 }
Patches currently in stable-queue which might be from [email protected] are
queue-6.12/drm-amd-amdgpu-decouple-aspm-with-pcie-dpm.patch queue-6.12/drm-amd-display-reject-modes-with-too-high-pixel-clock-on-dce6-10.patch queue-6.12/drm-amd-display-fix-dce-6.0-and-6.4-pll-programming.patch queue-6.12/drm-amd-display-disable-scaling-on-dce6-for-now.patch queue-6.12/drm-amd-display-disable-fastboot-on-dce-6-too.patch queue-6.12/drm-amd-display-correct-logic-check-error-for-fastboot.patch queue-6.12/drm-amd-amdgpu-disable-aspm-in-some-situations.patch queue-6.12/drm-amd-display-keep-pll0-running-on-dce-6.0-and-6.4.patch queue-6.12/drm-amd-display-adjust-dce-8-10-clock-don-t-overclock-by-15.patch queue-6.12/drm-amd-disable-aspm-on-si.patch
PATCH v2 9/10 drm/amd: Disable ASPM on SI
In reply to Rosen PenevFrom: Timur Kristóf <[email protected]>
[ Upstream commit 7bdd91abf0cb3ea78160e2e78fb58b12f6a38d55 ]
Enabling ASPM causes randoms hangs on Tahiti and Oland on Zen4. It's unclear if this is a platform-specific or GPU-specific issue. Disable ASPM on SI for the time being.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +7 -0
@@ -1761,6 +1761,13 @@ static bool amdgpu_device_pcie_dynamic_switching_supported(struct amdgpu_devicestatic bool amdgpu_device_aspm_support_quirk (struct amdgpu_device *adev) { +/* Enabling ASPM causes randoms hangs on Tahiti and Oland on Zen4. +* It's unclear if this is a platform-specific or GPU-specific issue. +* Disable ASPM on SI for the time being. +*/ +if (adev->family ==AMDGPU_FAMILY_SI ) +return true; +#if IS_ENABLED (CONFIG_X86 )struct cpuinfo_x86 *c = &cpu_data (0 );
Signature · 1 line
2.53.0
Patch "drm/amd: Disable ASPM on SI" has been added to the 6.12-stable tree
This is a note to let you know that I've just added the patch titled
drm/amd: Disable ASPM on SI
to the 6.12-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-amd-disable-aspm-on-si.patch
and it can be found in the queue-6.12 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
From [email protected] Wed Apr 1 02:40:16 2026
From: Rosen Penev <[email protected]>
Date: Tue, 31 Mar 2026 17:39:07 -0700
Subject: drm/amd: Disable ASPM on SI
To: [email protected]
Cc: "Alex Deucher" <[email protected]>, "Christian König" <[email protected]>, "Xinhui Pan" <[email protected]>, "David Airlie" <[email protected]>, "Simona Vetter" <[email protected]>, "Harry Wentland" <[email protected]>, "Leo Li" <[email protected]>, "Rodrigo Siqueira" <[email protected]>, "Ray Wu" <[email protected]>, "Wayne Lin" <[email protected]>, "Mario Limonciello" <[email protected]>, "Roman Li" <[email protected]>, "Eric Yang" <[email protected]>, "Tony Cheng" <[email protected]>, "Mauro Rossi" <[email protected]>, "Timur Kristóf" <[email protected]>, "Alex Hung" <[email protected]>, [email protected] (open list:RADEON and AMDGPU DRM DRIVERS), [email protected] (open list:DRM DRIVERS), [email protected] (open list)
Message-ID: <[email protected]>
From: Timur Kristóf <[email protected]>
[ Upstream commit 7bdd91abf0cb3ea78160e2e78fb58b12f6a38d55 ]
Enabling ASPM causes randoms hangs on Tahiti and Oland on Zen4. It's unclear if this is a platform-specific or GPU-specific issue. Disable ASPM on SI for the time being.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +7 -0
@@ -1761,6 +1761,13 @@ static bool amdgpu_device_pcie_dynamic_sstatic bool amdgpu_device_aspm_support_quirk (struct amdgpu_device *adev) { +/* Enabling ASPM causes randoms hangs on Tahiti and Oland on Zen4. +* It's unclear if this is a platform-specific or GPU-specific issue. +* Disable ASPM on SI for the time being. +*/ +if (adev->family ==AMDGPU_FAMILY_SI ) +return true; +#if IS_ENABLED (CONFIG_X86 )struct cpuinfo_x86 *c = &cpu_data (0 );
Patches currently in stable-queue which might be from [email protected] are
queue-6.12/drm-amd-amdgpu-decouple-aspm-with-pcie-dpm.patch queue-6.12/drm-amd-display-reject-modes-with-too-high-pixel-clock-on-dce6-10.patch queue-6.12/drm-amd-display-fix-dce-6.0-and-6.4-pll-programming.patch queue-6.12/drm-amd-display-disable-scaling-on-dce6-for-now.patch queue-6.12/drm-amd-display-disable-fastboot-on-dce-6-too.patch queue-6.12/drm-amd-display-correct-logic-check-error-for-fastboot.patch queue-6.12/drm-amd-amdgpu-disable-aspm-in-some-situations.patch queue-6.12/drm-amd-display-keep-pll0-running-on-dce-6.0-and-6.4.patch queue-6.12/drm-amd-display-adjust-dce-8-10-clock-don-t-overclock-by-15.patch queue-6.12/drm-amd-disable-aspm-on-si.patch
PATCH v2 10/10 drm/amd/display: Correct logic check error for fastboot
In reply to Rosen PenevFrom: Charlene Liu <[email protected]>
[ Upstream commit b6a65009e7ce3f0cc72da18f186adb60717b51a0 ]
[Why]
Fix fastboot broken in driver.
This is caused by an open source backport change 7495962c.
from the comment, the intended check is to disable fastboot for pre-DCN10. but the logic check is reversed, and causes fastboot to be disabled on all DCN10 and after.
fastboot is for driver trying to pick up bios used hw setting and bypass reprogramming the hw if dc_validate_boot_timing() condition meets.
--- drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +2 -2
@@ -1910,8 +1910,8 @@ void dce110_enable_accelerated_mode(struct dc *dc, struct dc_state *context)get_edp_streams (context, edp_streams, &edp_stream_num); -/* Check fastboot support, disable on DCE 6-8 because of blank screens */ -if (edp_num && edp_stream_num && dc->ctx->dce_version <DCE_VERSION_10_0 ) { +/* Check fastboot support, disable on DCE 6-8-10 because of blank screens */ +if (edp_num && edp_stream_num && dc->ctx->dce_version >DCE_VERSION_10_0 ) {for (i =0 ; i < edp_num; i++) { edp_link = edp_links[i];if (edp_link != edp_streams[0 ]->link)
Signature · 1 line
2.53.0
Patch "drm/amd/display: Correct logic check error for fastboot" has been added to the 6.12-stable tree
This is a note to let you know that I've just added the patch titled
drm/amd/display: Correct logic check error for fastboot
to the 6.12-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-amd-display-correct-logic-check-error-for-fastboot.patch
and it can be found in the queue-6.12 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
From [email protected] Wed Apr 1 02:45:51 2026
From: Rosen Penev <[email protected]>
Date: Tue, 31 Mar 2026 17:39:08 -0700
Subject: drm/amd/display: Correct logic check error for fastboot
To: [email protected]
Cc: "Alex Deucher" <[email protected]>, "Christian König" <[email protected]>, "Xinhui Pan" <[email protected]>, "David Airlie" <[email protected]>, "Simona Vetter" <[email protected]>, "Harry Wentland" <[email protected]>, "Leo Li" <[email protected]>, "Rodrigo Siqueira" <[email protected]>, "Ray Wu" <[email protected]>, "Wayne Lin" <[email protected]>, "Mario Limonciello" <[email protected]>, "Roman Li" <[email protected]>, "Eric Yang" <[email protected]>, "Tony Cheng" <[email protected]>, "Mauro Rossi" <[email protected]>, "Timur Kristóf" <[email protected]>, "Alex Hung" <[email protected]>, [email protected] (open list:RADEON and AMDGPU DRM DRIVERS), [email protected] (open list:DRM DRIVERS), [email protected] (open list)
Message-ID: <[email protected]>
From: Charlene Liu <[email protected]>
[ Upstream commit b6a65009e7ce3f0cc72da18f186adb60717b51a0 ]
[Why]
Fix fastboot broken in driver.
This is caused by an open source backport change 7495962c.
from the comment, the intended check is to disable fastboot for pre-DCN10. but the logic check is reversed, and causes fastboot to be disabled on all DCN10 and after.
fastboot is for driver trying to pick up bios used hw setting and bypass reprogramming the hw if dc_validate_boot_timing() condition meets.
--- drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +2 -2
@@ -1910,8 +1910,8 @@ void dce110_enable_accelerated_mode(struget_edp_streams (context, edp_streams, &edp_stream_num); -/* Check fastboot support, disable on DCE 6-8 because of blank screens */ -if (edp_num && edp_stream_num && dc->ctx->dce_version <DCE_VERSION_10_0 ) { +/* Check fastboot support, disable on DCE 6-8-10 because of blank screens */ +if (edp_num && edp_stream_num && dc->ctx->dce_version >DCE_VERSION_10_0 ) {for (i =0 ; i < edp_num; i++) { edp_link = edp_links[i];if (edp_link != edp_streams[0 ]->link)
Patches currently in stable-queue which might be from [email protected] are
queue-6.12/drm-amd-amdgpu-decouple-aspm-with-pcie-dpm.patch queue-6.12/drm-amd-display-reject-modes-with-too-high-pixel-clock-on-dce6-10.patch queue-6.12/drm-amd-display-fix-dce-6.0-and-6.4-pll-programming.patch queue-6.12/drm-amd-display-disable-scaling-on-dce6-for-now.patch queue-6.12/drm-amd-display-disable-fastboot-on-dce-6-too.patch queue-6.12/drm-amd-display-correct-logic-check-error-for-fastboot.patch queue-6.12/drm-amd-amdgpu-disable-aspm-in-some-situations.patch queue-6.12/drm-amd-display-keep-pll0-running-on-dce-6.0-and-6.4.patch queue-6.12/drm-amd-display-adjust-dce-8-10-clock-don-t-overclock-by-15.patch queue-6.12/drm-amd-disable-aspm-on-si.patch