diff options
author | John Harrison <John.C.Harrison@Intel.com> | 2015-05-29 12:44:11 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-06-23 08:02:32 -0400 |
commit | bccca494f75cbad4ea2d09e8205cab09ee610f6a (patch) | |
tree | fc37db62cd2dcbbc91230b3bdefc605b7d779bee /drivers/gpu/drm/i915/intel_ringbuffer.c | |
parent | 59c35a4d120ef5e34e91f2bccdfcf9e27a3b9397 (diff) |
drm/i915: Remove the now obsolete 'outstanding_lazy_request'
The outstanding_lazy_request is no longer used anywhere in the driver.
Everything that was looking at it now has a request explicitly passed in from on
high. Everything that was relying upon it behind the scenes is now explicitly
creating/passing/submitting its own private request. Thus the OLR can be
removed.
For: VIZ-5115
Signed-off-by: John Harrison <John.C.Harrison@Intel.com>
Reviewed-by: Tomas Elf <tomas.elf@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_ringbuffer.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_ringbuffer.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c index a378360d0461..af7c12ed0ba7 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.c +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c | |||
@@ -2101,7 +2101,6 @@ void intel_cleanup_ring_buffer(struct intel_engine_cs *ring) | |||
2101 | 2101 | ||
2102 | intel_unpin_ringbuffer_obj(ringbuf); | 2102 | intel_unpin_ringbuffer_obj(ringbuf); |
2103 | intel_destroy_ringbuffer_obj(ringbuf); | 2103 | intel_destroy_ringbuffer_obj(ringbuf); |
2104 | i915_gem_request_assign(&ring->outstanding_lazy_request, NULL); | ||
2105 | 2104 | ||
2106 | if (ring->cleanup) | 2105 | if (ring->cleanup) |
2107 | ring->cleanup(ring); | 2106 | ring->cleanup(ring); |
@@ -2176,11 +2175,6 @@ int intel_ring_idle(struct intel_engine_cs *ring) | |||
2176 | { | 2175 | { |
2177 | struct drm_i915_gem_request *req; | 2176 | struct drm_i915_gem_request *req; |
2178 | 2177 | ||
2179 | /* We need to add any requests required to flush the objects and ring */ | ||
2180 | WARN_ON(ring->outstanding_lazy_request); | ||
2181 | if (ring->outstanding_lazy_request) | ||
2182 | i915_add_request(ring->outstanding_lazy_request); | ||
2183 | |||
2184 | /* Wait upon the last request to be completed */ | 2178 | /* Wait upon the last request to be completed */ |
2185 | if (list_empty(&ring->request_list)) | 2179 | if (list_empty(&ring->request_list)) |
2186 | return 0; | 2180 | return 0; |
@@ -2339,8 +2333,6 @@ void intel_ring_init_seqno(struct intel_engine_cs *ring, u32 seqno) | |||
2339 | struct drm_device *dev = ring->dev; | 2333 | struct drm_device *dev = ring->dev; |
2340 | struct drm_i915_private *dev_priv = dev->dev_private; | 2334 | struct drm_i915_private *dev_priv = dev->dev_private; |
2341 | 2335 | ||
2342 | BUG_ON(ring->outstanding_lazy_request); | ||
2343 | |||
2344 | if (INTEL_INFO(dev)->gen == 6 || INTEL_INFO(dev)->gen == 7) { | 2336 | if (INTEL_INFO(dev)->gen == 6 || INTEL_INFO(dev)->gen == 7) { |
2345 | I915_WRITE(RING_SYNC_0(ring->mmio_base), 0); | 2337 | I915_WRITE(RING_SYNC_0(ring->mmio_base), 0); |
2346 | I915_WRITE(RING_SYNC_1(ring->mmio_base), 0); | 2338 | I915_WRITE(RING_SYNC_1(ring->mmio_base), 0); |