1 files changed, 4 insertions, 12 deletions

diff --git a/drivers/gpu/drm/radeon/r300.c b/drivers/gpu/drm/radeon/r300.c
index 33f2b68c680b..400b26df652a 100644
--- a/drivers/gpu/drm/radeon/r300.c
+++ b/drivers/gpu/drm/radeon/r300.c
@@ -74,7 +74,7 @@ void rv370_pcie_gart_tlb_flush(struct radeon_device *rdev)
 
 int rv370_pcie_gart_set_page(struct radeon_device *rdev, int i, uint64_t addr)
 {
-        void __iomem *ptr = (void *)rdev->gart.table.vram.ptr;
+        void __iomem *ptr = rdev->gart.ptr;
 
         if (i < 0 || i > rdev->gart.num_gpu_pages) {
                 return -EINVAL;
@@ -93,7 +93,7 @@ int rv370_pcie_gart_init(struct radeon_device *rdev)
 {
         int r;
 
-        if (rdev->gart.table.vram.robj) {
+        if (rdev->gart.robj) {
                 WARN(1, "RV370 PCIE GART already initialized\n");
                 return 0;
         }
@@ -116,7 +116,7 @@ int rv370_pcie_gart_enable(struct radeon_device *rdev)
         uint32_t tmp;
         int r;
 
-        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;
         }
@@ -154,7 +154,6 @@ int rv370_pcie_gart_enable(struct radeon_device *rdev)
 void rv370_pcie_gart_disable(struct radeon_device *rdev)
 {
         u32 tmp;
-        int r;
 
         WREG32_PCIE(RADEON_PCIE_TX_GART_START_LO, 0);
         WREG32_PCIE(RADEON_PCIE_TX_GART_END_LO, 0);
@@ -163,14 +162,7 @@ void rv370_pcie_gart_disable(struct radeon_device *rdev)
         tmp = RREG32_PCIE(RADEON_PCIE_TX_GART_CNTL);
         tmp |= RADEON_PCIE_TX_GART_UNMAPPED_ACCESS_DISCARD;
         WREG32_PCIE(RADEON_PCIE_TX_GART_CNTL, tmp & ~RADEON_PCIE_TX_GART_EN);
-        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 rv370_pcie_gart_fini(struct radeon_device *rdev)