diff options
author | Christian König <christian.koenig@amd.com> | 2017-03-30 08:41:19 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2017-04-04 23:33:50 -0400 |
commit | eb60ef2b4d77c591539f1cf4af2f0c2022d57689 (patch) | |
tree | 53697d0db5fb4e303a6d88a6c8c21a0593474c22 /drivers/gpu/drm/amd/amdgpu | |
parent | 5a9b8e8a0bb45836d3678466cae325728127a5ba (diff) |
drm/amdgpu: move VM related defines into amdgpu_vm.h
Try to clean up amdgpu.h.
Reviewed-by: Junwei Zhang <Jerry.Zhang@amd.com>
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>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu.h | 8 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h index a90b49a15335..46c22e7df99d 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h | |||
@@ -122,14 +122,6 @@ extern int amdgpu_param_buf_per_se; | |||
122 | /* max number of IP instances */ | 122 | /* max number of IP instances */ |
123 | #define AMDGPU_MAX_SDMA_INSTANCES 2 | 123 | #define AMDGPU_MAX_SDMA_INSTANCES 2 |
124 | 124 | ||
125 | /* max number of VMHUB */ | ||
126 | #define AMDGPU_MAX_VMHUBS 2 | ||
127 | #define AMDGPU_GFXHUB 0 | ||
128 | #define AMDGPU_MMHUB 1 | ||
129 | |||
130 | /* hardcode that limit for now */ | ||
131 | #define AMDGPU_VA_RESERVED_SIZE (8 << 20) | ||
132 | |||
133 | /* hard reset data */ | 125 | /* hard reset data */ |
134 | #define AMDGPU_ASIC_RESET_DATA 0x39d5e86b | 126 | #define AMDGPU_ASIC_RESET_DATA 0x39d5e86b |
135 | 127 | ||
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h index fbe17bf73a00..2c2996c161f1 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | |||
@@ -76,6 +76,14 @@ struct amdgpu_bo_list_entry; | |||
76 | #define AMDGPU_VM_FAULT_STOP_FIRST 1 | 76 | #define AMDGPU_VM_FAULT_STOP_FIRST 1 |
77 | #define AMDGPU_VM_FAULT_STOP_ALWAYS 2 | 77 | #define AMDGPU_VM_FAULT_STOP_ALWAYS 2 |
78 | 78 | ||
79 | /* max number of VMHUB */ | ||
80 | #define AMDGPU_MAX_VMHUBS 2 | ||
81 | #define AMDGPU_GFXHUB 0 | ||
82 | #define AMDGPU_MMHUB 1 | ||
83 | |||
84 | /* hardcode that limit for now */ | ||
85 | #define AMDGPU_VA_RESERVED_SIZE (8 << 20) | ||
86 | |||
79 | struct amdgpu_vm_pt { | 87 | struct amdgpu_vm_pt { |
80 | struct amdgpu_bo *bo; | 88 | struct amdgpu_bo *bo; |
81 | uint64_t addr; | 89 | uint64_t addr; |