Merge branches 'pm-core', 'pm-qos', 'pm-domains' and 'pm-opp'

[linux.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 f2f348f0160c845d628cfdb0fa85e76cf4f4f490..88ee60d1b907012cb2ae1ccc7dad3e89f9233a02 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_fence.c
+++ b/drivers/gpu/drm/nouveau/nouveau_fence.c
@@ -330,7 +330,7 @@ nouveau_fence_wait_legacy(struct dma_fence *f, bool intr, long wait)
                __set_current_state(intr ? TASK_INTERRUPTIBLE :
                                           TASK_UNINTERRUPTIBLE);
 
-               kt = ktime_set(0, sleep_time);
+               kt = sleep_time;
                schedule_hrtimeout(&kt, HRTIMER_MODE_REL);
                sleep_time *= 2;
                if (sleep_time > NSEC_PER_MSEC)
@@ -527,7 +527,7 @@ static bool nouveau_fence_no_signaling(struct dma_fence *f)
         * caller should have a reference on the fence,
         * else fence could get freed here
         */
-       WARN_ON(atomic_read(&fence->base.refcount.refcount) <= 1);
+       WARN_ON(kref_read(&fence->base.refcount) <= 1);
 
        /*
         * This needs uevents to work correctly, but dma_fence_add_callback relies on