drm/i915: Remove 'outstanding_lazy_seqno'

[deliverable/linux.git] / drivers / gpu / drm / i915 / intel_ringbuffer.h

diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.h b/drivers/gpu/drm/i915/intel_ringbuffer.h
index dbac132a5cdf568d124d3c1fbfedcc267195abc7..2a84bd9688a8718a7b6c3209998bd1196374808a 100644 (file)
--- a/drivers/gpu/drm/i915/intel_ringbuffer.h
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.h
@@ -267,8 +267,7 @@ struct  intel_engine_cs {
        /**
         * Do we have some not yet emitted requests outstanding?
         */
-       struct drm_i915_gem_request *preallocated_lazy_request;
-       u32 outstanding_lazy_seqno;
+       struct drm_i915_gem_request *outstanding_lazy_request;
        bool gpu_caches_dirty;
        bool fbc_dirty;
 
@@ -436,17 +435,11 @@ static inline u32 intel_ring_get_tail(struct intel_ringbuffer *ringbuf)
        return ringbuf->tail;
 }
 
-static inline u32 intel_ring_get_seqno(struct intel_engine_cs *ring)
-{
-       BUG_ON(ring->outstanding_lazy_seqno == 0);
-       return ring->outstanding_lazy_seqno;
-}
-
 static inline struct drm_i915_gem_request *
 intel_ring_get_request(struct intel_engine_cs *ring)
 {
-       BUG_ON(ring->preallocated_lazy_request == NULL);
-       return ring->preallocated_lazy_request;
+       BUG_ON(ring->outstanding_lazy_request == NULL);
+       return ring->outstanding_lazy_request;
 }
 
 static inline void i915_trace_irq_get(struct intel_engine_cs *ring, u32 seqno)