Attachment 32087 Details for Bug 25406 – kernel patch to fix fence flushing

[patch] kernel patch to fix fence flushing

fence_flushing_fix.patch (text/plain), 1.66 KB, created by Daniel Vetter on 2009-12-15 08:37:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Vetter

Created: 2009-12-15 08:37:53 UTC

Size: 1.66 KB

patch

obsolete

>commit d05e252b29764d83ecee678a61cb96b7b4eb238d
>Author: Daniel Vetter <daniel.vetter@ffwll.ch>
>Date:   Tue Dec 15 13:36:18 2009 +0100
>
>    drm/i915: fix order of fence release wrt flushing
>    
>    i915_gem_object_unbind had the ordering wrong. The other user,
>    i915_gem_object_put_fence_reg already has the correct ordering.
>    
>    Results was usually corrupted pixmaps, especially garbled font glyphs
>    after a suspend/resume (because this evicts everything).
>    
>    I'm still waiting for the feedback from the bug-reporters, but
>    because this obviously fixes a bug (at least for me) I'm already
>    submitting it.
>    
>    Bugzilla: FIXME
>    CC: stable@kernel.org
>    Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
>
>diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
>index 8c463cf..9e81a0d 100644
>--- a/drivers/gpu/drm/i915/i915_gem.c
>+++ b/drivers/gpu/drm/i915/i915_gem.c
>@@ -2021,9 +2021,6 @@ i915_gem_object_unbind(struct drm_gem_object *obj)
> 	/* blow away mappings if mapped through GTT */
> 	i915_gem_release_mmap(obj);
> 
>-	if (obj_priv->fence_reg != I915_FENCE_REG_NONE)
>-		i915_gem_clear_fence_reg(obj);
>-
> 	/* Move the object to the CPU domain to ensure that
> 	 * any possible CPU writes while it's not in the GTT
> 	 * are flushed when we go to remap it. This will
>@@ -2039,6 +2036,10 @@ i915_gem_object_unbind(struct drm_gem_object *obj)
> 
> 	BUG_ON(obj_priv->active);
> 
>+	/* release the fence reg _after_ flushing */
>+	if (obj_priv->fence_reg != I915_FENCE_REG_NONE)
>+		i915_gem_clear_fence_reg(obj);
>+
> 	if (obj_priv->agp_mem != NULL) {
> 		drm_unbind_agp(obj_priv->agp_mem);
> 		drm_free_agp(obj_priv->agp_mem, obj->size / PAGE_SIZE);

Actions: View | Splinter Review

Attachments on bug 25406: 31686 | 31754 | 31755 | 32087

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.