diff options
| author | Jonathan Gray <jsg@jsg.id.au> | 2013-03-03 14:51:55 +1100 |
|---|---|---|
| committer | Jonathan Gray <jsg@jsg.id.au> | 2013-03-03 14:51:55 +1100 |
| commit | c861914e096a972cbda27b23d9db9db1bc9c1092 (patch) | |
| tree | 540713d74da6464b3ea7553532e82ac6e599b7dc /sys/dev/pci | |
| parent | ecd97f3687eb7da66429f4daa5af554c2440655b (diff) | |
sync intel_ring_idle with 3.4.33
Diffstat (limited to 'sys/dev/pci')
| -rw-r--r-- | sys/dev/pci/drm/intel_ringbuffer.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/sys/dev/pci/drm/intel_ringbuffer.c b/sys/dev/pci/drm/intel_ringbuffer.c index 4b9db35cf0f..28a6e258ccf 100644 --- a/sys/dev/pci/drm/intel_ringbuffer.c +++ b/sys/dev/pci/drm/intel_ringbuffer.c @@ -1514,17 +1514,8 @@ intel_wrap_ring_buffer(struct intel_ring_buffer *ring) int intel_ring_idle(struct intel_ring_buffer *ring) { - u32 seqno; int ret; - /* We need to add any requests required to flush the objects and ring */ - if (ring->outstanding_lazy_request) { - ret = i915_add_request(ring, NULL, NULL); - if (ret) - return ret; - } - - /* Wait upon the last request to be completed */ if (list_empty(&ring->gpu_write_list) && list_empty(&ring->active_list)) return 0; @@ -1535,11 +1526,7 @@ intel_ring_idle(struct intel_ring_buffer *ring) return ret; } - seqno = list_entry(ring->request_list.prev, - struct drm_i915_gem_request, - list)->seqno; - - return i915_wait_seqno(ring, seqno); + return i915_wait_seqno(ring, i915_gem_next_request_seqno(ring)); } #if 0 |