Merge tag 'kvm-ppc-fixes-5.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc into kvm-master

PPC KVM fixes for 5.2

- Several bug fixes for the new XIVE-native code.
- Replace kvm->lock by other mutexes in several places where we hold a
  vcpu mutex, to avoid lock order inversions.
- Fix a lockdep warning on guest entry for radix-mode guests.
- Fix a bug causing user-visible corruption of SPRG3 on the host.

1 files changed, 10 insertions, 7 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
index 05897b05766b..86cc24b2e0aa 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
@@ -877,13 +877,16 @@ static int psp_load_fw(struct amdgpu_device *adev)
         if (!psp->cmd)
                 return -ENOMEM;
 
-        ret = amdgpu_bo_create_kernel(adev, PSP_1_MEG, PSP_1_MEG,
-                                        AMDGPU_GEM_DOMAIN_GTT,
-                                        &psp->fw_pri_bo,
-                                        &psp->fw_pri_mc_addr,
-                                        &psp->fw_pri_buf);
-        if (ret)
-                goto failed;
+        /* this fw pri bo is not used under SRIOV */
+        if (!amdgpu_sriov_vf(psp->adev)) {
+                ret = amdgpu_bo_create_kernel(adev, PSP_1_MEG, PSP_1_MEG,
+                                              AMDGPU_GEM_DOMAIN_GTT,
+                                              &psp->fw_pri_bo,
+                                              &psp->fw_pri_mc_addr,
+                                              &psp->fw_pri_buf);
+                if (ret)
+                        goto failed;
+        }
 
         ret = amdgpu_bo_create_kernel(adev, PSP_FENCE_BUFFER_SIZE, PAGE_SIZE,
                                         AMDGPU_GEM_DOMAIN_VRAM,