drm/amd/display: Fix HPD consideration for VGA/LVDS connectors on DCE
Subsystems (3)
PATCH 1/2 drm/amd/display: Fix HPD consideration for VGA/LVDS connectors on DCE
After a refactor that landed in Linux 7.0, DC now crashes when it is initialized on GPUs that have a VGA or LVDS connector. This is because these connectors have no HPD so the hpd_gpio is NULL and therefore DC takes the code path meant for DCN 4.2+ which sets irq_source_hpd = 255 that causes the subsequent code to try to register the HPD interrupt, which fails, and causes
a crash.
This commit should be backported to Linux 7.0 and newer.
--- drivers/gpu/drm/amd/display/dc/link/link_factory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/link/link_factory.c +1 -1
@@ -643,7 +643,7 @@ static bool construct_phy(struct dc_link *link,DC_LOG_DC ("BIOS object table - hpd_gpio id: %d" , enc_init_data.hpd_gpio->id);DC_LOG_DC ("BIOS object table - hpd_gpio en: %d" , enc_init_data.hpd_gpio->en); - }else { + }else if (link->ctx->dce_version >DCN_VERSION_4_01 ) {struct graphics_object_hpd_info hpd_info;if (link->ctx->dc_bios->funcs->get_hpd_info (link->ctx->dc_bios, link->link_id, &hpd_info) ==BP_RESULT_OK ) {
Signature · 1 line
2.55.0
PATCH 2/2 drm/amd/display: Log details when failing to register HPD IRQ
This should help diagnose HPD IRQ related issues in the future.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c +6 -2
@@ -1735,7 +1735,9 @@ int amdgpu_dm_register_hpd_handlers(struct amdgpu_device *adev)if (int_params.irq_source ==DC_IRQ_SOURCE_INVALID || int_params.irq_source <DC_IRQ_SOURCE_HPD1 || int_params.irq_source >DC_IRQ_SOURCE_HPD6 ) { -drm_err (adev_to_drm (adev),"Failed to register hpd irq!\n" ); +drm_err (adev_to_drm (adev), +"Failed to register hpd irq %u for %s!\n" , + int_params.irq_source, connector->name);return -EINVAL ; }
@@ -1753,7 +1755,9 @@ int amdgpu_dm_register_hpd_handlers(struct amdgpu_device *adev)if (int_params.irq_source ==DC_IRQ_SOURCE_INVALID || int_params.irq_source <DC_IRQ_SOURCE_HPD1RX || int_params.irq_source >DC_IRQ_SOURCE_HPD6RX ) { -drm_err (adev_to_drm (adev),"Failed to register hpd rx irq!\n" ); +drm_err (adev_to_drm (adev), +"Failed to register hpd rx irq %u for %s!\n" , + int_params.irq_source, connector->name);return -EINVAL ; }
Signature · 1 line
2.55.0
Re: [PATCH 2/2] drm/amd/display: Log details when failing to register HPD IRQ
Quoted 3 lines · Timur Kristóf
This should help diagnose HPD IRQ related issues in the future.
Signed-off-by Timur Kristóf <[email protected]>
I'll get this committed to amd-staging-drm-next.
Quoted 30 lines
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c +6
-2@@ -1735,7 +1735,9 @@ int amdgpu_dm_register_hpd_handlers(struct amdgpu_device *adev)if (int_params.irq_source ==DC_IRQ_SOURCE_INVALID || int_params.irq_source <DC_IRQ_SOURCE_HPD1 || int_params.irq_source >DC_IRQ_SOURCE_HPD6 ) { -drm_err (adev_to_drm (adev),"Failed to register hpd irq!\n" ); +drm_err (adev_to_drm (adev), +"Failed to register hpd irq %u for %s!\n" , + int_params.irq_source, connector->name);return -EINVAL ; }@@ -1753,7 +1755,9 @@ int amdgpu_dm_register_hpd_handlers(struct amdgpu_device *adev)if (int_params.irq_source ==DC_IRQ_SOURCE_INVALID || int_params.irq_source <DC_IRQ_SOURCE_HPD1RX || int_params.irq_source >DC_IRQ_SOURCE_HPD6RX ) { -drm_err (adev_to_drm (adev),"Failed to register hpd rx irq!\n" ); +drm_err (adev_to_drm (adev), +"Failed to register hpd rx irq %u for %s!\n" , + int_params.irq_source, connector->name);return -EINVAL ; }
Quoted 11 lines · Timur Kristóf
After a refactor that landed in Linux 7.0, DC now crashes when it is initialized on GPUs that have a VGA or LVDS connector. This is because these connectors have no HPD so the
hpd_gpiois NULL and therefore DC takes the code path meant for DCN 4.2+ which setsirq_source_hpd= 255 that causes the subsequent code to try to register the HPD interrupt, which fails, and causes
a crash.This commit should be backported to Linux 7.0 and newer.
Unfortunately 7.0.y is EoL. But we'll get it in 7.1.y and later.
Quoted 6 lines
Cc Dmytro Laktyushkin <[email protected]>Cc Roman Li <[email protected]>Fixes def3488eb0fd ("drm/amd/display: refactor HPD to increase flexibility")Signed-off-by Timur Kristóf <[email protected]>
I'll get this committed to amd-staging-drm-next.
Quoted 17 lines
--- drivers/gpu/drm/amd/display/dc/link/link_factory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/amd/display/dc/link/link_factory.c +1
-1@@ -643,7 +643,7 @@ static bool construct_phy(struct dc_link *link,DC_LOG_DC ("BIOS object table - hpd_gpio id: %d" , enc_init_data.hpd_gpio->id);DC_LOG_DC ("BIOS object table - hpd_gpio en: %d" , enc_init_data.hpd_gpio->en); - }else { + }else if (link->ctx->dce_version >DCN_VERSION_4_01 ) {struct graphics_object_hpd_info hpd_info;if (link->ctx->dc_bios->funcs->get_hpd_info (link->ctx->dc_bios, link->link_id, &hpd_info) ==BP_RESULT_OK ) {