Commit 39fb77a8 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu/vcn4.0.3: add set_pg_state callback 



Rework the code as a vcn instance callback.

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

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

+20 −16
Original line number Diff line number Diff line
@@ -87,9 +87,8 @@ static const struct amdgpu_hwip_reg_entry vcn_reg_list_4_0_3[] = { 
static int vcn_v4_0_3_start_sriov(struct amdgpu_device *adev);

static void vcn_v4_0_3_set_unified_ring_funcs(struct amdgpu_device *adev);

static void vcn_v4_0_3_set_irq_funcs(struct amdgpu_device *adev);

static int vcn_v4_0_3_set_powergating_state_inst(struct amdgpu_ip_block *ip_block,

						 enum amd_powergating_state state,

						 int i);

static int vcn_v4_0_3_set_pg_state(struct amdgpu_vcn_inst *vinst,

				   enum amd_powergating_state state);

static int vcn_v4_0_3_set_powergating_state(struct amdgpu_ip_block *ip_block,

					    enum amd_powergating_state state);

static int vcn_v4_0_3_pause_dpg_mode(struct amdgpu_vcn_inst *vinst,
@@ -125,6 +124,8 @@ static int vcn_v4_0_3_early_init(struct amdgpu_ip_block *ip_block) 
	vcn_v4_0_3_set_ras_funcs(adev);



	for (i = 0; i < adev->vcn.num_vcn_inst; ++i) {

		adev->vcn.inst[i].set_pg_state = vcn_v4_0_3_set_pg_state;



		r = amdgpu_vcn_early_init(adev, i);

		if (r)

			return r;
@@ -371,10 +372,12 @@ static int vcn_v4_0_3_hw_fini(struct amdgpu_ip_block *ip_block) 
	int i;



	for (i = 0; i < adev->vcn.num_vcn_inst; ++i) {

		cancel_delayed_work_sync(&adev->vcn.inst[i].idle_work);

		struct amdgpu_vcn_inst *vinst = &adev->vcn.inst[i];



		cancel_delayed_work_sync(&vinst->idle_work);



		if (adev->vcn.inst[i].cur_state != AMD_PG_STATE_GATE)

			vcn_v4_0_3_set_powergating_state_inst(ip_block, AMD_PG_STATE_GATE, i);

		if (vinst->cur_state != AMD_PG_STATE_GATE)

			vinst->set_pg_state(vinst, AMD_PG_STATE_GATE);

	}



	return 0;
@@ -1681,12 +1684,10 @@ static int vcn_v4_0_3_set_clockgating_state(struct amdgpu_ip_block *ip_block, 
	return 0;

}



static int vcn_v4_0_3_set_powergating_state_inst(struct amdgpu_ip_block *ip_block,

						 enum amd_powergating_state state,

						 int i)

static int vcn_v4_0_3_set_pg_state(struct amdgpu_vcn_inst *vinst,

				   enum amd_powergating_state state)

{

	struct amdgpu_device *adev = ip_block->adev;

	struct amdgpu_vcn_inst *vinst = &adev->vcn.inst[i];

	struct amdgpu_device *adev = vinst->adev;

	int ret = 0;



	/* for SRIOV, guest should not control VCN Power-gating
@@ -1694,11 +1695,11 @@ static int vcn_v4_0_3_set_powergating_state_inst(struct amdgpu_ip_block *ip_bloc 
	 * guest should avoid touching CGC and PG

	 */

	if (amdgpu_sriov_vf(adev)) {

		adev->vcn.inst[i].cur_state = AMD_PG_STATE_UNGATE;

		vinst->cur_state = AMD_PG_STATE_UNGATE;

		return 0;

	}



	if (state == adev->vcn.inst[i].cur_state)

	if (state == vinst->cur_state)

		return 0;



	if (state == AMD_PG_STATE_GATE)
@@ -1707,7 +1708,7 @@ static int vcn_v4_0_3_set_powergating_state_inst(struct amdgpu_ip_block *ip_bloc 
		ret = vcn_v4_0_3_start(vinst);



	if (!ret)

		adev->vcn.inst[i].cur_state = state;

		vinst->cur_state = state;



	return ret;

}
@@ -1726,8 +1727,11 @@ static int vcn_v4_0_3_set_powergating_state(struct amdgpu_ip_block *ip_block, 
	struct amdgpu_device *adev = ip_block->adev;

	int ret = 0, i;



	for (i = 0; i < adev->vcn.num_vcn_inst; ++i)

		vcn_v4_0_3_set_powergating_state_inst(ip_block, state, 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;

}