diff options
| author | Jonathan Gray <jsg@jsg.id.au> | 2013-03-06 22:29:35 +1100 |
|---|---|---|
| committer | Jonathan Gray <jsg@jsg.id.au> | 2013-03-06 22:29:35 +1100 |
| commit | 88d7b9fdfb3e21b47536684660d022981d98464e (patch) | |
| tree | c64af8a75ab112d7f3a34b6ccc868e8e215ca48a /sys | |
| parent | 84ec419f5e6a413986a8565c3d1e76b89534263a (diff) | |
our request retiring is still done inside wait_seqno, drop surplus calls
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/pci/drm/intel_overlay.c | 2 | ||||
| -rw-r--r-- | sys/dev/pci/drm/intel_ringbuffer.c | 3 |
2 files changed, 0 insertions, 5 deletions
diff --git a/sys/dev/pci/drm/intel_overlay.c b/sys/dev/pci/drm/intel_overlay.c index e9039279520..a3bfb964cc9 100644 --- a/sys/dev/pci/drm/intel_overlay.c +++ b/sys/dev/pci/drm/intel_overlay.c @@ -296,7 +296,6 @@ intel_overlay_do_wait_request(struct intel_overlay *overlay, ret = i915_wait_seqno(ring, overlay->last_flip_req); if (ret) return ret; - i915_gem_retire_requests(dev_priv); overlay->last_flip_req = 0; return 0; @@ -449,7 +448,6 @@ intel_overlay_recover_from_interrupt(struct intel_overlay *overlay) ret = i915_wait_seqno(ring, overlay->last_flip_req); if (ret) return ret; - i915_gem_retire_requests(dev_priv); if (overlay->flip_tail) overlay->flip_tail(overlay); diff --git a/sys/dev/pci/drm/intel_ringbuffer.c b/sys/dev/pci/drm/intel_ringbuffer.c index 90ad07425ee..e73a4fed21d 100644 --- a/sys/dev/pci/drm/intel_ringbuffer.c +++ b/sys/dev/pci/drm/intel_ringbuffer.c @@ -1392,9 +1392,6 @@ intel_ring_wait_seqno(struct intel_ring_buffer *ring, u32 seqno) dev_priv->mm.interruptible = was_interruptible; - if (!ret) - i915_gem_retire_requests_ring(ring); - return ret; } |