blob: c423d1585a80d2fbfd97814db1489f1300de8743 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
|
From a5b38f55a03a62e260e3ebca87aee14a23081acf Mon Sep 17 00:00:00 2001
From: Harish Kasiviswanathan <Harish.Kasiviswanathan@amd.com>
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 <Harish.Kasiviswanathan@amd.com>
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
|
