From: Dave Airlie <airlied@redhat.com>
Date: Thu, 15 Mar 2012 10:24:32 +0000 (+0000)
Subject: drm: Merge tag 'v3.3-rc7' into drm-core-next
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8229c885fe361e521ac64de36b16011e54a30de0;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

drm: Merge tag 'v3.3-rc7' into drm-core-next

Merge the fixes so far into core-next, needed to test
intel driver.

Conflicts:
	drivers/gpu/drm/i915/intel_ringbuffer.c
---

8229c885fe361e521ac64de36b16011e54a30de0
diff --cc drivers/gpu/drm/i915/intel_ringbuffer.c
index ca3972f2c6f5,536191540b03..fc66af6a9448
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@@ -1190,23 -1132,6 +1190,11 @@@ int intel_wait_ring_buffer(struct intel
  	struct drm_device *dev = ring->dev;
  	struct drm_i915_private *dev_priv = dev->dev_private;
  	unsigned long end;
 +	int ret;
- 	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;
- 	}
 +
 +	ret = intel_ring_wait_request(ring, n);
 +	if (ret != -ENOSPC)
 +		return ret;
  
  	trace_i915_ring_wait_begin(ring);
  	if (drm_core_check_feature(dev, DRIVER_GEM))