diff options
author | Christian König <christian.koenig@amd.com> | 2017-11-06 09:25:37 -0500 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2017-11-13 14:36:40 -0500 |
commit | ff4cd38943199348a53f980709e16f0bc5c0b8c9 (patch) | |
tree | 4467c628a2d4e78e59d65af1206befc2b4e86bd9 | |
parent | 822770ad49d8f5490f444e345bbd59ecfdd86a15 (diff) |
drm/amdgpu: make AMDGPU_VA_RESERVED_SIZE 64bit
Even when it's a small handle it as 64bit value as well.
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>
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 5 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c index fb72edc4c026..4710e51099c2 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | |||
@@ -556,9 +556,8 @@ int amdgpu_gem_va_ioctl(struct drm_device *dev, void *data, | |||
556 | 556 | ||
557 | if (args->va_address < AMDGPU_VA_RESERVED_SIZE) { | 557 | if (args->va_address < AMDGPU_VA_RESERVED_SIZE) { |
558 | dev_err(&dev->pdev->dev, | 558 | dev_err(&dev->pdev->dev, |
559 | "va_address 0x%lX is in reserved area 0x%X\n", | 559 | "va_address 0x%LX is in reserved area 0x%LX\n", |
560 | (unsigned long)args->va_address, | 560 | args->va_address, AMDGPU_VA_RESERVED_SIZE); |
561 | AMDGPU_VA_RESERVED_SIZE); | ||
562 | return -EINVAL; | 561 | return -EINVAL; |
563 | } | 562 | } |
564 | 563 | ||
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h index aa914256b4bc..bae77353447b 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | |||
@@ -94,7 +94,8 @@ struct amdgpu_bo_list_entry; | |||
94 | #define AMDGPU_MMHUB 1 | 94 | #define AMDGPU_MMHUB 1 |
95 | 95 | ||
96 | /* hardcode that limit for now */ | 96 | /* hardcode that limit for now */ |
97 | #define AMDGPU_VA_RESERVED_SIZE (8 << 20) | 97 | #define AMDGPU_VA_RESERVED_SIZE (8ULL << 20) |
98 | |||
98 | /* max vmids dedicated for process */ | 99 | /* max vmids dedicated for process */ |
99 | #define AMDGPU_VM_MAX_RESERVED_VMID 1 | 100 | #define AMDGPU_VM_MAX_RESERVED_VMID 1 |
100 | 101 | ||