drm/amdgpu: load SMU IP for onevf mode on Navi1x V2
Subsystems (2)
PATCH 1/1 drm/amdgpu: load SMU IP for onevf mode on Navi1x V2
SMU IP needs to be loaded for onevf mode. Otherwise, there may be accesses without initialization.
V2: added SMU IP for all sriov cases since there is necessary
checks in IP operations(hw_init/fini)
Change-Id I513aa4140f1169ca048b64985cafe9c7577afca7
Signed-off-by Evan Quan <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/nv.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
drivers/gpu/drm/amd/amdgpu/nv.c +4 -8
@@ -474,8 +474,7 @@ int nv_set_ip_blocks(struct amdgpu_device *adev)amdgpu_device_ip_block_add (adev, &gmc_v10_0_ip_block);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 && - !amdgpu_sriov_vf (adev)) +if (adev->firmware.load_type ==AMDGPU_FW_LOAD_PSP )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);
@@ -485,8 +484,7 @@ int nv_set_ip_blocks(struct amdgpu_device *adev)#endif 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 && - !amdgpu_sriov_vf (adev)) +if (adev->firmware.load_type ==AMDGPU_FW_LOAD_DIRECT )amdgpu_device_ip_block_add (adev, &smu_v11_0_ip_block);amdgpu_device_ip_block_add (adev, &vcn_v2_0_ip_block);amdgpu_device_ip_block_add (adev, &jpeg_v2_0_ip_block);
@@ -498,8 +496,7 @@ int nv_set_ip_blocks(struct amdgpu_device *adev)amdgpu_device_ip_block_add (adev, &gmc_v10_0_ip_block);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 && - !amdgpu_sriov_vf (adev)) +if (adev->firmware.load_type ==AMDGPU_FW_LOAD_PSP )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);
@@ -509,8 +506,7 @@ int nv_set_ip_blocks(struct amdgpu_device *adev)#endif 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 && - !amdgpu_sriov_vf (adev)) +if (adev->firmware.load_type ==AMDGPU_FW_LOAD_DIRECT )amdgpu_device_ip_block_add (adev, &smu_v11_0_ip_block);amdgpu_device_ip_block_add (adev, &vcn_v2_0_ip_block);if (!amdgpu_sriov_vf (adev))
Signature · 6 lines
2.26.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx