drm/amd/display: Only poll analog connectors
Subsystems (3)
PATCH 1/1 drm/amd/display: Only poll analog connectors
Analog connectors may be hot-plugged unlike other connector types that don't support HPD.
Stop DRM from polling other connector types that don't support HPD, such as eDP, LVDS, etc. These were wrongly polled when analog connector support was added, causing issues with the seamless boot process.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c +8 -2
@@ -915,13 +915,19 @@ void amdgpu_dm_hpd_init(struct amdgpu_device *adev)struct amdgpu_dm_connector *amdgpu_dm_connector;const struct dc_link *dc_link; - use_polling |= connector->polled !=DRM_CONNECTOR_POLL_HPD ; -if (connector->connector_type ==DRM_MODE_CONNECTOR_WRITEBACK )continue ; amdgpu_dm_connector =to_amdgpu_dm_connector (connector); +/* +* Analog connectors may be hot-plugged unlike other connector +* types that don't support HPD. Only poll analog connectors. +*/ + use_polling |= + amdgpu_dm_connector->dc_link && +dc_connector_supports_analog (amdgpu_dm_connector->dc_link->link_id.id); + dc_link = amdgpu_dm_connector->dc_link;/*
Signature · 1 line
2.52.0
Quoted 11 lines · Timur Kristóf
Analog connectors may be hot-plugged unlike other connector types that don't support HPD.
Stop DRM from polling other connector types that don't support HPD, such as eDP, LVDS, etc. These were wrongly polled when analog connector support was added, causing issues with the seamless boot process.
Fixes c4f3f114e73c ("drm/amd/display: Poll analog connectors (v3)")Signed-off-by Timur Kristóf <[email protected]>Reported-by Matthew Schwartz <[email protected]>
Quoted 30 lines
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c +8
-2@@ -915,13 +915,19 @@ void amdgpu_dm_hpd_init(struct amdgpu_device *adev)struct amdgpu_dm_connector *amdgpu_dm_connector;const struct dc_link *dc_link; - use_polling |= connector->polled !=DRM_CONNECTOR_POLL_HPD ; -if (connector->connector_type ==DRM_MODE_CONNECTOR_WRITEBACK )continue ; amdgpu_dm_connector =to_amdgpu_dm_connector (connector); +/* +* Analog connectors may be hot-plugged unlike other connector +* types that don't support HPD. Only poll analog connectors. +*/ + use_polling |= + amdgpu_dm_connector->dc_link && +dc_connector_supports_analog (amdgpu_dm_connector->dc_link->link_id.id); + dc_link = amdgpu_dm_connector->dc_link;/*
Harry Wentland
maintainerQuoted 27 lines · Timur Kristóf
Analog connectors may be hot-plugged unlike other connector types that don't support HPD.
Stop DRM from polling other connector types that don't support HPD, such as eDP, LVDS, etc. These were wrongly polled when analog connector support was added, causing issues with the seamless boot process.
Fixes c4f3f114e73c ("drm/amd/display: Poll analog connectors (v3)")Signed-off-by Timur Kristóf <[email protected]>Reported-by Matthew Schwartz <[email protected]>--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c +0
-2@@ -915,13 +915,19 @@ void amdgpu_dm_hpd_init(struct amdgpu_device *adev)struct amdgpu_dm_connector *amdgpu_dm_connector;const struct dc_link *dc_link; - use_polling |= connector->polled !=DRM_CONNECTOR_POLL_HPD ; -if (connector->connector_type ==DRM_MODE_CONNECTOR_WRITEBACK )continue ;
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c void amdgpu_dm_hpd_init(struct amdgpu_device *adev) · line 929
Quoted 10 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c +7
-0amdgpu_dm_connector =to_amdgpu_dm_connector (connector); +/* +* Analog connectors may be hot-plugged unlike other connector +* types that don't support HPD. Only poll analog connectors. +*/ + use_polling |= + amdgpu_dm_connector->dc_link && +dc_connector_supports_analog (amdgpu_dm_connector->dc_link->link_id.id);
Why isn't the aconnector->base.polled assignment in amdgpu_dm_connector_init_helper doing the trick?
Harry
Quoted 4 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c +1
-0+ dc_link = amdgpu_dm_connector->dc_link;/*
Quoted 24 lines · Central European Standard Time Harry Wentland
Quoted 23 lines · Timur Kristóf
Analog connectors may be hot-plugged unlike other connector types that don't support HPD.
Stop DRM from polling other connector types that don't support HPD, such as eDP, LVDS, etc. These were wrongly polled when analog connector support was added, causing issues with the seamless boot process.
Fixes c4f3f114e73c ("drm/amd/display: Poll analog connectors (v3)")Signed-off-by Timur Kristóf <[email protected]>Reported-by Matthew Schwartz <[email protected]>---
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)(quoted diff) +0
-0
b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.cindex0a2a3f233a0e..e7b0928bd3db100644drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c +0
-0@@ -915,13 +915,19 @@ void amdgpu_dm_hpd_init(struct amdgpu_device *adev)
Quoted 4 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c void amdgpu_dm_hpd_init(struct amdgpu_device *adev)
Quoted 4 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c +0
-1struct amdgpu_dm_connector *amdgpu_dm_connector;const struct dc_link *dc_link; - use_polling |= connector->polled !=
DRM_CONNECTOR_POLL_HPD;
Quoted 3 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c void amdgpu_dm_hpd_init(struct amdgpu_device *adev)
Quoted 3 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c +0
-1- if (connector->connector_type ==
DRM_MODE_CONNECTOR_WRITEBACK)
Quoted 4 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c void amdgpu_dm_hpd_init(struct amdgpu_device *adev)
Quoted 4 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c +0
-0continue ; amdgpu_dm_connector =
to_amdgpu_dm_connector(connector);
Quoted 3 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c void amdgpu_dm_hpd_init(struct amdgpu_device *adev) · line 925
Quoted 3 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c +2
-0+/* +* Analog connectors may be hot-plugged unlike other
connector
Quoted 1 line
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c void amdgpu_dm_hpd_init(struct amdgpu_device *adev) · line 926
Quoted 1 line
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c +1
-0+* types that don't support HPD. Only poll analog
connectors.
Quoted 4 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c void amdgpu_dm_hpd_init(struct amdgpu_device *adev) · line 930
Quoted 4 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c +4
-0+*/ + use_polling |= + amdgpu_dm_connector->dc_link && +
dc_connector_supports_analog(amdgpu_dm_connector->dc_link->link_id.id)
Quoted 6 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c void amdgpu_dm_hpd_init(struct amdgpu_device *adev) · line 931
Quoted 1 line
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c +0
-0;Why isn't the
aconnector->base.polledassignment inamdgpu_dm_connector_init_helperdoing the trick?Harry
Hi Harry,
The issue is that checking "connector->polled != DRM_CONNECTOR_POLL_HPD" will also match connectors that don't support hotplugging, such as eDP, LVDS etc.
amdgpu_dm_connector_init_helper is working correctly, it doesn't set the DRM_CONNECTOR_POLL_HPD flag for neither analog connectors, nor eDP, LVDS, etc. which is correct. The problem is with this check in amdgpu_dm_hpd_init.
Best regards,
Timur
Quoted 6 lines
Quoted 6 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c +1
-0+drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c +0
-0dc_link = amdgpu_dm_connector->dc_link;/*
Quoted 58 lines · Timur Kristóf
Quoted 24 lines · Central European Standard Time Harry Wentland
Quoted 23 lines · Timur Kristóf
Analog connectors may be hot-plugged unlike other connector types that don't support HPD.
Stop DRM from polling other connector types that don't support HPD, such as eDP, LVDS, etc. These were wrongly polled when analog connector support was added, causing issues with the seamless boot process.
Fixes c4f3f114e73c ("drm/amd/display: Poll analog connectors (v3)")Signed-off-by Timur Kristóf <[email protected]>Reported-by Matthew Schwartz <[email protected]>---
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)(quoted diff) +0
-0
b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.cindex0a2a3f233a0e..e7b0928bd3db100644drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c +0
-0@@ -915,13 +915,19 @@ void amdgpu_dm_hpd_init(struct amdgpu_device *adev)Quoted 4 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c void amdgpu_dm_hpd_init(struct amdgpu_device *adev)
Quoted 4 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c +0
-1struct amdgpu_dm_connector *amdgpu_dm_connector;const struct dc_link *dc_link; - use_polling |= connector->polled !=
DRM_CONNECTOR_POLL_HPD;Quoted 3 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c void amdgpu_dm_hpd_init(struct amdgpu_device *adev)
Quoted 3 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c +0
-1- if (connector->connector_type ==
DRM_MODE_CONNECTOR_WRITEBACK)Quoted 4 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c void amdgpu_dm_hpd_init(struct amdgpu_device *adev)
Quoted 4 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c +0
-0continue ; amdgpu_dm_connector =
to_amdgpu_dm_connector(connector);Quoted 3 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c void amdgpu_dm_hpd_init(struct amdgpu_device *adev) · line 925
Quoted 3 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c +2
-0+/* +* Analog connectors may be hot-plugged unlike other connector
Quoted 1 line
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c void amdgpu_dm_hpd_init(struct amdgpu_device *adev) · line 926
Quoted 1 line
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c +1
-0+* types that don't support HPD. Only poll analog connectors.
Quoted 4 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c void amdgpu_dm_hpd_init(struct amdgpu_device *adev) · line 930
Quoted 4 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c +4
-0+*/ + use_polling |= + amdgpu_dm_connector->dc_link && +
dc_connector_supports_analog(amdgpu_dm_connector->dc_link->link_id.id)Quoted 6 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c void amdgpu_dm_hpd_init(struct amdgpu_device *adev) · line 931
Quoted 1 line
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c +0
-0;Why isn't the
aconnector->base.polledassignment inamdgpu_dm_connector_init_helperdoing the trick?Harry
Quoted 9 lines
Hi Harry,
The issue is that checking "
connector->polled!=DRM_CONNECTOR_POLL_HPD" will also match connectors that don't support hotplugging, such as eDP, LVDS etc.
amdgpu_dm_connector_init_helperis working correctly, it doesn't set theDRM_CONNECTOR_POLL_HPDflag for neither analog connectors, nor eDP, LVDS, etc. which is correct. The problem is with this check inamdgpu_dm_hpd_init.
Ah, you're right.
Harry
Quoted 13 lines
Best regards,
TimurQuoted 6 lines
Quoted 6 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c +1
-0+drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c +0
-0dc_link = amdgpu_dm_connector->dc_link;/*
Mario Limonciello
AppliedQuoted 71 lines · Harry Wentland
Quoted 58 lines · Timur Kristóf
Quoted 24 lines · Central European Standard Time Harry Wentland
Quoted 23 lines · Timur Kristóf
Analog connectors may be hot-plugged unlike other connector types that don't support HPD.
Stop DRM from polling other connector types that don't support HPD, such as eDP, LVDS, etc. These were wrongly polled when analog connector support was added, causing issues with the seamless boot process.
Fixes c4f3f114e73c ("drm/amd/display: Poll analog connectors (v3)")Signed-off-by Timur Kristóf <[email protected]>Reported-by Matthew Schwartz <[email protected]>---
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)(quoted diff) +0
-0
b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.cindex0a2a3f233a0e..e7b0928bd3db100644drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c +0
-0@@ -915,13 +915,19 @@ void amdgpu_dm_hpd_init(struct amdgpu_device *adev)Quoted 4 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c void amdgpu_dm_hpd_init(struct amdgpu_device *adev)
Quoted 4 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c +0
-1struct amdgpu_dm_connector *amdgpu_dm_connector;const struct dc_link *dc_link; - use_polling |= connector->polled !=
DRM_CONNECTOR_POLL_HPD;Quoted 3 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c void amdgpu_dm_hpd_init(struct amdgpu_device *adev)
Quoted 3 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c +0
-1- if (connector->connector_type ==
DRM_MODE_CONNECTOR_WRITEBACK)Quoted 4 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c void amdgpu_dm_hpd_init(struct amdgpu_device *adev)
Quoted 4 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c +0
-0continue ; amdgpu_dm_connector =
to_amdgpu_dm_connector(connector);Quoted 3 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c void amdgpu_dm_hpd_init(struct amdgpu_device *adev) · line 925
Quoted 3 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c +2
-0+/* +* Analog connectors may be hot-plugged unlike other connector
Quoted 1 line
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c void amdgpu_dm_hpd_init(struct amdgpu_device *adev) · line 926
Quoted 1 line
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c +1
-0+* types that don't support HPD. Only poll analog connectors.
Quoted 4 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c void amdgpu_dm_hpd_init(struct amdgpu_device *adev) · line 930
Quoted 4 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c +4
-0+*/ + use_polling |= + amdgpu_dm_connector->dc_link && +
dc_connector_supports_analog(amdgpu_dm_connector->dc_link->link_id.id)Quoted 6 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c void amdgpu_dm_hpd_init(struct amdgpu_device *adev) · line 931
Quoted 1 line
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c +0
-0;Why isn't the
aconnector->base.polledassignment inamdgpu_dm_connector_init_helperdoing the trick?Harry
Quoted 9 lines
Hi Harry,
The issue is that checking "
connector->polled!=DRM_CONNECTOR_POLL_HPD" will also match connectors that don't support hotplugging, such as eDP, LVDS etc.
amdgpu_dm_connector_init_helperis working correctly, it doesn't set theDRM_CONNECTOR_POLL_HPDflag for neither analog connectors, nor eDP, LVDS, etc. which is correct. The problem is with this check inamdgpu_dm_hpd_init.
Quoted 6 lines
Ah, you're right.
Reviewed-by Harry Wentland <[email protected]>Harry
applied to amd-staging-drm-next.
Quoted 14 lines
Quoted 13 lines
Best regards,
TimurQuoted 6 lines
Quoted 6 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c +1
-0+dc_link = amdgpu_dm_connector->dc_link;/*