Reviewed-by: Emily Deng <Emily.Deng@xxxxxxx> Best wishes Emily Deng >-----Original Message----- >From: Zhao, Jiange <Jiange.Zhao@xxxxxxx> >Sent: Thursday, September 12, 2019 11:46 AM >To: amd-gfx@xxxxxxxxxxxxxxxxxxxxx >Cc: Nieto, David M <David.Nieto@xxxxxxx>; Deng, Emily ><Emily.Deng@xxxxxxx>; Koenig, Christian <Christian.Koenig@xxxxxxx>; >Zhao, Jiange <Jiange.Zhao@xxxxxxx> >Subject: [PATCH] drm/amdgpu: Navi10/12 VF doesn't support SMU > >From: Jiange Zhao <Jiange.Zhao@xxxxxxx> > >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@xxxxxxx> >--- > 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.20.1 _______________________________________________ amd-gfx mailing list amd-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/amd-gfx
