Commit da03e422 authored by Lee Jones's avatar Lee Jones Committed by Alex Deucher
Browse files

drm/amd/pm/powerplay/kv_dpm: Remove unused variable 'ret' 



Fixes the following W=1 kernel build warning(s):

 drivers/gpu/drm/amd/amdgpu/../pm/powerplay/kv_dpm.c: In function ‘kv_dpm_powergate_uvd’:
 drivers/gpu/drm/amd/amdgpu/../pm/powerplay/kv_dpm.c:1678:6: warning: variable ‘ret’ set but not used [-Wunused-but-set-variable]
 drivers/gpu/drm/amd/amdgpu/../pm/powerplay/kv_dpm.c: In function ‘kv_dpm_powergate_vce’:
 drivers/gpu/drm/amd/amdgpu/../pm/powerplay/kv_dpm.c:1706:6: warning: variable ‘ret’ set but not used [-Wunused-but-set-variable]

Cc: Evan Quan <evan.quan@amd.com>
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: "Christian König" <christian.koenig@amd.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: amd-gfx@lists.freedesktop.org
Cc: dri-devel@lists.freedesktop.org
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 6ee5a795

drivers/gpu/drm/amd/pm/powerplay/kv_dpm.c

+8 −10
Original line number Diff line number Diff line
@@ -1675,13 +1675,12 @@ static void kv_dpm_powergate_uvd(void *handle, bool gate) 
{

	struct amdgpu_device *adev = (struct amdgpu_device *)handle;

	struct kv_power_info *pi = kv_get_pi(adev);

	int ret;



	pi->uvd_power_gated = gate;



	if (gate) {

		/* stop the UVD block */

		ret = amdgpu_device_ip_set_powergating_state(adev, AMD_IP_BLOCK_TYPE_UVD,

		amdgpu_device_ip_set_powergating_state(adev, AMD_IP_BLOCK_TYPE_UVD,

						       AMD_PG_STATE_GATE);

		kv_update_uvd_dpm(adev, gate);

		if (pi->caps_uvd_pg)
@@ -1694,7 +1693,7 @@ static void kv_dpm_powergate_uvd(void *handle, bool gate) 
			/* re-init the UVD block */

		kv_update_uvd_dpm(adev, gate);



		ret = amdgpu_device_ip_set_powergating_state(adev, AMD_IP_BLOCK_TYPE_UVD,

		amdgpu_device_ip_set_powergating_state(adev, AMD_IP_BLOCK_TYPE_UVD,

						       AMD_PG_STATE_UNGATE);

	}

}
@@ -1703,13 +1702,12 @@ static void kv_dpm_powergate_vce(void *handle, bool gate) 
{

	struct amdgpu_device *adev = (struct amdgpu_device *)handle;

	struct kv_power_info *pi = kv_get_pi(adev);

	int ret;



	pi->vce_power_gated = gate;



	if (gate) {

		/* stop the VCE block */

		ret = amdgpu_device_ip_set_powergating_state(adev, AMD_IP_BLOCK_TYPE_VCE,

		amdgpu_device_ip_set_powergating_state(adev, AMD_IP_BLOCK_TYPE_VCE,

						       AMD_PG_STATE_GATE);

		kv_enable_vce_dpm(adev, false);

		if (pi->caps_vce_pg) /* power off the VCE block */
@@ -1719,7 +1717,7 @@ static void kv_dpm_powergate_vce(void *handle, bool gate) 
			amdgpu_kv_notify_message_to_smu(adev, PPSMC_MSG_VCEPowerON);

		kv_enable_vce_dpm(adev, true);

		/* re-init the VCE block */

		ret = amdgpu_device_ip_set_powergating_state(adev, AMD_IP_BLOCK_TYPE_VCE,

		amdgpu_device_ip_set_powergating_state(adev, AMD_IP_BLOCK_TYPE_VCE,

						       AMD_PG_STATE_UNGATE);

	}

}