Commit fa4a8820 authored by Alex Jivin's avatar Alex Jivin Committed by Alex Deucher
Browse files

drm/amdgpu: Move the mutex lock/unlock out 



Move the mutext lock/unlock outside of the if(),
as the mutex is always taken: either in the if()
branch or in the else branch.

Signed-off-by: default avatarAlex Jivin <alex.jivin@amd.com>
Suggested-By: default avatarLuben Tukov <luben.tuikov@amd.com>
Reviewed-by: default avatarLuben Tuikov <luben.tuikov@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 74772649

drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c

+4 −8
Original line number Diff line number Diff line
@@ -3559,16 +3559,14 @@ void amdgpu_dpm_enable_uvd(struct amdgpu_device *adev, bool enable) 
	int ret = 0;



	if (adev->family == AMDGPU_FAMILY_SI) {

		if (enable) {

		mutex_lock(&adev->pm.mutex);

		if (enable) {

			adev->pm.dpm.uvd_active = true;

			adev->pm.dpm.state = POWER_STATE_TYPE_INTERNAL_UVD;

			mutex_unlock(&adev->pm.mutex);

		} else {

			mutex_lock(&adev->pm.mutex);

			adev->pm.dpm.uvd_active = false;

			mutex_unlock(&adev->pm.mutex);

		}

		mutex_unlock(&adev->pm.mutex);



		amdgpu_pm_compute_clocks(adev);

	} else {
@@ -3596,17 +3594,15 @@ void amdgpu_dpm_enable_vce(struct amdgpu_device *adev, bool enable) 
	int ret = 0;



	if (adev->family == AMDGPU_FAMILY_SI) {

		if (enable) {

		mutex_lock(&adev->pm.mutex);

		if (enable) {

			adev->pm.dpm.vce_active = true;

			/* XXX select vce level based on ring/task */

			adev->pm.dpm.vce_level = AMD_VCE_LEVEL_AC_ALL;

			mutex_unlock(&adev->pm.mutex);

		} else {

			mutex_lock(&adev->pm.mutex);

			adev->pm.dpm.vce_active = false;

			mutex_unlock(&adev->pm.mutex);

		}

		mutex_unlock(&adev->pm.mutex);



		amdgpu_pm_compute_clocks(adev);

	} else {