Commit 2ebbe7c9 authored by Bhawanpreet Lakha's avatar Bhawanpreet Lakha Committed by Alex Deucher
Browse files

drm/amd/display: Correctly cancel future watchdog and callback events 



[Why]
-We need to cancel future callbacks/watchdogs events when a callback/watchdog event happens

[How]
-fix typo in event_callback()
	-cancel callback, not watchdog
-cancel watchdog events in event_watchdog_timer().

Signed-off-by: default avatarBhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
Reviewed-by: default avatarNicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent c2850c12

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

+3 −1
Original line number Diff line number Diff line
@@ -266,7 +266,7 @@ static void event_callback(struct work_struct *work) 


	mutex_lock(&hdcp_work->mutex);



	cancel_delayed_work(&hdcp_work->watchdog_timer_dwork);

	cancel_delayed_work(&hdcp_work->callback_dwork);



	mod_hdcp_process_event(&hdcp_work->hdcp, MOD_HDCP_EVENT_CALLBACK,

			       &hdcp_work->output);
@@ -347,6 +347,8 @@ static void event_watchdog_timer(struct work_struct *work) 


	mutex_lock(&hdcp_work->mutex);



	cancel_delayed_work(&hdcp_work->watchdog_timer_dwork);



	mod_hdcp_process_event(&hdcp_work->hdcp,

			       MOD_HDCP_EVENT_WATCHDOG_TIMEOUT,

			       &hdcp_work->output);

CRA Git | Maintained and supported by SUSTech CRA and CCSE