WebSVN – Kolibri OS – Diff – /drivers/video/drm/radeon/radeon_fence.c

 		WREG32(rdev->fence_drv.scratch_reg, fence->seq);
 	} else
 		radeon_fence_ring_emit(rdev, fence);
-	fence->emited = true;
-	fence->timeout = jiffies + ((2000 * HZ) / 1000);
+	fence->emited = true;
 	list_del(&fence->list);
 	list_add_tail(&fence->list, &rdev->fence_drv.emited);
 	write_unlock_irqrestore(&rdev->fence_drv.lock, irq_flags);
 	return 0;
+{
 	struct radeon_fence *fence;
 	struct list_head *i, *n;
 	uint32_t seq;
 	bool wake = false;
+	unsigned long cjiffies;
-	if (rdev == NULL) {
+	if (rdev->wb.enabled) {
-		return true;
-	}
+		u32 scratch_index;
+		if (rdev->wb.use_event)
-	if (rdev->shutdown) {
+			scratch_index = R600_WB_EVENT_OFFSET + rdev->fence_drv.scratch_reg - rdev->scratch.reg_base;
+		else
+			scratch_index = RADEON_WB_SCRATCH_OFFSET + rdev->fence_drv.scratch_reg - rdev->scratch.reg_base;
-		return true;
+		seq = rdev->wb.wb[scratch_index/4];
 	} else
+	seq = RREG32(rdev->fence_drv.scratch_reg);
-	seq = RREG32(rdev->fence_drv.scratch_reg);
+	if (seq != rdev->fence_drv.last_seq) {
+		rdev->fence_drv.last_seq = seq;
+		rdev->fence_drv.last_jiffies = jiffies;
+		rdev->fence_drv.last_timeout = RADEON_FENCE_JIFFIES_TIMEOUT;
+	} else {
+		cjiffies = jiffies;
+		if (time_after(cjiffies, rdev->fence_drv.last_jiffies)) {
+			cjiffies -= rdev->fence_drv.last_jiffies;
+			if (time_after(rdev->fence_drv.last_timeout, cjiffies)) {
+				/* update the timeout */
+				rdev->fence_drv.last_timeout -= cjiffies;
+			} else {
+				/* the 500ms timeout is elapsed we should test
+				 * for GPU lockup
+				 */
+				rdev->fence_drv.last_timeout = 1;
+			}
+		} else {
+			/* wrap around update last jiffies, we will just wait
+			 * a little longer
+			 */
+			rdev->fence_drv.last_jiffies = cjiffies;
+	}
+		return false;
 	rdev->fence_drv.last_seq = seq;
 	n = NULL;
 	list_for_each(i, &rdev->fence_drv.emited) {
 		fence = list_entry(i, struct radeon_fence, list);
 		if (fence->seq == seq) {
+}
 int radeon_fence_wait(struct radeon_fence *fence, bool intr)
+{
-	struct radeon_device *rdev;
-	unsigned long cur_jiffies;
+	struct radeon_device *rdev;
-	unsigned long timeout;
+	unsigned long irq_flags, timeout;
-	bool expired = false;
+	u32 seq;
 	int r;
 	if (fence == NULL) {
 		WARN(1, "Querying an invalid fence : %p !\n", fence);
 		return 0;
+	}
 	rdev = fence->rdev;
 	if (radeon_fence_signaled(fence)) {
-		return 0;
+		return 0;
+	}
-retry:
-	cur_jiffies = jiffies;
+	timeout = rdev->fence_drv.last_timeout;
-	timeout = HZ / 100;
+retry:
-	if (time_after(fence->timeout, cur_jiffies)) {
-		timeout = fence->timeout - cur_jiffies;
 	/* save current sequence used to check for GPU lockup */
 	seq = rdev->fence_drv.last_seq;
 	if (intr) {
 		radeon_irq_kms_sw_irq_get(rdev);
 		r = wait_event_interruptible_timeout(rdev->fence_drv.queue,
 				radeon_fence_signaled(fence), timeout);
 		radeon_irq_kms_sw_irq_put(rdev);
+		if (unlikely(r < 0)) {
-		if (unlikely(r < 0))
+			return r;
 			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))) {
+		/* we were interrupted for some reason and fence isn't
-	}
+		 * isn't signaled yet, resume wait
-	if (unlikely(!radeon_fence_signaled(fence))) {
+		 */
+		if (r) {
-		if (unlikely(r == 0)) {
+			timeout = r;
-			expired = true;
-		}
-		if (unlikely(expired)) {
+			goto retry;
-			timeout = 1;
+		}
-			if (time_after(cur_jiffies, fence->timeout)) {
+		/* don't protect read access to rdev->fence_drv.last_seq
+		 * if we experiencing a lockup the value doesn't change
-				timeout = cur_jiffies - fence->timeout;
+		 */
+		if (seq == rdev->fence_drv.last_seq && radeon_gpu_is_lockup(rdev)) {
-			}
+			/* good news we believe it's a lockup */
-			timeout = jiffies_to_msecs(timeout);
+			WARN(1, "GPU lockup (waiting for 0x%08X last fence id 0x%08X)\n",
-			if (timeout > 500) {
+			     fence->seq, seq);
+			/* FIXME: what should we do ? marking everyone
-				DRM_ERROR("fence(%p:0x%08X) %lums timeout "
+			 * as signaled for now
-					  "going to reset GPU\n",
+			 */
+			rdev->gpu_lockup = true;
+			r = radeon_gpu_reset(rdev);
-					  fence, fence->seq, timeout);
+			if (r)
+				return r;
-				radeon_gpu_reset(rdev);
+				WREG32(rdev->fence_drv.scratch_reg, fence->seq);
-				WREG32(rdev->fence_drv.scratch_reg, fence->seq);
+			rdev->gpu_lockup = false;
+			}
+		timeout = RADEON_FENCE_JIFFIES_TIMEOUT;
+		write_lock_irqsave(&rdev->fence_drv.lock, irq_flags);
+		rdev->fence_drv.last_timeout = RADEON_FENCE_JIFFIES_TIMEOUT;
 		rdev->fence_drv.last_jiffies = jiffies;
 		write_unlock_irqrestore(&rdev->fence_drv.lock, irq_flags);
-		goto retry;
-	}
-	if (unlikely(expired)) {
-		rdev->fence_drv.count_timeout++;
-		cur_jiffies = jiffies;
-		timeout = 1;
-		if (time_after(cur_jiffies, fence->timeout)) {
-			timeout = cur_jiffies - fence->timeout;
-		}
-		timeout = jiffies_to_msecs(timeout);
-		DRM_ERROR("fence(%p:0x%08X) %lums timeout\n",
-			  fence, fence->seq, timeout);
-		DRM_ERROR("last signaled fence(0x%08X)\n",
-			  rdev->fence_drv.last_seq);
+		goto retry;
+	}
 	return 0;
+}
 	WREG32(rdev->fence_drv.scratch_reg, 0);
 	atomic_set(&rdev->fence_drv.seq, 0);
 	INIT_LIST_HEAD(&rdev->fence_drv.created);
 	INIT_LIST_HEAD(&rdev->fence_drv.emited);
 	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)) {
 		dev_err(rdev->dev, "fence debugfs file creation failed\n");

Subversion Repositories Kolibri OS

(root)/drivers/video/drm/radeon/radeon_fence.c – Rev 1404 → 1963