Skip to content

Commit acecfee

Browse files
Ivan Lipskialexdeucher
authored andcommitted
drm/amd/display: Clear HDMI HPD pending work only if it is enabled
[Why&How] On amdgpu_dm_connector_destroy(), the driver attempts to cancel pending HDMI HPD work without checking if the HDMI HPD is enabled. Added a check that it is enabled before clearing it. Fixes: 6a681cd ("drm/amd/display: Add an hdmi_hpd_debounce_delay_ms module") Signed-off-by: Ivan Lipski <ivan.lipski@amd.com> Reviewed-by: Mario Limonciello (AMD) <superm1@kernel.org> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> (cherry picked from commit 17b2c52)
1 parent ee8d07c commit acecfee

1 file changed

Lines changed: 6 additions & 4 deletions

File tree

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7754,10 +7754,12 @@ static void amdgpu_dm_connector_destroy(struct drm_connector *connector)
77547754
drm_dp_mst_topology_mgr_destroy(&aconnector->mst_mgr);
77557755

77567756
/* Cancel and flush any pending HDMI HPD debounce work */
7757-
cancel_delayed_work_sync(&aconnector->hdmi_hpd_debounce_work);
7758-
if (aconnector->hdmi_prev_sink) {
7759-
dc_sink_release(aconnector->hdmi_prev_sink);
7760-
aconnector->hdmi_prev_sink = NULL;
7757+
if (aconnector->hdmi_hpd_debounce_delay_ms) {
7758+
cancel_delayed_work_sync(&aconnector->hdmi_hpd_debounce_work);
7759+
if (aconnector->hdmi_prev_sink) {
7760+
dc_sink_release(aconnector->hdmi_prev_sink);
7761+
aconnector->hdmi_prev_sink = NULL;
7762+
}
77617763
}
77627764

77637765
if (aconnector->bl_idx != -1) {

0 commit comments

Comments
 (0)