diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3790-drm-amdgpu-SRIOV-Navi10-12-VF-doesn-t-support-SMU.patch')
-rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3790-drm-amdgpu-SRIOV-Navi10-12-VF-doesn-t-support-SMU.patch | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3790-drm-amdgpu-SRIOV-Navi10-12-VF-doesn-t-support-SMU.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3790-drm-amdgpu-SRIOV-Navi10-12-VF-doesn-t-support-SMU.patch new file mode 100644 index 00000000..540feb82 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3790-drm-amdgpu-SRIOV-Navi10-12-VF-doesn-t-support-SMU.patch @@ -0,0 +1,58 @@ +From b650d992404e2902153567219c3344f587fb368c Mon Sep 17 00:00:00 2001 +From: Jiange Zhao <Jiange.Zhao@amd.com> +Date: Thu, 12 Sep 2019 13:15:35 +0800 +Subject: [PATCH 3790/4256] drm/amdgpu/SRIOV: Navi10/12 VF doesn't support SMU + +In SRIOV case, SMU and powerplay are handled in HV. + +VF shouldn't have control over SMU and powerplay. + +Signed-off-by: Jiange Zhao <Jiange.Zhao@amd.com> +Reviewed-by: Emily Deng <Emily.Deng@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/nv.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/nv.c b/drivers/gpu/drm/amd/amdgpu/nv.c +index 4c24672be12a..fb097aa089da 100644 +--- a/drivers/gpu/drm/amd/amdgpu/nv.c ++++ b/drivers/gpu/drm/amd/amdgpu/nv.c +@@ -438,7 +438,7 @@ int nv_set_ip_blocks(struct amdgpu_device *adev) + amdgpu_device_ip_block_add(adev, &navi10_ih_ip_block); + amdgpu_device_ip_block_add(adev, &psp_v11_0_ip_block); + if (adev->firmware.load_type == AMDGPU_FW_LOAD_PSP && +- is_support_sw_smu(adev)) ++ is_support_sw_smu(adev) && !amdgpu_sriov_vf(adev)) + amdgpu_device_ip_block_add(adev, &smu_v11_0_ip_block); + if (adev->enable_virtual_display || amdgpu_sriov_vf(adev)) + amdgpu_device_ip_block_add(adev, &dce_virtual_ip_block); +@@ -449,7 +449,7 @@ int nv_set_ip_blocks(struct amdgpu_device *adev) + amdgpu_device_ip_block_add(adev, &gfx_v10_0_ip_block); + amdgpu_device_ip_block_add(adev, &sdma_v5_0_ip_block); + if (adev->firmware.load_type == AMDGPU_FW_LOAD_DIRECT && +- is_support_sw_smu(adev)) ++ is_support_sw_smu(adev) && !amdgpu_sriov_vf(adev)) + amdgpu_device_ip_block_add(adev, &smu_v11_0_ip_block); + amdgpu_device_ip_block_add(adev, &vcn_v2_0_ip_block); + if (adev->enable_mes) +@@ -461,7 +461,7 @@ int nv_set_ip_blocks(struct amdgpu_device *adev) + amdgpu_device_ip_block_add(adev, &navi10_ih_ip_block); + amdgpu_device_ip_block_add(adev, &psp_v11_0_ip_block); + if (adev->firmware.load_type == AMDGPU_FW_LOAD_PSP && +- is_support_sw_smu(adev)) ++ is_support_sw_smu(adev) && !amdgpu_sriov_vf(adev)) + amdgpu_device_ip_block_add(adev, &smu_v11_0_ip_block); + if (adev->enable_virtual_display || amdgpu_sriov_vf(adev)) + amdgpu_device_ip_block_add(adev, &dce_virtual_ip_block); +@@ -472,7 +472,7 @@ int nv_set_ip_blocks(struct amdgpu_device *adev) + amdgpu_device_ip_block_add(adev, &gfx_v10_0_ip_block); + amdgpu_device_ip_block_add(adev, &sdma_v5_0_ip_block); + if (adev->firmware.load_type == AMDGPU_FW_LOAD_DIRECT && +- is_support_sw_smu(adev)) ++ is_support_sw_smu(adev) && !amdgpu_sriov_vf(adev)) + amdgpu_device_ip_block_add(adev, &smu_v11_0_ip_block); + amdgpu_device_ip_block_add(adev, &vcn_v2_0_ip_block); + break; +-- +2.17.1 + |