Skip to content

Commit 4d395f9

Browse files
Guchun Chenalexdeucher
authored andcommitted
drm/amdgpu: add missed support for UVD IP_VERSION(3, 0, 64)
Fixes: 96b8dd4 ("drm/amdgpu/amdgpu_vcn: convert to IP version checking") Signed-off-by: Flora Cui <flora.cui@amd.com> Signed-off-by: Guchun Chen <guchun.chen@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
1 parent b45a360 commit 4d395f9

3 files changed

Lines changed: 3 additions & 0 deletions

File tree

drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -882,6 +882,7 @@ static int amdgpu_discovery_set_mm_ip_blocks(struct amdgpu_device *adev)
882882
break;
883883
case IP_VERSION(3, 0, 0):
884884
case IP_VERSION(3, 0, 16):
885+
case IP_VERSION(3, 0, 64):
885886
case IP_VERSION(3, 1, 1):
886887
case IP_VERSION(3, 0, 2):
887888
amdgpu_device_ip_block_add(adev, &vcn_v3_0_ip_block);

drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ int amdgpu_vcn_sw_init(struct amdgpu_device *adev)
134134
adev->vcn.indirect_sram = true;
135135
break;
136136
case IP_VERSION(3, 0, 0):
137+
case IP_VERSION(3, 0, 64):
137138
if (adev->ip_versions[GC_HWIP][0] == IP_VERSION(10, 3, 0))
138139
fw_name = FIRMWARE_SIENNA_CICHLID;
139140
else

drivers/gpu/drm/amd/amdgpu/nv.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@ static int nv_query_video_codecs(struct amdgpu_device *adev, bool encode,
182182
{
183183
switch (adev->ip_versions[UVD_HWIP][0]) {
184184
case IP_VERSION(3, 0, 0):
185+
case IP_VERSION(3, 0, 64):
185186
if (amdgpu_sriov_vf(adev)) {
186187
if (encode)
187188
*codecs = &sriov_sc_video_codecs_encode;

0 commit comments

Comments
 (0)