Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/amd/sriov skip jped ip block and close pgcg flags

For SIENNA_CICHLID SRIOV, jpeg and pgcp is not supported.

Signed-off-by: Jack Zhang <Jack.Zhang1@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Jack Zhang and committed by
Alex Deucher
c45fbe1b 3cd7e415

+8 -1
+8 -1
drivers/gpu/drm/amd/amdgpu/nv.c
··· 516 516 amdgpu_device_ip_block_add(adev, &gfx_v10_0_ip_block); 517 517 amdgpu_device_ip_block_add(adev, &sdma_v5_2_ip_block); 518 518 amdgpu_device_ip_block_add(adev, &vcn_v3_0_ip_block); 519 - amdgpu_device_ip_block_add(adev, &jpeg_v3_0_ip_block); 519 + if (!amdgpu_sriov_vf(adev)) 520 + amdgpu_device_ip_block_add(adev, &jpeg_v3_0_ip_block); 521 + 520 522 if (adev->enable_mes) 521 523 amdgpu_device_ip_block_add(adev, &mes_v10_1_ip_block); 522 524 break; ··· 747 745 AMD_PG_SUPPORT_JPEG | 748 746 AMD_PG_SUPPORT_ATHUB | 749 747 AMD_PG_SUPPORT_MMHUB; 748 + if (amdgpu_sriov_vf(adev)) { 749 + /* hypervisor control CG and PG enablement */ 750 + adev->cg_flags = 0; 751 + adev->pg_flags = 0; 752 + } 750 753 adev->external_rev_id = adev->rev_id + 0x28; 751 754 break; 752 755 default: