Skip to content

Commit

Permalink
drm/i915: Fix regression in ba3d8d7
Browse files Browse the repository at this point in the history
I pulled the wrong version of the patch from Daniel Vetter which was
missing the read barriers -- and the one that was causing all the trouble
was from i915_gem_object_put_fence_reg(), leading to GPU hangs on gen3.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
  • Loading branch information
Chris Wilson committed Sep 14, 2010
1 parent 7213342 commit 0bc23aa
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions drivers/gpu/drm/i915/i915_gem.c
Original file line number Diff line number Diff line change
Expand Up @@ -2430,12 +2430,16 @@ i915_gem_object_put_fence_reg(struct drm_gem_object *obj)
int ret;

ret = i915_gem_object_flush_gpu_write_domain(obj, false);
if (ret != 0)
if (ret)
return ret;

ret = i915_gem_object_wait_rendering(obj);
if (ret)
return ret;
}

i915_gem_object_flush_gtt_write_domain(obj);
i915_gem_clear_fence_reg (obj);
i915_gem_clear_fence_reg(obj);

return 0;
}
Expand Down

0 comments on commit 0bc23aa

Please sign in to comment.