|
@@ -238,7 +238,7 @@ void amdgpu_gart_unbind(struct amdgpu_device *adev, unsigned offset,
|
|
|
t = offset / AMDGPU_GPU_PAGE_SIZE;
|
|
|
p = t / (PAGE_SIZE / AMDGPU_GPU_PAGE_SIZE);
|
|
|
for (i = 0; i < pages; i++, p++) {
|
|
|
-#ifdef CONFIG_AMDGPU_GART_DEBUGFS
|
|
|
+#ifdef CONFIG_DRM_AMDGPU_GART_DEBUGFS
|
|
|
adev->gart.pages[p] = NULL;
|
|
|
#endif
|
|
|
page_base = adev->dummy_page.addr;
|
|
@@ -286,7 +286,7 @@ int amdgpu_gart_bind(struct amdgpu_device *adev, unsigned offset,
|
|
|
p = t / (PAGE_SIZE / AMDGPU_GPU_PAGE_SIZE);
|
|
|
|
|
|
for (i = 0; i < pages; i++, p++) {
|
|
|
-#ifdef CONFIG_AMDGPU_GART_DEBUGFS
|
|
|
+#ifdef CONFIG_DRM_AMDGPU_GART_DEBUGFS
|
|
|
adev->gart.pages[p] = pagelist[i];
|
|
|
#endif
|
|
|
if (adev->gart.ptr) {
|
|
@@ -331,7 +331,7 @@ int amdgpu_gart_init(struct amdgpu_device *adev)
|
|
|
DRM_INFO("GART: num cpu pages %u, num gpu pages %u\n",
|
|
|
adev->gart.num_cpu_pages, adev->gart.num_gpu_pages);
|
|
|
|
|
|
-#ifdef CONFIG_AMDGPU_GART_DEBUGFS
|
|
|
+#ifdef CONFIG_DRM_AMDGPU_GART_DEBUGFS
|
|
|
/* Allocate pages table */
|
|
|
adev->gart.pages = vzalloc(sizeof(void *) * adev->gart.num_cpu_pages);
|
|
|
if (adev->gart.pages == NULL) {
|
|
@@ -357,7 +357,7 @@ void amdgpu_gart_fini(struct amdgpu_device *adev)
|
|
|
amdgpu_gart_unbind(adev, 0, adev->gart.num_cpu_pages);
|
|
|
}
|
|
|
adev->gart.ready = false;
|
|
|
-#ifdef CONFIG_AMDGPU_GART_DEBUGFS
|
|
|
+#ifdef CONFIG_DRM_AMDGPU_GART_DEBUGFS
|
|
|
vfree(adev->gart.pages);
|
|
|
adev->gart.pages = NULL;
|
|
|
#endif
|