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

drm/amdgpu: clean the dummy soft_reset functions 



Remove the dummy soft_reset 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 f13c7da1

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

+0 −6
Original line number Diff line number Diff line
@@ -584,11 +584,6 @@ static bool acp_is_idle(void *handle) 
	return true;

}



static int acp_soft_reset(struct amdgpu_ip_block *ip_block)

{

	return 0;

}



static int acp_set_clockgating_state(void *handle,

				     enum amd_clockgating_state state)

{
@@ -617,7 +612,6 @@ static const struct amd_ip_funcs acp_ip_funcs = { 
	.suspend = acp_suspend,

	.resume = acp_resume,

	.is_idle = acp_is_idle,

	.soft_reset = acp_soft_reset,

	.set_clockgating_state = acp_set_clockgating_state,

	.set_powergating_state = acp_set_powergating_state,

	.dump_ip_state = NULL,

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

+0 −6
Original line number Diff line number Diff line
@@ -128,11 +128,6 @@ static bool isp_is_idle(void *handle) 
	return true;

}



static int isp_soft_reset(struct amdgpu_ip_block *ip_block)

{

	return 0;

}



static int isp_set_clockgating_state(void *handle,

				     enum amd_clockgating_state state)

{
@@ -152,7 +147,6 @@ static const struct amd_ip_funcs isp_ip_funcs = { 
	.hw_init = isp_hw_init,

	.hw_fini = isp_hw_fini,

	.is_idle = isp_is_idle,

	.soft_reset = isp_soft_reset,

	.set_clockgating_state = isp_set_clockgating_state,

	.set_powergating_state = isp_set_powergating_state,

};

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

+0 −6
Original line number Diff line number Diff line
@@ -632,11 +632,6 @@ static bool amdgpu_vkms_is_idle(void *handle) 
	return true;

}



static int amdgpu_vkms_soft_reset(struct amdgpu_ip_block *ip_block)

{

	return 0;

}



static int amdgpu_vkms_set_clockgating_state(void *handle,

					  enum amd_clockgating_state state)

{
@@ -660,7 +655,6 @@ static const struct amd_ip_funcs amdgpu_vkms_ip_funcs = { 
	.suspend = amdgpu_vkms_suspend,

	.resume = amdgpu_vkms_resume,

	.is_idle = amdgpu_vkms_is_idle,

	.soft_reset = amdgpu_vkms_soft_reset,

	.set_clockgating_state = amdgpu_vkms_set_clockgating_state,

	.set_powergating_state = amdgpu_vkms_set_powergating_state,

	.dump_ip_state = NULL,

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

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

}



static int gfx_v6_0_soft_reset(struct amdgpu_ip_block *ip_block)

{

	return 0;

}



static void gfx_v6_0_set_gfx_eop_interrupt_state(struct amdgpu_device *adev,

						 enum amdgpu_interrupt_state state)

{
@@ -3449,7 +3444,6 @@ static const struct amd_ip_funcs gfx_v6_0_ip_funcs = { 
	.resume = gfx_v6_0_resume,

	.is_idle = gfx_v6_0_is_idle,

	.wait_for_idle = gfx_v6_0_wait_for_idle,

	.soft_reset = gfx_v6_0_soft_reset,

	.set_clockgating_state = gfx_v6_0_set_clockgating_state,

	.set_powergating_state = gfx_v6_0_set_powergating_state,

	.dump_ip_state = NULL,

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

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

}



static int gmc_v10_0_soft_reset(struct amdgpu_ip_block *ip_block)

{

	return 0;

}



static int gmc_v10_0_set_clockgating_state(void *handle,

					   enum amd_clockgating_state state)

{
@@ -1151,7 +1146,6 @@ const struct amd_ip_funcs gmc_v10_0_ip_funcs = { 
	.resume = gmc_v10_0_resume,

	.is_idle = gmc_v10_0_is_idle,

	.wait_for_idle = gmc_v10_0_wait_for_idle,

	.soft_reset = gmc_v10_0_soft_reset,

	.set_clockgating_state = gmc_v10_0_set_clockgating_state,

	.set_powergating_state = gmc_v10_0_set_powergating_state,

	.get_clockgating_state = gmc_v10_0_get_clockgating_state,