Commit 46651cc5 authored by Sonny Jiang's avatar Sonny Jiang Committed by Alex Deucher
Browse files

drm/amdgpu fix amdgpu.dpm=0 (v2) 



Fix crash when disabling dpm.

v2: agd5f: fix coding style, cleanup commit message

Signed-off-by: default avatarSonny Jiang <sonny.jiang@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent c92b90cc

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

+13 −4
Original line number Diff line number Diff line
@@ -1206,10 +1206,7 @@ static int cz_dpm_enable(struct amdgpu_device *adev) 


static int cz_dpm_hw_init(struct amdgpu_device *adev)

{

	int ret;



	if (!amdgpu_dpm)

		return 0;

	int ret = 0;



	mutex_lock(&adev->pm.mutex);
@@ -1229,6 +1226,12 @@ static int cz_dpm_hw_init(struct amdgpu_device *adev) 
		return ret;

	}



	if (!amdgpu_dpm) {

		adev->pm.dpm_enabled = false;

		mutex_unlock(&adev->pm.mutex);

		return ret;

	}



	/* cz dpm setup asic */

	cz_dpm_setup_asic(adev);
@@ -1326,6 +1329,12 @@ static int cz_dpm_resume(struct amdgpu_device *adev) 
		return ret;

	}



	if (!amdgpu_dpm) {

		adev->pm.dpm_enabled = false;

		mutex_unlock(&adev->pm.mutex);

		return ret;

	}



	/* cz dpm setup asic */

	cz_dpm_setup_asic(adev);