net: bgmac: Fix return value check for fixed_phy_register()

[linux.git] / drivers / gpu / drm / amd / amdgpu / amdgpu_vm.c

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
index 291977b93b1dfbde6dde4268434208cdf8ef8329..ec1ec08d40584865b8c378b719f5ecbb5387a794 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -2121,13 +2121,14 @@ long amdgpu_vm_wait_idle(struct amdgpu_vm *vm, long timeout)
  *
  * @adev: amdgpu_device pointer
  * @vm: requested vm
  *
  * @adev: amdgpu_device pointer
  * @vm: requested vm

+ * @xcp_id: GPU partition selection id

  *
  * Init @vm fields.
  *
  * Returns:
  * 0 for success, error for failure.
  */
  *
  * Init @vm fields.
  *
  * Returns:
  * 0 for success, error for failure.
  */

-int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm)
+int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm, int32_t xcp_id)

 {
        struct amdgpu_bo *root_bo;
        struct amdgpu_bo_vm *root;
 {
        struct amdgpu_bo *root_bo;
        struct amdgpu_bo_vm *root;


@@ -2177,7 +2178,7 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm)
        vm->evicting = false;
 
        r = amdgpu_vm_pt_create(adev, vm, adev->vm_manager.root_level,
        vm->evicting = false;
 
        r = amdgpu_vm_pt_create(adev, vm, adev->vm_manager.root_level,

-                               false, &root);
+                               false, &root, xcp_id);

        if (r)
                goto error_free_delayed;
        root_bo = &root->bo;
        if (r)
                goto error_free_delayed;
        root_bo = &root->bo;