Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[linux.git] / drivers / gpu / drm / amd / amdgpu / amdgpu_gart.c

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c
index 0db933026722f9b17eaf50187aeb8dfbf6aa4a19..c5a9a4fb10d2bde0767b8f76d95d633e5f44709f 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c
@@ -71,7 +71,7 @@
  */
 static int amdgpu_gart_dummy_page_init(struct amdgpu_device *adev)
 {
-       struct page *dummy_page = ttm_bo_glob.dummy_read_page;
+       struct page *dummy_page = ttm_glob.dummy_read_page;
 
        if (adev->dummy_page_addr)
                return 0;
@@ -126,6 +126,8 @@ int amdgpu_gart_table_vram_alloc(struct amdgpu_device *adev)
                        AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS;
                bp.type = ttm_bo_type_kernel;
                bp.resv = NULL;
+               bp.bo_ptr_size = sizeof(struct amdgpu_bo);
+
                r = amdgpu_bo_create(adev, &bp, &adev->gart.bo);
                if (r) {
                        return r;
@@ -202,6 +204,7 @@ void amdgpu_gart_table_vram_free(struct amdgpu_device *adev)
                return;
        }
        amdgpu_bo_unref(&adev->gart.bo);
+       adev->gart.ptr = NULL;
 }
 
 /*
@@ -236,9 +239,6 @@ int amdgpu_gart_unbind(struct amdgpu_device *adev, uint64_t offset,
        t = offset / AMDGPU_GPU_PAGE_SIZE;
        p = t / AMDGPU_GPU_PAGES_IN_CPU_PAGE;
        for (i = 0; i < pages; i++, p++) {
-#ifdef CONFIG_DRM_AMDGPU_GART_DEBUGFS
-               adev->gart.pages[p] = NULL;
-#endif
                page_base = adev->dummy_page_addr;
                if (!adev->gart.ptr)
                        continue;
@@ -312,9 +312,6 @@ int amdgpu_gart_bind(struct amdgpu_device *adev, uint64_t offset,
                     int pages, struct page **pagelist, dma_addr_t *dma_addr,
                     uint64_t flags)
 {
-#ifdef CONFIG_DRM_AMDGPU_GART_DEBUGFS
-       unsigned t,p;
-#endif
        int r, i;
 
        if (!adev->gart.ready) {
@@ -322,13 +319,6 @@ int amdgpu_gart_bind(struct amdgpu_device *adev, uint64_t offset,
                return -EINVAL;
        }
 
-#ifdef CONFIG_DRM_AMDGPU_GART_DEBUGFS
-       t = offset / AMDGPU_GPU_PAGE_SIZE;
-       p = t / AMDGPU_GPU_PAGES_IN_CPU_PAGE;
-       for (i = 0; i < pages; i++, p++)
-               adev->gart.pages[p] = pagelist ? pagelist[i] : NULL;
-#endif
-
        if (!adev->gart.ptr)
                return 0;
 
@@ -373,14 +363,6 @@ 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_DRM_AMDGPU_GART_DEBUGFS
-       /* Allocate pages table */
-       adev->gart.pages = vzalloc(array_size(sizeof(void *),
-                                             adev->gart.num_cpu_pages));
-       if (adev->gart.pages == NULL)
-               return -ENOMEM;
-#endif
-
        return 0;
 }
 
@@ -393,9 +375,5 @@ int amdgpu_gart_init(struct amdgpu_device *adev)
  */
 void amdgpu_gart_fini(struct amdgpu_device *adev)
 {
-#ifdef CONFIG_DRM_AMDGPU_GART_DEBUGFS
-       vfree(adev->gart.pages);
-       adev->gart.pages = NULL;
-#endif
        amdgpu_gart_dummy_page_fini(adev);
 }