From: Ivan Lipski <[email protected]>

[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: d98e9c0497ae ("drm/amd/display: Add an hdmi_hpd_debounce_delay_ms 
module")

Signed-off-by: Ivan Lipski <[email protected]>
---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c 
b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 655c9fcb078a..cba7546d3f95 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -7743,10 +7743,12 @@ static void amdgpu_dm_connector_destroy(struct 
drm_connector *connector)
                drm_dp_mst_topology_mgr_destroy(&aconnector->mst_mgr);
 
        /* Cancel and flush any pending HDMI HPD debounce work */
-       cancel_delayed_work_sync(&aconnector->hdmi_hpd_debounce_work);
-       if (aconnector->hdmi_prev_sink) {
-               dc_sink_release(aconnector->hdmi_prev_sink);
-               aconnector->hdmi_prev_sink = NULL;
+       if (aconnector->hdmi_hpd_debounce_delay_ms) {
+               cancel_delayed_work_sync(&aconnector->hdmi_hpd_debounce_work);
+               if (aconnector->hdmi_prev_sink) {
+                       dc_sink_release(aconnector->hdmi_prev_sink);
+                       aconnector->hdmi_prev_sink = NULL;
+               }
        }
 
        if (aconnector->bl_idx != -1) {
-- 
2.43.0

Reply via email to