mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-16 07:51:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

drm/amdgpu/vcn4.0.3: gate per-queue reset by PSP SOS program version

Browse Source 
Add a PSP SOS firmware compatibility check before enabling VCN per-queue
reset on vcn_v4_0_3.

Per review, program check is sufficient: when PSP SOS program is 0x01,
require fw version >= 0x0036015f; otherwise allow per-queue reset.

Reviewed-by: Lijo Lazar <lijo.lazar@amd.com>
Suggested-by: Lijo Lazar <lijo.lazar@amd.com>
Signed-off-by: Jesse Zhang <Jesse.zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Jesse Zhang
2026-03-20 16:16:16 +08:00
committed by Alex Deucher
parent 6728daa259
commit 16df395a55
1 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c
View File

@@ -134,6 +134,21 @@ static int vcn_v4_0_3_early_init(struct amdgpu_ip_block *ip_block)
return 0;
}
static bool vcn_v4_0_3_is_psp_fw_reset_supported(struct amdgpu_device *adev)
{
uint32_t fw_ver = adev->psp.sos.fw_version;
uint32_t pgm = (fw_ver >> 8) & 0xFF;
/*
* FWDEV-159155: PSP SOS FW must be >= 0x0036015f for program 0x01
* before enabling VCN per-queue reset.
*/
if (pgm == 1)
return fw_ver >= 0x0036015f;
return true;
}
static int vcn_v4_0_3_late_init(struct amdgpu_ip_block *ip_block)
{
struct amdgpu_device *adev = ip_block->adev;
@@ -141,7 +156,9 @@ static int vcn_v4_0_3_late_init(struct amdgpu_ip_block *ip_block)
adev->vcn.supported_reset =
amdgpu_get_soft_full_reset_mask(&adev->vcn.inst[0].ring_enc[0]);
if (amdgpu_dpm_reset_vcn_is_supported(adev) && !amdgpu_sriov_vf(adev))
if (amdgpu_dpm_reset_vcn_is_supported(adev) &&
vcn_v4_0_3_is_psp_fw_reset_supported(adev) &&
!amdgpu_sriov_vf(adev))
adev->vcn.supported_reset |= AMDGPU_RESET_TYPE_PER_QUEUE;
return 0;