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

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

Browse Source 
This reverts commit 058c07201ec7d373fc6a0a570b38a8a9d62c29fb.
Chip NAVY_FLOUNDER uses vcn3.0, but it has only one VCN instance.

Signed-off-by: James Zhu <James.Zhu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
James Zhu
2020-07-25 09:30:35 -04:00
committed by Alex Deucher
parent ea368183ae
commit 1df67a4ece
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c
View File

@@ -88,20 +88,23 @@ static int vcn_v3_0_early_init(void *handle)
adev->vcn.num_enc_rings = 1; adev->vcn.num_enc_rings = 1;
} else { } else {
u32 harvest; if (adev->asic_type == CHIP_SIENNA_CICHLID) {
int i; u32 harvest;
int i;
adev->vcn.num_vcn_inst = VCN_INSTANCES_SIENNA_CICHLID; adev->vcn.num_vcn_inst = VCN_INSTANCES_SIENNA_CICHLID;
for (i = 0; i < adev->vcn.num_vcn_inst; i++) { for (i = 0; i < adev->vcn.num_vcn_inst; i++) {
harvest = RREG32_SOC15(VCN, i, mmCC_UVD_HARVESTING); harvest = RREG32_SOC15(VCN, i, mmCC_UVD_HARVESTING);
if (harvest & CC_UVD_HARVESTING__UVD_DISABLE_MASK) if (harvest & CC_UVD_HARVESTING__UVD_DISABLE_MASK)
adev->vcn.harvest_config |= 1 << i; adev->vcn.harvest_config |= 1 << i;
} }
if (adev->vcn.harvest_config == (AMDGPU_VCN_HARVEST_VCN0 | if (adev->vcn.harvest_config == (AMDGPU_VCN_HARVEST_VCN0 |
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;
} }