Attachment 84432 Details for Bug 68298 – Patch to rework the exec_list trick

[patch] Patch to rework the exec_list trick

better.patch (text/plain), 1.09 KB, created by Daniel Vetter on 2013-08-22 07:18:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Vetter

Created: 2013-08-22 07:18:00 UTC

Size: 1.09 KB

patch

obsolete

>diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
>index ef92c69..e0bff07 100644
>--- a/drivers/gpu/drm/i915/i915_gem.c
>+++ b/drivers/gpu/drm/i915/i915_gem.c
>@@ -2616,6 +2616,9 @@ int i915_vma_unbind(struct i915_vma *vma)
> 	drm_i915_private_t *dev_priv = obj->base.dev->dev_private;
> 	int ret;
> 
>+	/* For now we only ever use 1 vma per object */
>+	WARN_ON(!list_is_singular(&obj->vma_list));
>+
> 	if (list_empty(&vma->vma_link))
> 		return 0;
> 
>@@ -2661,7 +2664,9 @@ int i915_vma_unbind(struct i915_vma *vma)
> 	drm_mm_remove_node(&vma->node);
> 
> destroy:
>-	i915_gem_vma_destroy(vma);
>+	/* Keep the vma as a placeholder in the execbuffer reservation lists */
>+	if (!list_empty(&vma->exec_list))
>+		i915_gem_vma_destroy(vma);
> 
> 	/* Since the unbound list is global, only move to that list if
> 	 * no more VMAs exist.
>@@ -4171,10 +4176,6 @@ void i915_gem_vma_destroy(struct i915_vma *vma)
> 	WARN_ON(vma->node.allocated);
> 	list_del(&vma->vma_link);
> 
>-	/* Keep the vma as a placeholder in the execbuffer reservation lists */
>-	if (!list_empty(&vma->exec_list))
>-		return;
>-
> 	kfree(vma);
> }
>

Actions: View | Splinter Review

Attachments on bug 68298: 84297 | 84370 | 84432 | 84445 | 84499

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.