The soft_reset() function for IH (interrupt handler) blocks of Vega and newer have never been implemented, and there are no plans to implement them.
Let's delete these functions, they don't do anything and also aren't called from anywhere. Signed-off-by: Timur Kristóf <[email protected]> --- drivers/gpu/drm/amd/amdgpu/ih_v6_0.c | 7 ------- drivers/gpu/drm/amd/amdgpu/ih_v6_1.c | 7 ------- drivers/gpu/drm/amd/amdgpu/ih_v7_0.c | 7 ------- drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 7 ------- drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 8 -------- drivers/gpu/drm/amd/amdgpu/vega20_ih.c | 8 -------- 6 files changed, 44 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/ih_v6_0.c b/drivers/gpu/drm/amd/amdgpu/ih_v6_0.c index d6554add485c..8dee48649650 100644 --- a/drivers/gpu/drm/amd/amdgpu/ih_v6_0.c +++ b/drivers/gpu/drm/amd/amdgpu/ih_v6_0.c @@ -693,12 +693,6 @@ static int ih_v6_0_wait_for_idle(struct amdgpu_ip_block *ip_block) return -ETIMEDOUT; } -static int ih_v6_0_soft_reset(struct amdgpu_ip_block *ip_block) -{ - /* todo */ - return 0; -} - static void ih_v6_0_update_clockgating_state(struct amdgpu_device *adev, bool enable) { @@ -815,7 +809,6 @@ static const struct amd_ip_funcs ih_v6_0_ip_funcs = { .suspend = ih_v6_0_suspend, .resume = ih_v6_0_resume, .wait_for_idle = ih_v6_0_wait_for_idle, - .soft_reset = ih_v6_0_soft_reset, .set_clockgating_state = ih_v6_0_set_clockgating_state, .set_powergating_state = ih_v6_0_set_powergating_state, .get_clockgating_state = ih_v6_0_get_clockgating_state, diff --git a/drivers/gpu/drm/amd/amdgpu/ih_v6_1.c b/drivers/gpu/drm/amd/amdgpu/ih_v6_1.c index 0fc348010ac7..ad370b326e88 100644 --- a/drivers/gpu/drm/amd/amdgpu/ih_v6_1.c +++ b/drivers/gpu/drm/amd/amdgpu/ih_v6_1.c @@ -643,12 +643,6 @@ static int ih_v6_1_wait_for_idle(struct amdgpu_ip_block *ip_block) return -ETIMEDOUT; } -static int ih_v6_1_soft_reset(struct amdgpu_ip_block *ip_block) -{ - /* todo */ - return 0; -} - static void ih_v6_1_update_clockgating_state(struct amdgpu_device *adev, bool enable) { @@ -769,7 +763,6 @@ static const struct amd_ip_funcs ih_v6_1_ip_funcs = { .suspend = ih_v6_1_suspend, .resume = ih_v6_1_resume, .wait_for_idle = ih_v6_1_wait_for_idle, - .soft_reset = ih_v6_1_soft_reset, .set_clockgating_state = ih_v6_1_set_clockgating_state, .set_powergating_state = ih_v6_1_set_powergating_state, .get_clockgating_state = ih_v6_1_get_clockgating_state, diff --git a/drivers/gpu/drm/amd/amdgpu/ih_v7_0.c b/drivers/gpu/drm/amd/amdgpu/ih_v7_0.c index 3745439b86b3..e5f8742553eb 100644 --- a/drivers/gpu/drm/amd/amdgpu/ih_v7_0.c +++ b/drivers/gpu/drm/amd/amdgpu/ih_v7_0.c @@ -700,12 +700,6 @@ static int ih_v7_0_wait_for_idle(struct amdgpu_ip_block *ip_block) return -ETIMEDOUT; } -static int ih_v7_0_soft_reset(struct amdgpu_ip_block *ip_block) -{ - /* todo */ - return 0; -} - static void ih_v7_0_update_clockgating_state(struct amdgpu_device *adev, bool enable) { @@ -863,7 +857,6 @@ static const struct amd_ip_funcs ih_v7_0_ip_funcs = { .suspend = ih_v7_0_suspend, .resume = ih_v7_0_resume, .wait_for_idle = ih_v7_0_wait_for_idle, - .soft_reset = ih_v7_0_soft_reset, .set_clockgating_state = ih_v7_0_set_clockgating_state, .set_powergating_state = ih_v7_0_set_powergating_state, .get_clockgating_state = ih_v7_0_get_clockgating_state, diff --git a/drivers/gpu/drm/amd/amdgpu/navi10_ih.c b/drivers/gpu/drm/amd/amdgpu/navi10_ih.c index 1dae7df9ee17..df2245fa35b7 100644 --- a/drivers/gpu/drm/amd/amdgpu/navi10_ih.c +++ b/drivers/gpu/drm/amd/amdgpu/navi10_ih.c @@ -635,12 +635,6 @@ static int navi10_ih_wait_for_idle(struct amdgpu_ip_block *ip_block) return -ETIMEDOUT; } -static int navi10_ih_soft_reset(struct amdgpu_ip_block *ip_block) -{ - /* todo */ - return 0; -} - static void navi10_ih_update_clockgating_state(struct amdgpu_device *adev, bool enable) { @@ -698,7 +692,6 @@ static const struct amd_ip_funcs navi10_ih_ip_funcs = { .suspend = navi10_ih_suspend, .resume = navi10_ih_resume, .wait_for_idle = navi10_ih_wait_for_idle, - .soft_reset = navi10_ih_soft_reset, .set_clockgating_state = navi10_ih_set_clockgating_state, .set_powergating_state = navi10_ih_set_powergating_state, .get_clockgating_state = navi10_ih_get_clockgating_state, diff --git a/drivers/gpu/drm/amd/amdgpu/vega10_ih.c b/drivers/gpu/drm/amd/amdgpu/vega10_ih.c index 4509e6130bc2..c9dca49fc2b9 100644 --- a/drivers/gpu/drm/amd/amdgpu/vega10_ih.c +++ b/drivers/gpu/drm/amd/amdgpu/vega10_ih.c @@ -561,13 +561,6 @@ static int vega10_ih_wait_for_idle(struct amdgpu_ip_block *ip_block) return -ETIMEDOUT; } -static int vega10_ih_soft_reset(struct amdgpu_ip_block *ip_block) -{ - /* todo */ - - return 0; -} - static void vega10_ih_update_clockgating_state(struct amdgpu_device *adev, bool enable) { @@ -625,7 +618,6 @@ const struct amd_ip_funcs vega10_ih_ip_funcs = { .suspend = vega10_ih_suspend, .resume = vega10_ih_resume, .wait_for_idle = vega10_ih_wait_for_idle, - .soft_reset = vega10_ih_soft_reset, .set_clockgating_state = vega10_ih_set_clockgating_state, .set_powergating_state = vega10_ih_set_powergating_state, }; diff --git a/drivers/gpu/drm/amd/amdgpu/vega20_ih.c b/drivers/gpu/drm/amd/amdgpu/vega20_ih.c index 460f4bf195e8..0bda48558d4d 100644 --- a/drivers/gpu/drm/amd/amdgpu/vega20_ih.c +++ b/drivers/gpu/drm/amd/amdgpu/vega20_ih.c @@ -661,13 +661,6 @@ static int vega20_ih_wait_for_idle(struct amdgpu_ip_block *ip_block) return -ETIMEDOUT; } -static int vega20_ih_soft_reset(struct amdgpu_ip_block *ip_block) -{ - /* todo */ - - return 0; -} - static void vega20_ih_update_clockgating_state(struct amdgpu_device *adev, bool enable) { @@ -722,7 +715,6 @@ const struct amd_ip_funcs vega20_ih_ip_funcs = { .suspend = vega20_ih_suspend, .resume = vega20_ih_resume, .wait_for_idle = vega20_ih_wait_for_idle, - .soft_reset = vega20_ih_soft_reset, .set_clockgating_state = vega20_ih_set_clockgating_state, .set_powergating_state = vega20_ih_set_powergating_state, }; -- 2.55.0
