drm/radeon/kms: add r600 KMS support

This adds the r600 KMS + CS support to the Linux kernel.

The r600 TTM support is quite basic and still needs more
work esp around using interrupts, but the polled fencing
should work okay for now.

Also currently TTM is using memcpy to do VRAM moves,
the code is here to use a 3D blit to do this, but
isn't fully debugged yet.

Authors:
Alex Deucher <alexdeucher@gmail.com>
Dave Airlie <airlied@redhat.com>
Jerome Glisse <jglisse@redhat.com>

Signed-off-by: Jerome Glisse <jglisse@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

1 files changed, 49 insertions, 5 deletions

diff --git a/drivers/gpu/drm/radeon/radeon_fence.c b/drivers/gpu/drm/radeon/radeon_fence.c
index b4e48dd2e859..506dd4dd3a24 100644
--- a/drivers/gpu/drm/radeon/radeon_fence.c
+++ b/drivers/gpu/drm/radeon/radeon_fence.c
@@ -53,9 +53,9 @@ int radeon_fence_emit(struct radeon_device *rdev, struct radeon_fence *fence)
                  * away
                  */
                 WREG32(rdev->fence_drv.scratch_reg, fence->seq);
-        } else {
+        } else
                 radeon_fence_ring_emit(rdev, fence);
-        }
+
         fence->emited = true;
         fence->timeout = jiffies + ((2000 * HZ) / 1000);
         list_del(&fence->list);
@@ -168,7 +168,47 @@ bool radeon_fence_signaled(struct radeon_fence *fence)
         return signaled;
 }
 
-int radeon_fence_wait(struct radeon_fence *fence, bool interruptible)
+int r600_fence_wait(struct radeon_fence *fence,  bool intr, bool lazy)
+{
+        struct radeon_device *rdev;
+        unsigned long cur_jiffies;
+        unsigned long timeout;
+        int ret = 0;
+
+        cur_jiffies = jiffies;
+        timeout = HZ / 100;
+
+        if (time_after(fence->timeout, cur_jiffies)) {
+                timeout = fence->timeout - cur_jiffies;
+        }
+
+        rdev = fence->rdev;
+
+        __set_current_state(intr ? TASK_INTERRUPTIBLE : TASK_UNINTERRUPTIBLE);
+
+        while (1) {
+                if (radeon_fence_signaled(fence))
+                        break;
+
+                if (time_after_eq(jiffies, timeout)) {
+                        ret = -EBUSY;
+                        break;
+                }
+
+                if (lazy)
+                        schedule_timeout(1);
+
+                if (intr && signal_pending(current)) {
+                        ret = -ERESTART;
+                        break;
+                }
+        }
+        __set_current_state(TASK_RUNNING);
+        return ret;
+}
+
+
+int radeon_fence_wait(struct radeon_fence *fence, bool intr)
 {
         struct radeon_device *rdev;
         unsigned long cur_jiffies;
@@ -176,7 +216,6 @@ int radeon_fence_wait(struct radeon_fence *fence, bool interruptible)
         bool expired = false;
         int r;
 
-
         if (fence == NULL) {
                 WARN(1, "Querying an invalid fence : %p !\n", fence);
                 return 0;
@@ -185,13 +224,18 @@ int radeon_fence_wait(struct radeon_fence *fence, bool interruptible)
         if (radeon_fence_signaled(fence)) {
                 return 0;
         }
+
+        if (rdev->family >= CHIP_R600)
+                return r600_fence_wait(fence, intr, 0);
+
 retry:
         cur_jiffies = jiffies;
         timeout = HZ / 100;
         if (time_after(fence->timeout, cur_jiffies)) {
                 timeout = fence->timeout - cur_jiffies;
         }
-        if (interruptible) {
+
+        if (intr) {
                 r = wait_event_interruptible_timeout(rdev->fence_drv.queue,
                                 radeon_fence_signaled(fence), timeout);
                 if (unlikely(r == -ERESTARTSYS)) {