shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 03:15:31 +09:00
Code Issues Packages Projects Releases Wiki Activity

drm/amdgpu: Power up UVD 3 for FW validation (v2)

Browse Source 
[ Upstream commit c661219cd7be75bb5599b525f16a455a058eb516 ]

Unlike later versions, UVD 3 has firmware validation.
For this to work, the UVD should be powered up correctly.

When DPM is enabled and the display clock is off,
the SMU may choose a power state which doesn't power
the UVD, which can result in failure to initialize UVD.

v2:
Add code comments to explain about the UVD power state
and how UVD clock is turned on/off.

Fixes: b38f3e80ec ("drm amdgpu: SI UVD v3_1 (v2)")
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Timur Kristóf <timur.kristof@gmail.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Timur Kristóf
2025-08-28 17:11:03 +02:00
committed by Greg Kroah-Hartman
parent 553af70d3d
commit d0e0b2c9a2
1 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/gpu/drm/amd/amdgpu/uvd_v3_1.c
View File

@@ -625,7 +625,22 @@ static void uvd_v3_1_enable_mgcg(struct amdgpu_device *adev,
*
* @handle: handle used to pass amdgpu_device pointer
*
* Initialize the hardware, boot up the VCPU and do some testing
* Initialize the hardware, boot up the VCPU and do some testing.
*
* On SI, the UVD is meant to be used in a specific power state,
* or alternatively the driver can manually enable its clock.
* In amdgpu we use the dedicated UVD power state when DPM is enabled.
* Calling amdgpu_dpm_enable_uvd makes DPM select the UVD power state
* for the SMU and afterwards enables the UVD clock.
* This is automatically done by amdgpu_uvd_ring_begin_use when work
* is submitted to the UVD ring. Here, we have to call it manually
* in order to power up UVD before firmware validation.
*
* Note that we must not disable the UVD clock here, as that would
* cause the ring test to fail. However, UVD is powered off
* automatically after the ring test: amdgpu_uvd_ring_end_use calls
* the UVD idle work handler which will disable the UVD clock when
* all fences are signalled.
*/
static int uvd_v3_1_hw_init(void *handle)
{
@@ -635,6 +650,15 @@ static int uvd_v3_1_hw_init(void *handle)
int r;
uvd_v3_1_mc_resume(adev);
uvd_v3_1_enable_mgcg(adev, true);
/* Make sure UVD is powered during FW validation.
* It's going to be automatically powered off after the ring test.
*/
if (adev->pm.dpm_enabled)
amdgpu_dpm_enable_uvd(adev, true);
else
amdgpu_asic_set_uvd_clocks(adev, 53300, 40000);
r = uvd_v3_1_fw_validate(adev);
if (r) {
@@ -642,9 +666,6 @@ static int uvd_v3_1_hw_init(void *handle)
return r;
}
uvd_v3_1_enable_mgcg(adev, true);
amdgpu_asic_set_uvd_clocks(adev, 53300, 40000);
uvd_v3_1_start(adev);
r = amdgpu_ring_test_helper(ring);