Commit 544dcd74 authored by Luben Tuikov's avatar Luben Tuikov Committed by Alex Deucher
Browse files

drm/amd/pm: Fix a bug in semaphore double-lock 



Fix a bug in smu_cmn_send_msg_without_waiting() in
that this function does not need to take the
smu->message_lock mutex in order to send a message
down to the SMU. The mutex is acquired by the
caller of this function instead.

Cc: Alex Deucher <Alexander.Deucher@amd.com>
Cc: Changfeng Zhu <Changfeng.Zhu@amd.com>
Cc: Huang Rui <ray.huang@amd.com>
Fixes: 5810323b ("drm/amd/pm: Fix a bug communicating with the SMU (v5)")
Signed-off-by: default avatarLuben Tuikov <luben.tuikov@amd.com>
Reviewed-by: default avatarAlex Deucher <Alexander.Deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent b8e42844

drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c

+0 −2
Original line number Diff line number Diff line
@@ -259,7 +259,6 @@ int smu_cmn_send_msg_without_waiting(struct smu_context *smu, 
	if (smu->adev->no_hw_access)

		return 0;



	mutex_lock(&smu->message_lock);

	reg = __smu_cmn_poll_stat(smu);

	res = __smu_cmn_reg2errno(smu, reg);

	if (reg == SMU_RESP_NONE ||
@@ -269,7 +268,6 @@ int smu_cmn_send_msg_without_waiting(struct smu_context *smu, 
	__smu_cmn_send_msg(smu, msg_index, param);

	res = 0;

Out:

	mutex_unlock(&smu->message_lock);

	return res;

}