1 files changed, 17 insertions, 49 deletions

diff --git a/drivers/gpu/drm/radeon/radeon_fence.c b/drivers/gpu/drm/radeon/radeon_fence.c
index 3beb26d74719..d90f95b405c5 100644
--- a/drivers/gpu/drm/radeon/radeon_fence.c
+++ b/drivers/gpu/drm/radeon/radeon_fence.c
@@ -33,6 +33,7 @@
 #include <linux/wait.h>
 #include <linux/list.h>
 #include <linux/kref.h>
+#include <linux/slab.h>
 #include "drmP.h"
 #include "drm.h"
 #include "radeon_reg.h"
@@ -140,16 +141,15 @@ int radeon_fence_create(struct radeon_device *rdev, struct radeon_fence **fence)
 
 bool radeon_fence_signaled(struct radeon_fence *fence)
 {
-        struct radeon_device *rdev = fence->rdev;
         unsigned long irq_flags;
         bool signaled = false;
 
-        if (rdev->gpu_lockup) {
+        if (!fence)
                 return true;
-        }
-        if (fence == NULL) {
+
+        if (fence->rdev->gpu_lockup)
                 return true;
-        }
+
         write_lock_irqsave(&fence->rdev->fence_drv.lock, irq_flags);
         signaled = fence->signaled;
         /* if we are shuting down report all fence as signaled */
@@ -168,37 +168,6 @@ bool radeon_fence_signaled(struct radeon_fence *fence)
         return signaled;
 }
 
-int r600_fence_wait(struct radeon_fence *fence,  bool intr, bool lazy)
-{
-        struct radeon_device *rdev;
-        int ret = 0;
-
-        rdev = fence->rdev;
-
-        __set_current_state(intr ? TASK_INTERRUPTIBLE : TASK_UNINTERRUPTIBLE);
-
-        while (1) {
-                if (radeon_fence_signaled(fence))
-                        break;
-
-                if (time_after_eq(jiffies, fence->timeout)) {
-                        ret = -EBUSY;
-                        break;
-                }
-
-                if (lazy)
-                        schedule_timeout(1);
-
-                if (intr && signal_pending(current)) {
-                        ret = -ERESTARTSYS;
-                        break;
-                }
-        }
-        __set_current_state(TASK_RUNNING);
-        return ret;
-}
-
-
 int radeon_fence_wait(struct radeon_fence *fence, bool intr)
 {
         struct radeon_device *rdev;
@@ -216,13 +185,6 @@ int radeon_fence_wait(struct radeon_fence *fence, bool intr)
                 return 0;
         }
 
-        if (rdev->family >= CHIP_R600) {
-                r = r600_fence_wait(fence, intr, 0);
-                if (r == -ERESTARTSYS)
-                        return -EBUSY;
-                return r;
-        }
-
 retry:
         cur_jiffies = jiffies;
         timeout = HZ / 100;
@@ -231,14 +193,17 @@ retry:
         }
 
         if (intr) {
+                radeon_irq_kms_sw_irq_get(rdev);
                 r = wait_event_interruptible_timeout(rdev->fence_drv.queue,
                                 radeon_fence_signaled(fence), timeout);
-                if (unlikely(r == -ERESTARTSYS)) {
-                        return -EBUSY;
-                }
+                radeon_irq_kms_sw_irq_put(rdev);
+                if (unlikely(r < 0))
+                        return r;
         } else {
+                radeon_irq_kms_sw_irq_get(rdev);
                 r = wait_event_timeout(rdev->fence_drv.queue,
                          radeon_fence_signaled(fence), timeout);
+                radeon_irq_kms_sw_irq_put(rdev);
         }
         if (unlikely(!radeon_fence_signaled(fence))) {
                 if (unlikely(r == 0)) {
@@ -359,7 +324,7 @@ int radeon_fence_driver_init(struct radeon_device *rdev)
         write_lock_irqsave(&rdev->fence_drv.lock, irq_flags);
         r = radeon_scratch_get(rdev, &rdev->fence_drv.scratch_reg);
         if (r) {
-                DRM_ERROR("Fence failed to get a scratch register.");
+                dev_err(rdev->dev, "fence failed to get scratch register\n");
                 write_unlock_irqrestore(&rdev->fence_drv.lock, irq_flags);
                 return r;
         }
@@ -370,9 +335,10 @@ int radeon_fence_driver_init(struct radeon_device *rdev)
         INIT_LIST_HEAD(&rdev->fence_drv.signaled);
         rdev->fence_drv.count_timeout = 0;
         init_waitqueue_head(&rdev->fence_drv.queue);
+        rdev->fence_drv.initialized = true;
         write_unlock_irqrestore(&rdev->fence_drv.lock, irq_flags);
         if (radeon_debugfs_fence_init(rdev)) {
-                DRM_ERROR("Failed to register debugfs file for fence !\n");
+                dev_err(rdev->dev, "fence debugfs file creation failed\n");
         }
         return 0;
 }
@@ -381,11 +347,13 @@ void radeon_fence_driver_fini(struct radeon_device *rdev)
 {
         unsigned long irq_flags;
 
+        if (!rdev->fence_drv.initialized)
+                return;
         wake_up_all(&rdev->fence_drv.queue);
         write_lock_irqsave(&rdev->fence_drv.lock, irq_flags);
         radeon_scratch_free(rdev, rdev->fence_drv.scratch_reg);
         write_unlock_irqrestore(&rdev->fence_drv.lock, irq_flags);
-        DRM_INFO("radeon: fence finalized\n");
+        rdev->fence_drv.initialized = false;
 }