From: Alex Deucher Date: Tue, 10 Dec 2024 19:22:25 +0000 (-0500) Subject: drm/amdgpu/vcn4.0.5: use generic set_power_gating_state helper X-Git-Tag: v6.15-rc1~120^2~12^2~121 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4bb58793223d18be30f9673ea3294ed4e9740c5f;p=thirdparty%2Fkernel%2Flinux.git drm/amdgpu/vcn4.0.5: use generic set_power_gating_state helper No need for an IP specific version. Reviewed-by: Boyuan Zhang Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c b/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c index 3a988639fd516..0aac132a56d31 100644 --- a/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c @@ -97,8 +97,6 @@ static void vcn_v4_0_5_set_unified_ring_funcs(struct amdgpu_device *adev); static void vcn_v4_0_5_set_irq_funcs(struct amdgpu_device *adev); static int vcn_v4_0_5_set_pg_state(struct amdgpu_vcn_inst *vinst, enum amd_powergating_state state); -static int vcn_v4_0_5_set_powergating_state(struct amdgpu_ip_block *ip_block, - enum amd_powergating_state state); static int vcn_v4_0_5_pause_dpg_mode(struct amdgpu_vcn_inst *vinst, struct dpg_pause_state *new_state); static void vcn_v4_0_5_unified_ring_set_wptr(struct amdgpu_ring *ring); @@ -1585,29 +1583,6 @@ static int vcn_v4_0_5_set_pg_state(struct amdgpu_vcn_inst *vinst, return ret; } -/** - * vcn_v4_0_5_set_powergating_state - set VCN block powergating state - * - * @ip_block: amdgpu_ip_block pointer - * @state: power gating state - * - * Set VCN block powergating state - */ -static int vcn_v4_0_5_set_powergating_state(struct amdgpu_ip_block *ip_block, - enum amd_powergating_state state) -{ - struct amdgpu_device *adev = ip_block->adev; - int ret = 0, i; - - for (i = 0; i < adev->vcn.num_vcn_inst; ++i) { - struct amdgpu_vcn_inst *vinst = &adev->vcn.inst[i]; - - ret |= vinst->set_pg_state(vinst, state); - } - - return ret; -} - /** * vcn_v4_0_5_process_interrupt - process VCN block interrupt * @@ -1749,7 +1724,7 @@ static const struct amd_ip_funcs vcn_v4_0_5_ip_funcs = { .is_idle = vcn_v4_0_5_is_idle, .wait_for_idle = vcn_v4_0_5_wait_for_idle, .set_clockgating_state = vcn_v4_0_5_set_clockgating_state, - .set_powergating_state = vcn_v4_0_5_set_powergating_state, + .set_powergating_state = vcn_set_powergating_state, .dump_ip_state = vcn_v4_0_5_dump_ip_state, .print_ip_state = vcn_v4_0_5_print_ip_state, };