mirror of
https://github.com/torvalds/linux.git
synced 2026-05-25 23:52:08 +02:00
drm/amdgpu: clean the dummy soft_reset functions
Remove the dummy soft_reset functions for all ip blocks. Signed-off-by: Sunil Khatri <sunil.khatri@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
parent
f13c7da118
commit
8231e3af96
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -993,11 +993,6 @@ static int gmc_v11_0_wait_for_idle(struct amdgpu_ip_block *ip_block)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int gmc_v11_0_soft_reset(struct amdgpu_ip_block *ip_block)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int gmc_v11_0_set_clockgating_state(void *handle,
|
||||
enum amd_clockgating_state state)
|
||||
{
|
||||
|
|
@ -1038,7 +1033,6 @@ const struct amd_ip_funcs gmc_v11_0_ip_funcs = {
|
|||
.resume = gmc_v11_0_resume,
|
||||
.is_idle = gmc_v11_0_is_idle,
|
||||
.wait_for_idle = gmc_v11_0_wait_for_idle,
|
||||
.soft_reset = gmc_v11_0_soft_reset,
|
||||
.set_clockgating_state = gmc_v11_0_set_clockgating_state,
|
||||
.set_powergating_state = gmc_v11_0_set_powergating_state,
|
||||
.get_clockgating_state = gmc_v11_0_get_clockgating_state,
|
||||
|
|
|
|||
|
|
@ -977,11 +977,6 @@ static int gmc_v12_0_wait_for_idle(struct amdgpu_ip_block *ip_block)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int gmc_v12_0_soft_reset(struct amdgpu_ip_block *ip_block)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int gmc_v12_0_set_clockgating_state(void *handle,
|
||||
enum amd_clockgating_state state)
|
||||
{
|
||||
|
|
@ -1022,7 +1017,6 @@ const struct amd_ip_funcs gmc_v12_0_ip_funcs = {
|
|||
.resume = gmc_v12_0_resume,
|
||||
.is_idle = gmc_v12_0_is_idle,
|
||||
.wait_for_idle = gmc_v12_0_wait_for_idle,
|
||||
.soft_reset = gmc_v12_0_soft_reset,
|
||||
.set_clockgating_state = gmc_v12_0_set_clockgating_state,
|
||||
.set_powergating_state = gmc_v12_0_set_powergating_state,
|
||||
.get_clockgating_state = gmc_v12_0_get_clockgating_state,
|
||||
|
|
|
|||
|
|
@ -1039,11 +1039,6 @@ static bool nv_common_is_idle(void *handle)
|
|||
return true;
|
||||
}
|
||||
|
||||
static int nv_common_soft_reset(struct amdgpu_ip_block *ip_block)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int nv_common_set_clockgating_state(void *handle,
|
||||
enum amd_clockgating_state state)
|
||||
{
|
||||
|
|
@ -1106,7 +1101,6 @@ static const struct amd_ip_funcs nv_common_ip_funcs = {
|
|||
.suspend = nv_common_suspend,
|
||||
.resume = nv_common_resume,
|
||||
.is_idle = nv_common_is_idle,
|
||||
.soft_reset = nv_common_soft_reset,
|
||||
.set_clockgating_state = nv_common_set_clockgating_state,
|
||||
.set_powergating_state = nv_common_set_powergating_state,
|
||||
.get_clockgating_state = nv_common_get_clockgating_state,
|
||||
|
|
|
|||
|
|
@ -2649,11 +2649,6 @@ static bool si_common_is_idle(void *handle)
|
|||
return true;
|
||||
}
|
||||
|
||||
static int si_common_soft_reset(struct amdgpu_ip_block *ip_block)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int si_common_set_clockgating_state(void *handle,
|
||||
enum amd_clockgating_state state)
|
||||
{
|
||||
|
|
@ -2674,7 +2669,6 @@ static const struct amd_ip_funcs si_common_ip_funcs = {
|
|||
.hw_fini = si_common_hw_fini,
|
||||
.resume = si_common_resume,
|
||||
.is_idle = si_common_is_idle,
|
||||
.soft_reset = si_common_soft_reset,
|
||||
.set_clockgating_state = si_common_set_clockgating_state,
|
||||
.set_powergating_state = si_common_set_powergating_state,
|
||||
.dump_ip_state = NULL,
|
||||
|
|
|
|||
|
|
@ -1341,11 +1341,6 @@ static bool soc15_common_is_idle(void *handle)
|
|||
return true;
|
||||
}
|
||||
|
||||
static int soc15_common_soft_reset(struct amdgpu_ip_block *ip_block)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void soc15_update_drm_clock_gating(struct amdgpu_device *adev, bool enable)
|
||||
{
|
||||
uint32_t def, data;
|
||||
|
|
@ -1496,7 +1491,6 @@ static const struct amd_ip_funcs soc15_common_ip_funcs = {
|
|||
.suspend = soc15_common_suspend,
|
||||
.resume = soc15_common_resume,
|
||||
.is_idle = soc15_common_is_idle,
|
||||
.soft_reset = soc15_common_soft_reset,
|
||||
.set_clockgating_state = soc15_common_set_clockgating_state,
|
||||
.set_powergating_state = soc15_common_set_powergating_state,
|
||||
.get_clockgating_state= soc15_common_get_clockgating_state,
|
||||
|
|
|
|||
|
|
@ -927,11 +927,6 @@ static bool soc21_common_is_idle(void *handle)
|
|||
return true;
|
||||
}
|
||||
|
||||
static int soc21_common_soft_reset(struct amdgpu_ip_block *ip_block)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int soc21_common_set_clockgating_state(void *handle,
|
||||
enum amd_clockgating_state state)
|
||||
{
|
||||
|
|
@ -995,7 +990,6 @@ static const struct amd_ip_funcs soc21_common_ip_funcs = {
|
|||
.suspend = soc21_common_suspend,
|
||||
.resume = soc21_common_resume,
|
||||
.is_idle = soc21_common_is_idle,
|
||||
.soft_reset = soc21_common_soft_reset,
|
||||
.set_clockgating_state = soc21_common_set_clockgating_state,
|
||||
.set_powergating_state = soc21_common_set_powergating_state,
|
||||
.get_clockgating_state = soc21_common_get_clockgating_state,
|
||||
|
|
|
|||
|
|
@ -522,11 +522,6 @@ static bool soc24_common_is_idle(void *handle)
|
|||
return true;
|
||||
}
|
||||
|
||||
static int soc24_common_soft_reset(struct amdgpu_ip_block *ip_block)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int soc24_common_set_clockgating_state(void *handle,
|
||||
enum amd_clockgating_state state)
|
||||
{
|
||||
|
|
@ -586,7 +581,6 @@ static const struct amd_ip_funcs soc24_common_ip_funcs = {
|
|||
.suspend = soc24_common_suspend,
|
||||
.resume = soc24_common_resume,
|
||||
.is_idle = soc24_common_is_idle,
|
||||
.soft_reset = soc24_common_soft_reset,
|
||||
.set_clockgating_state = soc24_common_set_clockgating_state,
|
||||
.set_powergating_state = soc24_common_set_powergating_state,
|
||||
.get_clockgating_state = soc24_common_get_clockgating_state,
|
||||
|
|
|
|||
|
|
@ -1741,11 +1741,6 @@ static bool vi_common_is_idle(void *handle)
|
|||
return true;
|
||||
}
|
||||
|
||||
static int vi_common_soft_reset(struct amdgpu_ip_block *ip_block)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void vi_update_bif_medium_grain_light_sleep(struct amdgpu_device *adev,
|
||||
bool enable)
|
||||
{
|
||||
|
|
@ -2038,7 +2033,6 @@ static const struct amd_ip_funcs vi_common_ip_funcs = {
|
|||
.suspend = vi_common_suspend,
|
||||
.resume = vi_common_resume,
|
||||
.is_idle = vi_common_is_idle,
|
||||
.soft_reset = vi_common_soft_reset,
|
||||
.set_clockgating_state = vi_common_set_clockgating_state,
|
||||
.set_powergating_state = vi_common_set_powergating_state,
|
||||
.get_clockgating_state = vi_common_get_clockgating_state,
|
||||
|
|
|
|||
|
|
@ -3099,11 +3099,6 @@ static bool kv_dpm_is_idle(void *handle)
|
|||
return true;
|
||||
}
|
||||
|
||||
static int kv_dpm_soft_reset(struct amdgpu_ip_block *ip_block)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int kv_dpm_set_interrupt_state(struct amdgpu_device *adev,
|
||||
struct amdgpu_irq_src *src,
|
||||
unsigned type,
|
||||
|
|
@ -3307,7 +3302,6 @@ static const struct amd_ip_funcs kv_dpm_ip_funcs = {
|
|||
.suspend = kv_dpm_suspend,
|
||||
.resume = kv_dpm_resume,
|
||||
.is_idle = kv_dpm_is_idle,
|
||||
.soft_reset = kv_dpm_soft_reset,
|
||||
.set_clockgating_state = kv_dpm_set_clockgating_state,
|
||||
.set_powergating_state = kv_dpm_set_powergating_state,
|
||||
.dump_ip_state = NULL,
|
||||
|
|
|
|||
|
|
@ -7849,11 +7849,6 @@ static int si_dpm_wait_for_idle(struct amdgpu_ip_block *ip_block)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int si_dpm_soft_reset(struct amdgpu_ip_block *ip_block)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int si_dpm_set_clockgating_state(void *handle,
|
||||
enum amd_clockgating_state state)
|
||||
{
|
||||
|
|
@ -8049,7 +8044,6 @@ static const struct amd_ip_funcs si_dpm_ip_funcs = {
|
|||
.resume = si_dpm_resume,
|
||||
.is_idle = si_dpm_is_idle,
|
||||
.wait_for_idle = si_dpm_wait_for_idle,
|
||||
.soft_reset = si_dpm_soft_reset,
|
||||
.set_clockgating_state = si_dpm_set_clockgating_state,
|
||||
.set_powergating_state = si_dpm_set_powergating_state,
|
||||
.dump_ip_state = NULL,
|
||||
|
|
|
|||
|
|
@ -244,11 +244,6 @@ static bool pp_is_idle(void *handle)
|
|||
return false;
|
||||
}
|
||||
|
||||
static int pp_sw_reset(struct amdgpu_ip_block *ip_block)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int pp_set_powergating_state(void *handle,
|
||||
enum amd_powergating_state state)
|
||||
{
|
||||
|
|
@ -290,7 +285,6 @@ static const struct amd_ip_funcs pp_ip_funcs = {
|
|||
.suspend = pp_suspend,
|
||||
.resume = pp_resume,
|
||||
.is_idle = pp_is_idle,
|
||||
.soft_reset = pp_sw_reset,
|
||||
.set_clockgating_state = pp_set_clockgating_state,
|
||||
.set_powergating_state = pp_set_powergating_state,
|
||||
.dump_ip_state = NULL,
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user