1 files changed, 3 insertions, 10 deletions

diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c
index a09049d15901..a983f410ab89 100644
--- a/drivers/gpu/drm/radeon/rv770.c
+++ b/drivers/gpu/drm/radeon/rv770.c
@@ -124,7 +124,7 @@ int rv770_pcie_gart_enable(struct radeon_device *rdev)
         u32 tmp;
         int r, i;
 
-        if (rdev->gart.table.vram.robj == NULL) {
+        if (rdev->gart.robj == NULL) {
                 dev_err(rdev->dev, "No VRAM object for PCIE GART.\n");
                 return -EINVAL;
         }
@@ -171,7 +171,7 @@ int rv770_pcie_gart_enable(struct radeon_device *rdev)
 void rv770_pcie_gart_disable(struct radeon_device *rdev)
 {
         u32 tmp;
-        int i, r;
+        int i;
 
         /* Disable all tables */
         for (i = 0; i < 7; i++)
@@ -191,14 +191,7 @@ void rv770_pcie_gart_disable(struct radeon_device *rdev)
         WREG32(MC_VM_MB_L1_TLB1_CNTL, tmp);
         WREG32(MC_VM_MB_L1_TLB2_CNTL, tmp);
         WREG32(MC_VM_MB_L1_TLB3_CNTL, tmp);
-        if (rdev->gart.table.vram.robj) {
-                r = radeon_bo_reserve(rdev->gart.table.vram.robj, false);
-                if (likely(r == 0)) {
-                        radeon_bo_kunmap(rdev->gart.table.vram.robj);
-                        radeon_bo_unpin(rdev->gart.table.vram.robj);
-                        radeon_bo_unreserve(rdev->gart.table.vram.robj);
-                }
-        }
+        radeon_gart_table_vram_unpin(rdev);
 }
 
 void rv770_pcie_gart_fini(struct radeon_device *rdev)