Commit aa980de3 authored by Sunil Khatri's avatar Sunil Khatri Committed by Alex Deucher
Browse files

drm/amdgpu: clean the dummy suspend functions 



Remove the dummy suspend functions for all
ip blocks.

Signed-off-by: default avatarSunil Khatri <sunil.khatri@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent fbcd0ad5

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

+0 −6
Original line number Diff line number Diff line
@@ -66,11 +66,6 @@ static int isp_hw_fini(struct amdgpu_ip_block *ip_block) 
	return -ENODEV;

}



static int isp_suspend(struct amdgpu_ip_block *ip_block)

{

	return 0;

}



static int isp_load_fw_by_psp(struct amdgpu_device *adev)

{

	const struct common_firmware_header *hdr;
@@ -161,7 +156,6 @@ static const struct amd_ip_funcs isp_ip_funcs = { 
	.late_init = NULL,

	.hw_init = isp_hw_init,

	.hw_fini = isp_hw_fini,

	.suspend = isp_suspend,

	.is_idle = isp_is_idle,

	.wait_for_idle = isp_wait_for_idle,

	.soft_reset = isp_soft_reset,

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

+2 −1
Original line number Diff line number Diff line
@@ -613,7 +613,8 @@ static int amdgpu_vkms_suspend(struct amdgpu_ip_block *ip_block) 
	r = drm_mode_config_helper_suspend(adev_to_drm(adev));

	if (r)

		return r;

	return amdgpu_vkms_hw_fini(ip_block);



	return 0;

}



static int amdgpu_vkms_resume(struct amdgpu_ip_block *ip_block)

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

+0 −6
Original line number Diff line number Diff line
@@ -2143,11 +2143,6 @@ static int cik_common_hw_fini(struct amdgpu_ip_block *ip_block) 
	return 0;

}



static int cik_common_suspend(struct amdgpu_ip_block *ip_block)

{

	return cik_common_hw_fini(ip_block);

}



static int cik_common_resume(struct amdgpu_ip_block *ip_block)

{

	return cik_common_hw_init(ip_block);
@@ -2187,7 +2182,6 @@ static const struct amd_ip_funcs cik_common_ip_funcs = { 
	.late_init = NULL,

	.hw_init = cik_common_hw_init,

	.hw_fini = cik_common_hw_fini,

	.suspend = cik_common_suspend,

	.resume = cik_common_resume,

	.is_idle = cik_common_is_idle,

	.wait_for_idle = cik_common_wait_for_idle,

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

+0 −6
Original line number Diff line number Diff line
@@ -2639,11 +2639,6 @@ static int si_common_hw_fini(struct amdgpu_ip_block *ip_block) 
	return 0;

}



static int si_common_suspend(struct amdgpu_ip_block *ip_block)

{

	return si_common_hw_fini(ip_block);

}



static int si_common_resume(struct amdgpu_ip_block *ip_block)

{

	return si_common_hw_init(ip_block);
@@ -2682,7 +2677,6 @@ static const struct amd_ip_funcs si_common_ip_funcs = { 
	.late_init = NULL,

	.hw_init = si_common_hw_init,

	.hw_fini = si_common_hw_fini,

	.suspend = si_common_suspend,

	.resume = si_common_resume,

	.is_idle = si_common_is_idle,

	.wait_for_idle = si_common_wait_for_idle,