tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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: 6a681cd90345 ("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>

authored by

Ivan Lipski and committed by
Alex Deucher 17b2c526 e6048510

+6 -4
+6 -4
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
··· 7768 7768 drm_dp_mst_topology_mgr_destroy(&aconnector->mst_mgr); 7769 7769 7770 7770 /* Cancel and flush any pending HDMI HPD debounce work */ 7771 - cancel_delayed_work_sync(&aconnector->hdmi_hpd_debounce_work); 7772 - if (aconnector->hdmi_prev_sink) { 7773 - dc_sink_release(aconnector->hdmi_prev_sink); 7774 - aconnector->hdmi_prev_sink = NULL; 7771 + if (aconnector->hdmi_hpd_debounce_delay_ms) { 7772 + cancel_delayed_work_sync(&aconnector->hdmi_hpd_debounce_work); 7773 + if (aconnector->hdmi_prev_sink) { 7774 + dc_sink_release(aconnector->hdmi_prev_sink); 7775 + aconnector->hdmi_prev_sink = NULL; 7776 + } 7775 7777 } 7776 7778 7777 7779 if (aconnector->bl_idx != -1) {