From a5b38f55a03a62e260e3ebca87aee14a23081acf Mon Sep 17 00:00:00 2001 From: Harish Kasiviswanathan Date: Thu, 29 Sep 2016 14:23:03 -0400 Subject: [PATCH 1526/4131] drm/amdgpu: Fix incompatible pointer compiler warning Change-Id: I5478e74237cf6fe729ddb68b1427b2b7f4db81c6 Signed-off-by: Harish Kasiviswanathan Conflicts: drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c --- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c index f9b6990..bcaebed 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c @@ -1187,7 +1187,7 @@ int amdgpu_amdkfd_gpuvm_create_process_vm(struct kgd_dev *kgd, void **vm, return -ENOMEM; /* Initialize the VM context, allocate the page directory and zero it */ - ret = amdgpu_vm_init(adev, new_vm); + ret = amdgpu_vm_init(adev, &new_vm->base); if (ret != 0) { pr_err("amdgpu: failed init vm ret %d\n", ret); /* Undo everything related to the new VM context */ -- 2.7.4