|
@@ -301,7 +301,7 @@ static int init_ring_common(struct intel_ring_buffer *ring)
|
|
|
|
|
|
I915_WRITE_CTL(ring,
|
|
I915_WRITE_CTL(ring,
|
|
((ring->size - PAGE_SIZE) & RING_NR_PAGES)
|
|
((ring->size - PAGE_SIZE) & RING_NR_PAGES)
|
|
- | RING_REPORT_64K | RING_VALID);
|
|
|
|
|
|
+ | RING_VALID);
|
|
|
|
|
|
/* If the head is still not zero, the ring is dead */
|
|
/* If the head is still not zero, the ring is dead */
|
|
if ((I915_READ_CTL(ring) & RING_VALID) == 0 ||
|
|
if ((I915_READ_CTL(ring) & RING_VALID) == 0 ||
|
|
@@ -1132,18 +1132,6 @@ int intel_wait_ring_buffer(struct intel_ring_buffer *ring, int n)
|
|
struct drm_device *dev = ring->dev;
|
|
struct drm_device *dev = ring->dev;
|
|
struct drm_i915_private *dev_priv = dev->dev_private;
|
|
struct drm_i915_private *dev_priv = dev->dev_private;
|
|
unsigned long end;
|
|
unsigned long end;
|
|
- u32 head;
|
|
|
|
-
|
|
|
|
- /* If the reported head position has wrapped or hasn't advanced,
|
|
|
|
- * fallback to the slow and accurate path.
|
|
|
|
- */
|
|
|
|
- head = intel_read_status_page(ring, 4);
|
|
|
|
- if (head > ring->head) {
|
|
|
|
- ring->head = head;
|
|
|
|
- ring->space = ring_space(ring);
|
|
|
|
- if (ring->space >= n)
|
|
|
|
- return 0;
|
|
|
|
- }
|
|
|
|
|
|
|
|
trace_i915_ring_wait_begin(ring);
|
|
trace_i915_ring_wait_begin(ring);
|
|
if (drm_core_check_feature(dev, DRIVER_GEM))
|
|
if (drm_core_check_feature(dev, DRIVER_GEM))
|