iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/amdgpu: convert to UVD IP version checking

Browse Source 
Use IP versions rather than asic_type to differentiate IP version specific features.

Signed-off-by: Tim Huang <tim.huang@amd.com>
Reviewed-by: Aaron Liu <aaron.liu@amd.com>
Reviewed-by: Huang Rui <ray.huang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Tim Huang
2022-01-25 11:13:39 +08:00
committed by Alex Deucher
parent d726d43c20
commit 37d6b1506b
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c
View File

@ -50,11 +50,16 @@ static int jpeg_v3_0_early_init(void *handle)
{ {
struct amdgpu_device *adev = (struct amdgpu_device *)handle; struct amdgpu_device *adev = (struct amdgpu_device *)handle;
if (adev->asic_type != CHIP_YELLOW_CARP) { u32 harvest;
u32 harvest = RREG32_SOC15(JPEG, 0, mmCC_UVD_HARVESTING);
switch (adev->ip_versions[UVD_HWIP][0]) {
case IP_VERSION(3, 1, 1):
break;
default:
harvest = RREG32_SOC15(JPEG, 0, mmCC_UVD_HARVESTING);
if (harvest & CC_UVD_HARVESTING__UVD_DISABLE_MASK) if (harvest & CC_UVD_HARVESTING__UVD_DISABLE_MASK)
return -ENOENT; return -ENOENT;
break;
} }
adev->jpeg.num_jpeg_inst = 1; adev->jpeg.num_jpeg_inst = 1;