Skip to content

Commit

Permalink
drm/amdgpu/vcn5.0.1: use correct dpm helper
Browse files Browse the repository at this point in the history
The VCN and UVD helpers were split in
commit ff69bba ("drm/amd/pm: add inst to dpm_set_powergating_by_smu")
However, this happened in parallel to the vcn 5.0.1
development so it was missed there.

Fixes: 346492f ("drm/amdgpu: Add VCN_5_0_1 support")
Reviewed-by: Lijo Lazar <lijo.lazar@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: Sonny Jiang <sonjiang@amd.com>
Cc: Boyuan Zhang <boyuan.zhang@amd.com>
  • Loading branch information
Alex Deucher committed Feb 17, 2025
1 parent 56763be commit 0487f50
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions drivers/gpu/drm/amd/amdgpu/vcn_v5_0_1.c
Original file line number Diff line number Diff line change
Expand Up @@ -575,8 +575,10 @@ static int vcn_v5_0_1_start(struct amdgpu_device *adev)
uint32_t tmp;
int i, j, k, r, vcn_inst;

if (adev->pm.dpm_enabled)
amdgpu_dpm_enable_uvd(adev, true);
for (i = 0; i < adev->vcn.num_vcn_inst; ++i) {
if (adev->pm.dpm_enabled)
amdgpu_dpm_enable_vcn(adev, true, i);
}

for (i = 0; i < adev->vcn.num_vcn_inst; ++i) {
fw_shared = adev->vcn.inst[i].fw_shared.cpu_addr;
Expand Down Expand Up @@ -816,8 +818,10 @@ static int vcn_v5_0_1_stop(struct amdgpu_device *adev)
WREG32_SOC15(VCN, vcn_inst, regUVD_STATUS, 0);
}

if (adev->pm.dpm_enabled)
amdgpu_dpm_enable_uvd(adev, false);
for (i = 0; i < adev->vcn.num_vcn_inst; ++i) {
if (adev->pm.dpm_enabled)
amdgpu_dpm_enable_vcn(adev, false, i);
}

return 0;
}
Expand Down

0 comments on commit 0487f50

Please sign in to comment.