1 files changed, 14 insertions, 10 deletions

diff --git a/drivers/gpu/drm/radeon/radeon_ring.c b/drivers/gpu/drm/radeon/radeon_ring.c
index 261e98a276db..08c0233db1b8 100644
--- a/drivers/gpu/drm/radeon/radeon_ring.c
+++ b/drivers/gpu/drm/radeon/radeon_ring.c
@@ -151,7 +151,7 @@ int radeon_ib_schedule(struct radeon_device *rdev, struct radeon_ib *ib)
         /* 64 dwords should be enough for fence too */
         r = radeon_ring_lock(rdev, 64);
         if (r) {
-                DRM_ERROR("radeon: scheduling IB failled (%d).\n", r);
+                DRM_ERROR("radeon: scheduling IB failed (%d).\n", r);
                 return r;
         }
         radeon_ring_ib_execute(rdev, ib);
@@ -175,9 +175,9 @@ int radeon_ib_pool_init(struct radeon_device *rdev)
                 return 0;
         INIT_LIST_HEAD(&rdev->ib_pool.bogus_ib);
         /* Allocate 1M object buffer */
-        r = radeon_bo_create(rdev, NULL,  RADEON_IB_POOL_SIZE*64*1024,
-                                true, RADEON_GEM_DOMAIN_GTT,
-                                &rdev->ib_pool.robj);
+        r = radeon_bo_create(rdev, RADEON_IB_POOL_SIZE*64*1024,
+                             PAGE_SIZE, true, RADEON_GEM_DOMAIN_GTT,
+                             &rdev->ib_pool.robj);
         if (r) {
                 DRM_ERROR("radeon: failed to ib pool (%d).\n", r);
                 return r;
@@ -194,7 +194,7 @@ int radeon_ib_pool_init(struct radeon_device *rdev)
         r = radeon_bo_kmap(rdev->ib_pool.robj, &ptr);
         radeon_bo_unreserve(rdev->ib_pool.robj);
         if (r) {
-                DRM_ERROR("radeon: failed to map ib poll (%d).\n", r);
+                DRM_ERROR("radeon: failed to map ib pool (%d).\n", r);
                 return r;
         }
         for (i = 0; i < RADEON_IB_POOL_SIZE; i++) {
@@ -247,10 +247,14 @@ void radeon_ib_pool_fini(struct radeon_device *rdev)
  */
 void radeon_ring_free_size(struct radeon_device *rdev)
 {
-        if (rdev->family >= CHIP_R600)
-                rdev->cp.rptr = RREG32(R600_CP_RB_RPTR);
-        else
-                rdev->cp.rptr = RREG32(RADEON_CP_RB_RPTR);
+        if (rdev->wb.enabled)
+                rdev->cp.rptr = le32_to_cpu(rdev->wb.wb[RADEON_WB_CP_RPTR_OFFSET/4]);
+        else {
+                if (rdev->family >= CHIP_R600)
+                        rdev->cp.rptr = RREG32(R600_CP_RB_RPTR);
+                else
+                        rdev->cp.rptr = RREG32(RADEON_CP_RB_RPTR);
+        }
         /* This works because ring_size is a power of 2 */
         rdev->cp.ring_free_dw = (rdev->cp.rptr + (rdev->cp.ring_size / 4));
         rdev->cp.ring_free_dw -= rdev->cp.wptr;
@@ -328,7 +332,7 @@ int radeon_ring_init(struct radeon_device *rdev, unsigned ring_size)
         rdev->cp.ring_size = ring_size;
         /* Allocate ring buffer */
         if (rdev->cp.ring_obj == NULL) {
-                r = radeon_bo_create(rdev, NULL, rdev->cp.ring_size, true,
+                r = radeon_bo_create(rdev, rdev->cp.ring_size, PAGE_SIZE, true,
                                         RADEON_GEM_DOMAIN_GTT,
                                         &rdev->cp.ring_obj);
                 if (r) {