drm/radeon: Print gart initialization details on all chipsets

This was previously done for r300 only. Use %016llX instead of %08X for
printing the table address.

Also fix typos in gart warning messages.

Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
Reviewed-by: Michel Dänzer <michel@daenzer.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>

9 files changed, 26 insertions, 4 deletions

diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c
index d8d71a399f52..0b517e16fd3a 100644
--- a/drivers/gpu/drm/radeon/evergreen.c
+++ b/drivers/gpu/drm/radeon/evergreen.c
@@ -910,6 +910,9 @@ int evergreen_pcie_gart_enable(struct radeon_device *rdev)
         WREG32(VM_CONTEXT1_CNTL, 0);
 
         evergreen_pcie_gart_tlb_flush(rdev);
+        DRM_INFO("PCIE GART of %uM enabled (table at 0x%016llX).\n",
+                 (unsigned)(rdev->mc.gtt_size >> 20),
+                 (unsigned long long)rdev->gart.table_addr);
         rdev->gart.ready = true;
         return 0;
 }
diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c
index a2e00fa9c618..3b8b849643d0 100644
--- a/drivers/gpu/drm/radeon/ni.c
+++ b/drivers/gpu/drm/radeon/ni.c
@@ -996,6 +996,9 @@ int cayman_pcie_gart_enable(struct radeon_device *rdev)
         WREG32(VM_CONTEXT1_CNTL, 0);
 
         cayman_pcie_gart_tlb_flush(rdev);
+        DRM_INFO("PCIE GART of %uM enabled (table at 0x%016llX).\n",
+                 (unsigned)(rdev->mc.gtt_size >> 20),
+                 (unsigned long long)rdev->gart.table_addr);
         rdev->gart.ready = true;
         return 0;
 }
diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
index f2204cb1ccdf..574f2c7c6dd9 100644
--- a/drivers/gpu/drm/radeon/r100.c
+++ b/drivers/gpu/drm/radeon/r100.c
@@ -513,6 +513,9 @@ int r100_pci_gart_enable(struct radeon_device *rdev)
         tmp = RREG32(RADEON_AIC_CNTL) | RADEON_PCIGART_TRANSLATE_EN;
         WREG32(RADEON_AIC_CNTL, tmp);
         r100_pci_gart_tlb_flush(rdev);
+        DRM_INFO("PCIE GART of %uM enabled (table at 0x%016llX).\n",
+                 (unsigned)(rdev->mc.gtt_size >> 20),
+                 (unsigned long long)rdev->gart.table_addr);
         rdev->gart.ready = true;
         return 0;
 }
diff --git a/drivers/gpu/drm/radeon/r300.c b/drivers/gpu/drm/radeon/r300.c
index 55a7f190027e..33f2b68c680b 100644
--- a/drivers/gpu/drm/radeon/r300.c
+++ b/drivers/gpu/drm/radeon/r300.c
@@ -144,8 +144,9 @@ int rv370_pcie_gart_enable(struct radeon_device *rdev)
         tmp |= RADEON_PCIE_TX_GART_UNMAPPED_ACCESS_DISCARD;
         WREG32_PCIE(RADEON_PCIE_TX_GART_CNTL, tmp);
         rv370_pcie_gart_tlb_flush(rdev);
-        DRM_INFO("PCIE GART of %uM enabled (table at 0x%08X).\n",
-                 (unsigned)(rdev->mc.gtt_size >> 20), table_addr);
+        DRM_INFO("PCIE GART of %uM enabled (table at 0x%016llX).\n",
+                 (unsigned)(rdev->mc.gtt_size >> 20),
+                 (unsigned long long)table_addr);
         rdev->gart.ready = true;
         return 0;
 }
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
index aa5571b73aa0..334aee6eab7c 100644
--- a/drivers/gpu/drm/radeon/r600.c
+++ b/drivers/gpu/drm/radeon/r600.c
@@ -993,6 +993,9 @@ int r600_pcie_gart_enable(struct radeon_device *rdev)
                 WREG32(VM_CONTEXT0_CNTL + (i * 4), 0);
 
         r600_pcie_gart_tlb_flush(rdev);
+        DRM_INFO("PCIE GART of %uM enabled (table at 0x%016llX).\n",
+                 (unsigned)(rdev->mc.gtt_size >> 20),
+                 (unsigned long long)rdev->gart.table_addr);
         rdev->gart.ready = true;
         return 0;
 }
diff --git a/drivers/gpu/drm/radeon/radeon_gart.c b/drivers/gpu/drm/radeon/radeon_gart.c
index a533f52fd163..fdc3a9a54bf8 100644
--- a/drivers/gpu/drm/radeon/radeon_gart.c
+++ b/drivers/gpu/drm/radeon/radeon_gart.c
@@ -142,7 +142,7 @@ void radeon_gart_unbind(struct radeon_device *rdev, unsigned offset,
         u64 page_base;
 
         if (!rdev->gart.ready) {
-                WARN(1, "trying to unbind memory to unitialized GART !\n");
+                WARN(1, "trying to unbind memory from uninitialized GART !\n");
                 return;
         }
         t = offset / RADEON_GPU_PAGE_SIZE;
@@ -174,7 +174,7 @@ int radeon_gart_bind(struct radeon_device *rdev, unsigned offset,
         int i, j;
 
         if (!rdev->gart.ready) {
-                WARN(1, "trying to bind memory to unitialized GART !\n");
+                WARN(1, "trying to bind memory to uninitialized GART !\n");
                 return -EINVAL;
         }
         t = offset / RADEON_GPU_PAGE_SIZE;
diff --git a/drivers/gpu/drm/radeon/rs400.c b/drivers/gpu/drm/radeon/rs400.c
index aa6a66eeb4ec..89a6e1ecea8d 100644
--- a/drivers/gpu/drm/radeon/rs400.c
+++ b/drivers/gpu/drm/radeon/rs400.c
@@ -182,6 +182,9 @@ int rs400_gart_enable(struct radeon_device *rdev)
         /* Enable gart */
         WREG32_MC(RS480_AGP_ADDRESS_SPACE_SIZE, (RS480_GART_EN | size_reg));
         rs400_gart_tlb_flush(rdev);
+        DRM_INFO("PCIE GART of %uM enabled (table at 0x%016llX).\n",
+                 (unsigned)(rdev->mc.gtt_size >> 20),
+                 (unsigned long long)rdev->gart.table_addr);
         rdev->gart.ready = true;
         return 0;
 }
diff --git a/drivers/gpu/drm/radeon/rs600.c b/drivers/gpu/drm/radeon/rs600.c
index 4b5d0e6974a8..9320dd6404f6 100644
--- a/drivers/gpu/drm/radeon/rs600.c
+++ b/drivers/gpu/drm/radeon/rs600.c
@@ -484,6 +484,9 @@ static int rs600_gart_enable(struct radeon_device *rdev)
         tmp = RREG32_MC(R_000009_MC_CNTL1);
         WREG32_MC(R_000009_MC_CNTL1, (tmp | S_000009_ENABLE_PAGE_TABLES(1)));
         rs600_gart_tlb_flush(rdev);
+        DRM_INFO("PCIE GART of %uM enabled (table at 0x%016llX).\n",
+                 (unsigned)(rdev->mc.gtt_size >> 20),
+                 (unsigned long long)rdev->gart.table_addr);
         rdev->gart.ready = true;
         return 0;
 }
diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c
index 4720d000d440..80928f9ff80f 100644
--- a/drivers/gpu/drm/radeon/rv770.c
+++ b/drivers/gpu/drm/radeon/rv770.c
@@ -161,6 +161,9 @@ int rv770_pcie_gart_enable(struct radeon_device *rdev)
                 WREG32(VM_CONTEXT0_CNTL + (i * 4), 0);
 
         r600_pcie_gart_tlb_flush(rdev);
+        DRM_INFO("PCIE GART of %uM enabled (table at 0x%016llX).\n",
+                 (unsigned)(rdev->mc.gtt_size >> 20),
+                 (unsigned long long)rdev->gart.table_addr);
         rdev->gart.ready = true;
         return 0;
 }