github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-30 01:53:29 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

drm/amdgpu/vcn4.0: add set_pg_state callback

Browse Source 
Rework the code as a vcn instance callback.

Reviewed-by: Boyuan Zhang <Boyuan.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Alex Deucher 2024-11-26 12:19:49 -05:00
parent bda37b68f6
commit 8b18f03142
1 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c
View File

@ -96,9 +96,8 @@ static int amdgpu_ih_clientid_vcns[] = {
static int vcn_v4_0_start_sriov(struct amdgpu_device *adev);
static void vcn_v4_0_set_unified_ring_funcs(struct amdgpu_device *adev);
static void vcn_v4_0_set_irq_funcs(struct amdgpu_device *adev);
static int vcn_v4_0_set_powergating_state_inst(struct amdgpu_ip_block *ip_block,
enum amd_powergating_state state,
int i);
static int vcn_v4_0_set_pg_state(struct amdgpu_vcn_inst *vinst,
enum amd_powergating_state state);
static int vcn_v4_0_set_powergating_state(struct amdgpu_ip_block *ip_block,
enum amd_powergating_state state);
static int vcn_v4_0_pause_dpg_mode(struct amdgpu_vcn_inst *vinst,
@ -138,6 +137,8 @@ static int vcn_v4_0_early_init(struct amdgpu_ip_block *ip_block)
vcn_v4_0_set_ras_funcs(adev);
for (i = 0; i < adev->vcn.num_vcn_inst; ++i) {
adev->vcn.inst[i].set_pg_state = vcn_v4_0_set_pg_state;
r = amdgpu_vcn_early_init(adev, i);
if (r)
return r;
@ -379,20 +380,22 @@ static int vcn_v4_0_hw_fini(struct amdgpu_ip_block *ip_block)
int i;
for (i = 0; i < adev->vcn.num_vcn_inst; ++i) {
struct amdgpu_vcn_inst *vinst = &adev->vcn.inst[i];
if (adev->vcn.harvest_config & (1 << i))
continue;
cancel_delayed_work_sync(&adev->vcn.inst[i].idle_work);
cancel_delayed_work_sync(&vinst->idle_work);
if (!amdgpu_sriov_vf(adev)) {
if ((adev->pg_flags & AMD_PG_SUPPORT_VCN_DPG) ||
(adev->vcn.inst[i].cur_state != AMD_PG_STATE_GATE &&
(vinst->cur_state != AMD_PG_STATE_GATE &&
RREG32_SOC15(VCN, i, regUVD_STATUS))) {
vcn_v4_0_set_powergating_state_inst(ip_block, AMD_PG_STATE_GATE, i);
vinst->set_pg_state(vinst, AMD_PG_STATE_GATE);
}
}
if (amdgpu_ras_is_supported(adev, AMDGPU_RAS_BLOCK__VCN))
amdgpu_irq_put(adev, &adev->vcn.inst[i].ras_poison_irq, 0);
amdgpu_irq_put(adev, &vinst->ras_poison_irq, 0);
}
return 0;
@ -2079,12 +2082,10 @@ static int vcn_v4_0_set_clockgating_state(struct amdgpu_ip_block *ip_block,
return 0;
}
static int vcn_v4_0_set_powergating_state_inst(struct amdgpu_ip_block *ip_block,
enum amd_powergating_state state,
int i)
static int vcn_v4_0_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
@ -2092,11 +2093,11 @@ static int vcn_v4_0_set_powergating_state_inst(struct amdgpu_ip_block *ip_block,
* 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)
@ -2105,7 +2106,7 @@ static int vcn_v4_0_set_powergating_state_inst(struct amdgpu_ip_block *ip_block,
ret = vcn_v4_0_start(vinst);
if (!ret)
adev->vcn.inst[i].cur_state = state;
vinst->cur_state = state;
return ret;
}
@ -2124,8 +2125,11 @@ static int vcn_v4_0_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)
ret |= vcn_v4_0_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;
}