Commit 37d6b150 authored by Tim Huang's avatar Tim Huang Committed by Alex Deucher

drm/amdgpu: convert to UVD IP version checking

Use IP versions rather than asic_type to differentiate IP version specific features.
Signed-off-by: default avatarTim Huang <tim.huang@amd.com>
Reviewed-by: default avatarAaron Liu <aaron.liu@amd.com>
Reviewed-by: default avatarHuang Rui <ray.huang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent d726d43c
...@@ -50,11 +50,16 @@ static int jpeg_v3_0_early_init(void *handle) ...@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment