Commit bd32af6f authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu/vcn2.5: use generic set_power_gating_state helper 



No need for an IP specific version.

Reviewed-by: default avatarBoyuan Zhang <Boyuan.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 3389dd05

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

+2 −19
Original line number Diff line number Diff line
@@ -97,8 +97,6 @@ static void vcn_v2_5_set_enc_ring_funcs(struct amdgpu_device *adev); 
static void vcn_v2_5_set_irq_funcs(struct amdgpu_device *adev);

static int vcn_v2_5_set_pg_state(struct amdgpu_vcn_inst *vinst,

				 enum amd_powergating_state state);

static int vcn_v2_5_set_powergating_state(struct amdgpu_ip_block *ip_block,

					  enum amd_powergating_state state);

static int vcn_v2_5_pause_dpg_mode(struct amdgpu_vcn_inst *vinst,

				   struct dpg_pause_state *new_state);

static int vcn_v2_5_sriov_start(struct amdgpu_device *adev);
@@ -1874,21 +1872,6 @@ static int vcn_v2_5_set_pg_state(struct amdgpu_vcn_inst *vinst, 
	return ret;

}



static int vcn_v2_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;

}



static int vcn_v2_5_set_interrupt_state(struct amdgpu_device *adev,

					struct amdgpu_irq_src *source,

					unsigned type,
@@ -2041,7 +2024,7 @@ static const struct amd_ip_funcs vcn_v2_5_ip_funcs = { 
	.is_idle = vcn_v2_5_is_idle,

	.wait_for_idle = vcn_v2_5_wait_for_idle,

	.set_clockgating_state = vcn_v2_5_set_clockgating_state,

	.set_powergating_state = vcn_v2_5_set_powergating_state,

	.set_powergating_state = vcn_set_powergating_state,

	.dump_ip_state = vcn_v2_5_dump_ip_state,

	.print_ip_state = vcn_v2_5_print_ip_state,

};
@@ -2058,7 +2041,7 @@ static const struct amd_ip_funcs vcn_v2_6_ip_funcs = { 
        .is_idle = vcn_v2_5_is_idle,

        .wait_for_idle = vcn_v2_5_wait_for_idle,

        .set_clockgating_state = vcn_v2_5_set_clockgating_state,

        .set_powergating_state = vcn_v2_5_set_powergating_state,

	.set_powergating_state = vcn_set_powergating_state,

	.dump_ip_state = vcn_v2_5_dump_ip_state,

	.print_ip_state = vcn_v2_5_print_ip_state,

};