drm/amdgpu: cleanup static CSA handling

Move the CSA bo_va from the VM to the fpriv structure.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
index 29cd5dabf8b5..1aac5821ac8f 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
@@ -843,7 +843,7 @@ int amdgpu_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv)
         }
 
         if (amdgpu_sriov_vf(adev)) {
-                r = amdgpu_map_static_csa(adev, &fpriv->vm);
+                r = amdgpu_map_static_csa(adev, &fpriv->vm, &fpriv->csa_va);
                 if (r)
                         goto out_suspend;
         }
@@ -896,8 +896,8 @@ void amdgpu_driver_postclose_kms(struct drm_device *dev,
         if (amdgpu_sriov_vf(adev)) {
                 /* TODO: how to handle reserve failure */
                 BUG_ON(amdgpu_bo_reserve(adev->virt.csa_obj, true));
-                amdgpu_vm_bo_rmv(adev, fpriv->vm.csa_bo_va);
-                fpriv->vm.csa_bo_va = NULL;
+                amdgpu_vm_bo_rmv(adev, fpriv->csa_va);
+                fpriv->csa_va = NULL;
                 amdgpu_bo_unreserve(adev->virt.csa_obj);
         }