diff options
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 3b9b250ceac4..e594435eec9d 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c | |||
@@ -2485,13 +2485,9 @@ static int i915_ring_idle(struct intel_ring_buffer *ring) | |||
2485 | u32 seqno; | 2485 | u32 seqno; |
2486 | int ret; | 2486 | int ret; |
2487 | 2487 | ||
2488 | /* We need to add any requests required to flush the objects */ | 2488 | /* We need to add any requests required to flush the objects and ring */ |
2489 | if (!list_empty(&ring->active_list)) { | 2489 | if (ring->outstanding_lazy_request) { |
2490 | seqno = list_entry(ring->active_list.prev, | 2490 | ret = i915_add_request(ring, NULL, NULL); |
2491 | struct drm_i915_gem_object, | ||
2492 | ring_list)->last_read_seqno; | ||
2493 | |||
2494 | ret = i915_gem_check_olr(ring, seqno); | ||
2495 | if (ret) | 2491 | if (ret) |
2496 | return ret; | 2492 | return ret; |
2497 | } | 2493 | } |