Attachment 92396 Details for Bug 73696 – Stall for pending unpin, including debug messages

[patch] Stall for pending unpin, including debug messages

edeadlk.diff (text/plain), 1.24 KB, created by Chris Wilson on 2014-01-19 14:33:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Wilson

Created: 2014-01-19 14:33:17 UTC

Size: 1.24 KB

patch

obsolete

>diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
>index 41d5a99..9318c68 100644
>--- a/drivers/gpu/drm/i915/i915_gem.c
>+++ b/drivers/gpu/drm/i915/i915_gem.c
>@@ -3214,7 +3214,7 @@ i915_find_fence_reg(struct drm_device *dev)
> 	}
> 
> 	if (avail == NULL)
>-		return NULL;
>+		return ERR_PTR(-EDEADLK);
> 
> 	/* None available, try to steal one or wait for a user to finish */
> 	list_for_each_entry(reg, &dev_priv->mm.fence_list, lru_list) {
>@@ -3224,7 +3224,23 @@ i915_find_fence_reg(struct drm_device *dev)
> 		return reg;
> 	}
> 
>-	return NULL;
>+	DRM_ERROR("no free fences..\n");
>+	{
>+		struct intel_crtc *crtc;
>+
>+		list_for_each_entry(crtc, &dev->mode_config.crtc_list, base.head) {
>+			if (atomic_read(&crtc->unpin_work_count) == 0)
>+				continue;
>+
>+			if (crtc->unpin_work)
>+				intel_wait_for_vblank(dev, crtc->pipe);
>+
>+			DRM_ERROR("pending flip, try again\n");
>+			return ERR_PTR(-EAGAIN);
>+		}
>+	}
>+
>+	return ERR_PTR(-EDEADLK);
> }
> 
> /**
>@@ -3269,8 +3285,8 @@ i915_gem_object_get_fence(struct drm_i915_gem_object *obj)
> 		}
> 	} else if (enable) {
> 		reg = i915_find_fence_reg(dev);
>-		if (reg == NULL)
>-			return -EDEADLK;
>+		if (IS_ERR(reg))
>+			return PTR_ERR(reg);
> 
> 		if (reg->obj) {
> 			struct drm_i915_gem_object *old = reg->obj;

Actions: View | Splinter Review

Attachments on bug 73696: 92219 | 92220 | 92232 | 92252 | 92311 | 92362 | 92363 | 92396 | 92397 | 92407

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.