1 files changed, 11 insertions, 13 deletions

diff --git a/drivers/gpu/drm/radeon/rs600.c b/drivers/gpu/drm/radeon/rs600.c
index 9320dd6404f..b1053d64042 100644
--- a/drivers/gpu/drm/radeon/rs600.c
+++ b/drivers/gpu/drm/radeon/rs600.c
@@ -62,6 +62,7 @@ u32 rs600_page_flip(struct radeon_device *rdev, int crtc_id, u64 crtc_base)
 {
         struct radeon_crtc *radeon_crtc = rdev->mode_info.crtcs[crtc_id];
         u32 tmp = RREG32(AVIVO_D1GRPH_UPDATE + radeon_crtc->crtc_offset);
+        int i;
 
         /* Lock the graphics update lock */
         tmp |= AVIVO_D1GRPH_UPDATE_LOCK;
@@ -74,7 +75,11 @@ u32 rs600_page_flip(struct radeon_device *rdev, int crtc_id, u64 crtc_base)
                (u32)crtc_base);
 
         /* Wait for update_pending to go high. */
-        while (!(RREG32(AVIVO_D1GRPH_UPDATE + radeon_crtc->crtc_offset) & AVIVO_D1GRPH_SURFACE_UPDATE_PENDING));
+        for (i = 0; i < rdev->usec_timeout; i++) {
+                if (RREG32(AVIVO_D1GRPH_UPDATE + radeon_crtc->crtc_offset) & AVIVO_D1GRPH_SURFACE_UPDATE_PENDING)
+                        break;
+                udelay(1);
+        }
         DRM_DEBUG("Update pending now high. Unlocking vupdate_lock.\n");
 
         /* Unlock the lock, so double-buffering can take place inside vblank */
@@ -287,6 +292,7 @@ void rs600_hpd_init(struct radeon_device *rdev)
                 default:
                         break;
                 }
+                radeon_hpd_set_polarity(rdev, radeon_connector->hpd.hpd);
         }
         if (rdev->irq.installed)
                 rs600_irq_set(rdev);
@@ -413,7 +419,7 @@ int rs600_gart_init(struct radeon_device *rdev)
 {
         int r;
 
-        if (rdev->gart.table.vram.robj) {
+        if (rdev->gart.robj) {
                 WARN(1, "RS600 GART already initialized\n");
                 return 0;
         }
@@ -431,7 +437,7 @@ static int rs600_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;
         }
@@ -494,20 +500,12 @@ static int rs600_gart_enable(struct radeon_device *rdev)
 void rs600_gart_disable(struct radeon_device *rdev)
 {
         u32 tmp;
-        int r;
 
         /* FIXME: disable out of gart access */
         WREG32_MC(R_000100_MC_PT0_CNTL, 0);
         tmp = RREG32_MC(R_000009_MC_CNTL1);
         WREG32_MC(R_000009_MC_CNTL1, tmp & C_000009_ENABLE_PAGE_TABLES);
-        if (rdev->gart.table.vram.robj) {
-                r = radeon_bo_reserve(rdev->gart.table.vram.robj, false);
-                if (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 rs600_gart_fini(struct radeon_device *rdev)
@@ -525,7 +523,7 @@ void rs600_gart_fini(struct radeon_device *rdev)
 
 int rs600_gart_set_page(struct radeon_device *rdev, int i, uint64_t addr)
 {
-        void __iomem *ptr = (void *)rdev->gart.table.vram.ptr;
+        void __iomem *ptr = (void *)rdev->gart.ptr;
 
         if (i < 0 || i > rdev->gart.num_gpu_pages) {
                 return -EINVAL;