1 files changed, 30 insertions, 11 deletions

diff --git a/drivers/gpu/drm/radeon/rs600.c b/drivers/gpu/drm/radeon/rs600.c
index 1b8d62f5e73c..c31bd8439259 100644
--- a/drivers/gpu/drm/radeon/rs600.c
+++ b/drivers/gpu/drm/radeon/rs600.c
@@ -68,22 +68,35 @@ void rs600_gart_tlb_flush(struct radeon_device *rdev)
         tmp = RREG32_MC(RS600_MC_PT0_CNTL);
 }
 
-int rs600_gart_enable(struct radeon_device *rdev)
+int rs600_gart_init(struct radeon_device *rdev)
 {
-        uint32_t tmp;
-        int i;
         int r;
 
+        if (rdev->gart.table.vram.robj) {
+                WARN(1, "RS600 GART already initialized.\n");
+                return 0;
+        }
         /* Initialize common gart structure */
         r = radeon_gart_init(rdev);
         if (r) {
                 return r;
         }
         rdev->gart.table_size = rdev->gart.num_gpu_pages * 8;
-        r = radeon_gart_table_vram_alloc(rdev);
-        if (r) {
-                return r;
+        return radeon_gart_table_vram_alloc(rdev);
+}
+
+int rs600_gart_enable(struct radeon_device *rdev)
+{
+        uint32_t tmp;
+        int r, i;
+
+        if (rdev->gart.table.vram.robj == NULL) {
+                dev_err(rdev->dev, "No VRAM object for PCIE GART.\n");
+                return -EINVAL;
         }
+        r = radeon_gart_table_vram_pin(rdev);
+        if (r)
+                return r;
         /* FIXME: setup default page */
         WREG32_MC(RS600_MC_PT0_CNTL,
                  (RS600_EFFECTIVE_L2_CACHE_SIZE(6) |
@@ -138,8 +151,17 @@ void rs600_gart_disable(struct radeon_device *rdev)
         tmp = RREG32_MC(RS600_MC_CNTL1);
         tmp &= ~RS600_ENABLE_PAGE_TABLES;
         WREG32_MC(RS600_MC_CNTL1, tmp);
-        radeon_object_kunmap(rdev->gart.table.vram.robj);
-        radeon_object_unpin(rdev->gart.table.vram.robj);
+        if (rdev->gart.table.vram.robj) {
+                radeon_object_kunmap(rdev->gart.table.vram.robj);
+                radeon_object_unpin(rdev->gart.table.vram.robj);
+        }
+}
+
+void rs600_gart_fini(struct radeon_device *rdev)
+{
+        rs600_gart_disable(rdev);
+        radeon_gart_table_vram_free(rdev);
+        radeon_gart_fini(rdev);
 }
 
 #define R600_PTE_VALID     (1 << 0)
@@ -235,9 +257,6 @@ int rs600_mc_init(struct radeon_device *rdev)
 
 void rs600_mc_fini(struct radeon_device *rdev)
 {
-        rs600_gart_disable(rdev);
-        radeon_gart_table_vram_free(rdev);
-        radeon_gart_fini(rdev);
 }