Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / drivers / gpu / drm / nouveau / nouveau_fence.c

diff --git a/drivers/gpu/drm/nouveau/nouveau_fence.c b/drivers/gpu/drm/nouveau/nouveau_fence.c
index faddf53ff9ed79f0804735c151a28c3fb2d9a7ec..87ac21ec23d290db82e90c6fe6257e4cffdb5955 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_fence.c
+++ b/drivers/gpu/drm/nouveau/nouveau_fence.c
@@ -64,13 +64,15 @@ nouveau_fence_update(struct nouveau_channel *chan)
        struct nouveau_fence *fence;
        uint32_t sequence;
 
+       spin_lock(&chan->fence.lock);
+
        if (USE_REFCNT)
                sequence = nvchan_rd32(chan, 0x48);
        else
-               sequence = chan->fence.last_sequence_irq;
+               sequence = atomic_read(&chan->fence.last_sequence_irq);
 
        if (chan->fence.sequence_ack == sequence)
-               return;
+               goto out;
        chan->fence.sequence_ack = sequence;
 
        list_for_each_safe(entry, tmp, &chan->fence.pending) {
@@ -84,6 +86,8 @@ nouveau_fence_update(struct nouveau_channel *chan)
                if (sequence == chan->fence.sequence_ack)
                        break;
        }
+out:
+       spin_unlock(&chan->fence.lock);
 }
 
 int
@@ -119,7 +123,6 @@ nouveau_fence_emit(struct nouveau_fence *fence)
 {
        struct drm_nouveau_private *dev_priv = fence->channel->dev->dev_private;
        struct nouveau_channel *chan = fence->channel;
-       unsigned long flags;
        int ret;
 
        ret = RING_SPACE(chan, 2);
@@ -127,9 +130,7 @@ nouveau_fence_emit(struct nouveau_fence *fence)
                return ret;
 
        if (unlikely(chan->fence.sequence == chan->fence.sequence_ack - 1)) {
-               spin_lock_irqsave(&chan->fence.lock, flags);
                nouveau_fence_update(chan);
-               spin_unlock_irqrestore(&chan->fence.lock, flags);
 
                BUG_ON(chan->fence.sequence ==
                       chan->fence.sequence_ack - 1);
@@ -138,9 +139,9 @@ nouveau_fence_emit(struct nouveau_fence *fence)
        fence->sequence = ++chan->fence.sequence;
 
        kref_get(&fence->refcount);
-       spin_lock_irqsave(&chan->fence.lock, flags);
+       spin_lock(&chan->fence.lock);
        list_add_tail(&fence->entry, &chan->fence.pending);
-       spin_unlock_irqrestore(&chan->fence.lock, flags);
+       spin_unlock(&chan->fence.lock);
 
        BEGIN_RING(chan, NvSubSw, USE_REFCNT ? 0x0050 : 0x0150, 1);
        OUT_RING(chan, fence->sequence);
@@ -173,14 +174,11 @@ nouveau_fence_signalled(void *sync_obj, void *sync_arg)
 {
        struct nouveau_fence *fence = nouveau_fence(sync_obj);
        struct nouveau_channel *chan = fence->channel;
-       unsigned long flags;
 
        if (fence->signalled)
                return true;
 
-       spin_lock_irqsave(&chan->fence.lock, flags);
        nouveau_fence_update(chan);
-       spin_unlock_irqrestore(&chan->fence.lock, flags);
        return fence->signalled;
 }
 
@@ -190,8 +188,6 @@ nouveau_fence_wait(void *sync_obj, void *sync_arg, bool lazy, bool intr)
        unsigned long timeout = jiffies + (3 * DRM_HZ);
        int ret = 0;
 
-       __set_current_state(intr ? TASK_INTERRUPTIBLE : TASK_UNINTERRUPTIBLE);
-
        while (1) {
                if (nouveau_fence_signalled(sync_obj, sync_arg))
                        break;
@@ -201,6 +197,8 @@ nouveau_fence_wait(void *sync_obj, void *sync_arg, bool lazy, bool intr)
                        break;
                }
 
+               __set_current_state(intr ? TASK_INTERRUPTIBLE
+                       : TASK_UNINTERRUPTIBLE);
                if (lazy)
                        schedule_timeout(1);
 
@@ -221,27 +219,12 @@ nouveau_fence_flush(void *sync_obj, void *sync_arg)
        return 0;
 }
 
-void
-nouveau_fence_handler(struct drm_device *dev, int channel)
-{
-       struct drm_nouveau_private *dev_priv = dev->dev_private;
-       struct nouveau_channel *chan = NULL;
-
-       if (channel >= 0 && channel < dev_priv->engine.fifo.channels)
-               chan = dev_priv->fifos[channel];
-
-       if (chan) {
-               spin_lock_irq(&chan->fence.lock);
-               nouveau_fence_update(chan);
-               spin_unlock_irq(&chan->fence.lock);
-       }
-}
-
 int
 nouveau_fence_init(struct nouveau_channel *chan)
 {
        INIT_LIST_HEAD(&chan->fence.pending);
        spin_lock_init(&chan->fence.lock);
+       atomic_set(&chan->fence.last_sequence_irq, 0);
        return 0;
 }