Skip to content

Commit

Permalink
drm/i915: Completely disable fence pipelining.
Browse files Browse the repository at this point in the history
I'm still seeing tiling corruption of PutImage and CopyArea (I think)
under mutter on pnv, so obviously the pipelining logic is deeply flawed.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
  • Loading branch information
Chris Wilson committed Dec 5, 2010
1 parent 0cdab21 commit 6bda10d
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions drivers/gpu/drm/i915/i915_gem.c
Original file line number Diff line number Diff line change
Expand Up @@ -2484,6 +2484,9 @@ i915_gem_object_get_fence(struct drm_i915_gem_object *obj,
struct drm_i915_fence_reg *reg;
int ret;

/* XXX disable pipelining. There are bugs. Shocking. */
pipelined = NULL;

/* Just update our place in the LRU if our fence is getting reused. */
if (obj->fence_reg != I915_FENCE_REG_NONE) {
reg = &dev_priv->fence_regs[obj->fence_reg];
Expand Down Expand Up @@ -2556,9 +2559,8 @@ i915_gem_object_get_fence(struct drm_i915_gem_object *obj,
if (old->tiling_mode)
i915_gem_release_mmap(old);

/* XXX The pipelined change over appears to be incoherent. */
ret = i915_gem_object_flush_fence(old,
NULL, //pipelined,
pipelined,
interruptible);
if (ret) {
drm_gem_object_unreference(&old->base);
Expand Down

0 comments on commit 6bda10d

Please sign in to comment.