aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2017-01-18 08:49:43 -0500
committerAlex Deucher <alexander.deucher@amd.com>2017-01-27 12:20:45 -0500
commit268c3001842cb179b54a2825dad9b70151bf4de6 (patch)
treef30da225dd86726e92e4976e4f8a19a441b87a2e
parent999446a786727af6bb5affccf2893b7c3976b675 (diff)
drm/amdgpu: fix amdgpu_bo_va_mapping flags
They are 64bit not 32 for a while now. Signed-off-by: Christian König <christian.koenig@amd.com> Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu.h2
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c2
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index 179f01d44d14..147ce0ebf092 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -357,7 +357,7 @@ struct amdgpu_bo_va_mapping {
357 struct list_head list; 357 struct list_head list;
358 struct interval_tree_node it; 358 struct interval_tree_node it;
359 uint64_t offset; 359 uint64_t offset;
360 uint32_t flags; 360 uint64_t flags;
361}; 361};
362 362
363/* bo virtual addresses in a specific vm */ 363/* bo virtual addresses in a specific vm */
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
index 1dda9321bd5a..bd0d33125c18 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -1293,7 +1293,7 @@ struct amdgpu_bo_va *amdgpu_vm_bo_add(struct amdgpu_device *adev,
1293int amdgpu_vm_bo_map(struct amdgpu_device *adev, 1293int amdgpu_vm_bo_map(struct amdgpu_device *adev,
1294 struct amdgpu_bo_va *bo_va, 1294 struct amdgpu_bo_va *bo_va,
1295 uint64_t saddr, uint64_t offset, 1295 uint64_t saddr, uint64_t offset,
1296 uint64_t size, uint32_t flags) 1296 uint64_t size, uint64_t flags)
1297{ 1297{
1298 struct amdgpu_bo_va_mapping *mapping; 1298 struct amdgpu_bo_va_mapping *mapping;
1299 struct amdgpu_vm *vm = bo_va->vm; 1299 struct amdgpu_vm *vm = bo_va->vm;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h
index a12cb1b9a7e1..18c72c0b478d 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h
@@ -197,7 +197,7 @@ struct amdgpu_bo_va *amdgpu_vm_bo_add(struct amdgpu_device *adev,
197int amdgpu_vm_bo_map(struct amdgpu_device *adev, 197int amdgpu_vm_bo_map(struct amdgpu_device *adev,
198 struct amdgpu_bo_va *bo_va, 198 struct amdgpu_bo_va *bo_va,
199 uint64_t addr, uint64_t offset, 199 uint64_t addr, uint64_t offset,
200 uint64_t size, uint32_t flags); 200 uint64_t size, uint64_t flags);
201int amdgpu_vm_bo_unmap(struct amdgpu_device *adev, 201int amdgpu_vm_bo_unmap(struct amdgpu_device *adev,
202 struct amdgpu_bo_va *bo_va, 202 struct amdgpu_bo_va *bo_va,
203 uint64_t addr); 203 uint64_t addr);