drm/radeon: add initial support for R6xx/R7xx GPUs

This adds support for 2D/Xv acceleration in the X.org 2D driver,
to the drm. It doesn't yet provide any 3D support hooks.

Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

1 files changed, 26 insertions, 16 deletions

diff --git a/drivers/gpu/drm/radeon/radeon_state.c b/drivers/gpu/drm/radeon/radeon_state.c
index 043293ae6e48..ca00cef4502d 100644
--- a/drivers/gpu/drm/radeon/radeon_state.c
+++ b/drivers/gpu/drm/radeon/radeon_state.c
@@ -1556,9 +1556,15 @@ static void radeon_cp_discard_buffer(struct drm_device *dev, struct drm_master *
         buf_priv->age = ++master_priv->sarea_priv->last_dispatch;
 
         /* Emit the vertex buffer age */
-        BEGIN_RING(2);
-        RADEON_DISPATCH_AGE(buf_priv->age);
-        ADVANCE_RING();
+        if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_R600) {
+                BEGIN_RING(3);
+                R600_DISPATCH_AGE(buf_priv->age);
+                ADVANCE_RING();
+        } else {
+                BEGIN_RING(2);
+                RADEON_DISPATCH_AGE(buf_priv->age);
+                ADVANCE_RING();
+        }
 
         buf->pending = 1;
         buf->used = 0;
@@ -2473,24 +2479,25 @@ static int radeon_cp_indirect(struct drm_device *dev, void *data, struct drm_fil
 
         buf->used = indirect->end;
 
-        /* Wait for the 3D stream to idle before the indirect buffer
-         * containing 2D acceleration commands is processed.
-         */
-        BEGIN_RING(2);
-
-        RADEON_WAIT_UNTIL_3D_IDLE();
-
-        ADVANCE_RING();
-
         /* Dispatch the indirect buffer full of commands from the
          * X server.  This is insecure and is thus only available to
          * privileged clients.
          */
-        radeon_cp_dispatch_indirect(dev, buf, indirect->start, indirect->end);
-        if (indirect->discard) {
-                radeon_cp_discard_buffer(dev, file_priv->master, buf);
+        if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_R600)
+                r600_cp_dispatch_indirect(dev, buf, indirect->start, indirect->end);
+        else {
+                /* Wait for the 3D stream to idle before the indirect buffer
+                 * containing 2D acceleration commands is processed.
+                 */
+                BEGIN_RING(2);
+                RADEON_WAIT_UNTIL_3D_IDLE();
+                ADVANCE_RING();
+                radeon_cp_dispatch_indirect(dev, buf, indirect->start, indirect->end);
         }
 
+        if (indirect->discard)
+                radeon_cp_discard_buffer(dev, file_priv->master, buf);
+
         COMMIT_RING();
         return 0;
 }
@@ -3052,7 +3059,10 @@ static int radeon_cp_getparam(struct drm_device *dev, void *data, struct drm_fil
         case RADEON_PARAM_SCRATCH_OFFSET:
                 if (!dev_priv->writeback_works)
                         return -EINVAL;
-                value = RADEON_SCRATCH_REG_OFFSET;
+                if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_R600)
+                        value = R600_SCRATCH_REG_OFFSET;
+                else
+                        value = RADEON_SCRATCH_REG_OFFSET;
                 break;
         case RADEON_PARAM_CARD_TYPE:
                 if (dev_priv->flags & RADEON_IS_PCIE)