radeon: setup the ring buffer fetcher to be less agressive.

Signed-off-by: Dave Airlie <airlied@linux.ie>

1 files changed, 13 insertions, 2 deletions

diff --git a/drivers/char/drm/radeon_cp.c b/drivers/char/drm/radeon_cp.c
index e16294c039e4..020323bd1626 100644
--- a/drivers/char/drm/radeon_cp.c
+++ b/drivers/char/drm/radeon_cp.c
@@ -1190,9 +1190,15 @@ static void radeon_cp_init_ring_buffer(struct drm_device * dev,
         /* Set ring buffer size */
 #ifdef __BIG_ENDIAN
         RADEON_WRITE(RADEON_CP_RB_CNTL,
-                     dev_priv->ring.size_l2qw | RADEON_BUF_SWAP_32BIT);
+                     RADEON_BUF_SWAP_32BIT |
+                     (dev_priv->ring.fetch_size_l2ow << 18) |
+                     (dev_priv->ring.rptr_update_l2qw << 8) |
+                     dev_priv->ring.size_l2qw);
 #else
-        RADEON_WRITE(RADEON_CP_RB_CNTL, dev_priv->ring.size_l2qw);
+        RADEON_WRITE(RADEON_CP_RB_CNTL,
+                     (dev_priv->ring.fetch_size_l2ow << 18) |
+                     (dev_priv->ring.rptr_update_l2qw << 8) |
+                     dev_priv->ring.size_l2qw);
 #endif
 
         /* Start with assuming that writeback doesn't work */
@@ -1663,6 +1669,11 @@ static int radeon_do_init_cp(struct drm_device * dev, drm_radeon_init_t * init)
         dev_priv->ring.size = init->ring_size;
         dev_priv->ring.size_l2qw = drm_order(init->ring_size / 8);
 
+        dev_priv->ring.rptr_update = /* init->rptr_update */ 4096;
+        dev_priv->ring.rptr_update_l2qw = drm_order( /* init->rptr_update */ 4096 / 8);
+
+        dev_priv->ring.fetch_size = /* init->fetch_size */ 32;
+        dev_priv->ring.fetch_size_l2ow = drm_order( /* init->fetch_size */ 32 / 16);
         dev_priv->ring.tail_mask = (dev_priv->ring.size / sizeof(u32)) - 1;
 
         dev_priv->ring.high_mark = RADEON_RING_HIGH_MARK;