Merge branch 'sched/core'

[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 c5a9a4fb10d2bde0767b8f76d95d633e5f44709f..b36405170ff35fa876a6c6e7d4754b29a7b73e20 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c
@@ -60,7 +60,7 @@
  */
 
 /**
  */
 
 /**

- * amdgpu_dummy_page_init - init dummy page used by the driver
+ * amdgpu_gart_dummy_page_init - init dummy page used by the driver

  *
  * @adev: amdgpu_device pointer
  *
  *
  * @adev: amdgpu_device pointer
  *


@@ -86,13 +86,13 @@ static int amdgpu_gart_dummy_page_init(struct amdgpu_device *adev)
 }
 
 /**
 }
 
 /**

- * amdgpu_dummy_page_fini - free dummy page used by the driver
+ * amdgpu_gart_dummy_page_fini - free dummy page used by the driver

  *
  * @adev: amdgpu_device pointer
  *
  * Frees the dummy page used by the driver (all asics).
  */
  *
  * @adev: amdgpu_device pointer
  *
  * Frees the dummy page used by the driver (all asics).
  */

-static void amdgpu_gart_dummy_page_fini(struct amdgpu_device *adev)
+void amdgpu_gart_dummy_page_fini(struct amdgpu_device *adev)

 {
        if (!adev->dummy_page_addr)
                return;
 {
        if (!adev->dummy_page_addr)
                return;


@@ -250,7 +250,7 @@ int amdgpu_gart_unbind(struct amdgpu_device *adev, uint64_t offset,
                }
        }
        mb();
                }
        }
        mb();

-       amdgpu_asic_flush_hdp(adev, NULL);
+       amdgpu_device_flush_hdp(adev, NULL);

        for (i = 0; i < adev->num_vmhubs; i++)
                amdgpu_gmc_flush_gpu_tlb(adev, 0, i, 0);
 
        for (i = 0; i < adev->num_vmhubs; i++)
                amdgpu_gmc_flush_gpu_tlb(adev, 0, i, 0);
 


@@ -300,7 +300,6 @@ int amdgpu_gart_map(struct amdgpu_device *adev, uint64_t offset,
  * @adev: amdgpu_device pointer
  * @offset: offset into the GPU's gart aperture
  * @pages: number of pages to bind
  * @adev: amdgpu_device pointer
  * @offset: offset into the GPU's gart aperture
  * @pages: number of pages to bind

- * @pagelist: pages to bind

  * @dma_addr: DMA addresses of pages
  * @flags: page table entry flags
  *
  * @dma_addr: DMA addresses of pages
  * @flags: page table entry flags
  *


@@ -309,11 +308,9 @@ int amdgpu_gart_map(struct amdgpu_device *adev, uint64_t offset,
  * Returns 0 for success, -EINVAL for failure.
  */
 int amdgpu_gart_bind(struct amdgpu_device *adev, uint64_t offset,
  * Returns 0 for success, -EINVAL for failure.
  */
 int amdgpu_gart_bind(struct amdgpu_device *adev, uint64_t offset,

-                    int pages, struct page **pagelist, dma_addr_t *dma_addr,
+                    int pages, dma_addr_t *dma_addr,

                     uint64_t flags)
 {
                     uint64_t flags)
 {

-       int r, i;
-

        if (!adev->gart.ready) {
                WARN(1, "trying to bind memory to uninitialized GART !\n");
                return -EINVAL;
        if (!adev->gart.ready) {
                WARN(1, "trying to bind memory to uninitialized GART !\n");
                return -EINVAL;


@@ -322,16 +319,26 @@ int amdgpu_gart_bind(struct amdgpu_device *adev, uint64_t offset,
        if (!adev->gart.ptr)
                return 0;
 
        if (!adev->gart.ptr)
                return 0;
 

-       r = amdgpu_gart_map(adev, offset, pages, dma_addr, flags,
-                   adev->gart.ptr);
-       if (r)
-               return r;
+       return amdgpu_gart_map(adev, offset, pages, dma_addr, flags,
+                              adev->gart.ptr);
+}
+
+/**
+ * amdgpu_gart_invalidate_tlb - invalidate gart TLB
+ *
+ * @adev: amdgpu device driver pointer
+ *
+ * Invalidate gart TLB which can be use as a way to flush gart changes
+ *
+ */
+void amdgpu_gart_invalidate_tlb(struct amdgpu_device *adev)
+{
+       int i;

 
        mb();
 
        mb();

-       amdgpu_asic_flush_hdp(adev, NULL);
+       amdgpu_device_flush_hdp(adev, NULL);

        for (i = 0; i < adev->num_vmhubs; i++)
                amdgpu_gmc_flush_gpu_tlb(adev, 0, i, 0);
        for (i = 0; i < adev->num_vmhubs; i++)
                amdgpu_gmc_flush_gpu_tlb(adev, 0, i, 0);

-       return 0;

 }
 
 /**
 }
 
 /**


@@ -365,15 +372,3 @@ int amdgpu_gart_init(struct amdgpu_device *adev)
 
        return 0;
 }
 
        return 0;
 }

-
-/**
- * amdgpu_gart_fini - tear down the driver info for managing the gart
- *
- * @adev: amdgpu_device pointer
- *
- * Tear down the gart driver info and free the dummy page (all asics).
- */
-void amdgpu_gart_fini(struct amdgpu_device *adev)
-{
-       amdgpu_gart_dummy_page_fini(adev);
-}