drm/amdgpu: Navi10/12 VF doesn't support SMU
Subsystems (2)
PATCH 1/1 drm/amdgpu: Navi10/12 VF doesn't support SMU
From: Jiange Zhao <[email protected]>
In SRIOV case, SMU and powerplay are handled in HV.
VF shouldn't have control over SMU and powerplay.
--- drivers/gpu/drm/amd/amdgpu/nv.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/nv.c +4 -4
@@ -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 ;
Signature · 6 lines
2.20.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): [email protected]
Deng, Emily
Reviewed-by Emily DengBest wishes
Emily Deng
Quoted 66 lines
-----Original Message-----
From: Zhao, Jiange <[email protected]>
Sent: Thursday, September 12, 2019 11:46 AM
To: [email protected]
Cc: Nieto, David M <[email protected]>; Deng, Emily <[email protected]>; Koenig, Christian <[email protected]>; Zhao, Jiange <[email protected]>
Subject: [PATCH] drm/amdgpu: Navi10/12 VF doesn't support SMUFrom: Jiange Zhao <[email protected]>
In SRIOV case, SMU and powerplay are handled in HV.
VF shouldn't have control over SMU and powerplay.
Signed-off-by Jiange Zhao <[email protected]>---
drivers/gpu/drm/amd/amdgpu/nv.c| 8 ++++----1 file changed, 4 insertions(+), 4 deletions(-)(quoted diff) +0
-0
b/drivers/gpu/drm/amd/amdgpu/nv.cindex4c24672be12a..fb097aa089da100644drivers/gpu/drm/amd/amdgpu/nv.c +1
-1@@ -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 @@ intnv_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&&
drivers/gpu/drm/amd/amdgpu/nv.c +1
-1- 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)drivers/gpu/drm/amd/amdgpu/nv.c +1
-1@@ -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 @@ intnv_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&&
drivers/gpu/drm/amd/amdgpu/nv.c +1
-1- is_support_sw_smu(adev)) + is_support_sw_smu(adev) && !amdgpu_sriov_vf(adev))amdgpu_device_ip_block_add(adev,
Quoted 5 lines
&smu_v11_0_ip_block); amdgpu_device_ip_block_add(adev, &vcn_v2_0_ip_block); break;--
2.20.1
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx