diff options
author | Christian König <christian.koenig@amd.com> | 2016-09-25 10:10:06 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2016-09-28 16:16:26 -0400 |
commit | 186294f9c57856887b0efe3ce0dd8ca66605caef (patch) | |
tree | f5f4b0b319ba19f33efebbec85b9c855e7d8a49e | |
parent | 85a4b5798f587eab48327aa156fd5c22358e9086 (diff) |
drm/amdgpu: fix GART_DEBUGFS define
Obviously missed during the rename.
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_gart.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c index 921bce2df0b0..c977773b8911 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | |||
@@ -238,7 +238,7 @@ void amdgpu_gart_unbind(struct amdgpu_device *adev, unsigned offset, | |||
238 | t = offset / AMDGPU_GPU_PAGE_SIZE; | 238 | t = offset / AMDGPU_GPU_PAGE_SIZE; |
239 | p = t / (PAGE_SIZE / AMDGPU_GPU_PAGE_SIZE); | 239 | p = t / (PAGE_SIZE / AMDGPU_GPU_PAGE_SIZE); |
240 | for (i = 0; i < pages; i++, p++) { | 240 | for (i = 0; i < pages; i++, p++) { |
241 | #ifdef CONFIG_AMDGPU_GART_DEBUGFS | 241 | #ifdef CONFIG_DRM_AMDGPU_GART_DEBUGFS |
242 | adev->gart.pages[p] = NULL; | 242 | adev->gart.pages[p] = NULL; |
243 | #endif | 243 | #endif |
244 | page_base = adev->dummy_page.addr; | 244 | page_base = adev->dummy_page.addr; |
@@ -286,7 +286,7 @@ int amdgpu_gart_bind(struct amdgpu_device *adev, unsigned offset, | |||
286 | p = t / (PAGE_SIZE / AMDGPU_GPU_PAGE_SIZE); | 286 | p = t / (PAGE_SIZE / AMDGPU_GPU_PAGE_SIZE); |
287 | 287 | ||
288 | for (i = 0; i < pages; i++, p++) { | 288 | for (i = 0; i < pages; i++, p++) { |
289 | #ifdef CONFIG_AMDGPU_GART_DEBUGFS | 289 | #ifdef CONFIG_DRM_AMDGPU_GART_DEBUGFS |
290 | adev->gart.pages[p] = pagelist[i]; | 290 | adev->gart.pages[p] = pagelist[i]; |
291 | #endif | 291 | #endif |
292 | if (adev->gart.ptr) { | 292 | if (adev->gart.ptr) { |
@@ -331,7 +331,7 @@ int amdgpu_gart_init(struct amdgpu_device *adev) | |||
331 | DRM_INFO("GART: num cpu pages %u, num gpu pages %u\n", | 331 | DRM_INFO("GART: num cpu pages %u, num gpu pages %u\n", |
332 | adev->gart.num_cpu_pages, adev->gart.num_gpu_pages); | 332 | adev->gart.num_cpu_pages, adev->gart.num_gpu_pages); |
333 | 333 | ||
334 | #ifdef CONFIG_AMDGPU_GART_DEBUGFS | 334 | #ifdef CONFIG_DRM_AMDGPU_GART_DEBUGFS |
335 | /* Allocate pages table */ | 335 | /* Allocate pages table */ |
336 | adev->gart.pages = vzalloc(sizeof(void *) * adev->gart.num_cpu_pages); | 336 | adev->gart.pages = vzalloc(sizeof(void *) * adev->gart.num_cpu_pages); |
337 | if (adev->gart.pages == NULL) { | 337 | if (adev->gart.pages == NULL) { |
@@ -357,7 +357,7 @@ void amdgpu_gart_fini(struct amdgpu_device *adev) | |||
357 | amdgpu_gart_unbind(adev, 0, adev->gart.num_cpu_pages); | 357 | amdgpu_gart_unbind(adev, 0, adev->gart.num_cpu_pages); |
358 | } | 358 | } |
359 | adev->gart.ready = false; | 359 | adev->gart.ready = false; |
360 | #ifdef CONFIG_AMDGPU_GART_DEBUGFS | 360 | #ifdef CONFIG_DRM_AMDGPU_GART_DEBUGFS |
361 | vfree(adev->gart.pages); | 361 | vfree(adev->gart.pages); |
362 | adev->gart.pages = NULL; | 362 | adev->gart.pages = NULL; |
363 | #endif | 363 | #endif |