Commit 1df67a4e authored by James Zhu's avatar James Zhu Committed by Alex Deucher

Revert "drm/amdgpu/vcn3.0: remove extra asic type check"

This reverts commit 058c07201ec7d373fc6a0a570b38a8a9d62c29fb.
Chip NAVY_FLOUNDER uses vcn3.0, but it has only one VCN instance.
Signed-off-by: default avatarJames Zhu <James.Zhu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent ea368183
...@@ -88,6 +88,7 @@ static int vcn_v3_0_early_init(void *handle) ...@@ -88,6 +88,7 @@ static int vcn_v3_0_early_init(void *handle)
adev->vcn.num_enc_rings = 1; adev->vcn.num_enc_rings = 1;
} else { } else {
if (adev->asic_type == CHIP_SIENNA_CICHLID) {
u32 harvest; u32 harvest;
int i; int i;
...@@ -102,6 +103,8 @@ static int vcn_v3_0_early_init(void *handle) ...@@ -102,6 +103,8 @@ static int vcn_v3_0_early_init(void *handle)
AMDGPU_VCN_HARVEST_VCN1)) AMDGPU_VCN_HARVEST_VCN1))
/* both instances are harvested, disable the block */ /* both instances are harvested, disable the block */
return -ENOENT; return -ENOENT;
} else
adev->vcn.num_vcn_inst = 1;
adev->vcn.num_enc_rings = 2; adev->vcn.num_enc_rings = 2;
} }
......
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