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

diff --cc drivers/gpu/drm/exynos/exynos_drm_fbdev.c
Simple merge

diff --cc drivers/gpu/drm/gma500/cdv_device.c
Simple merge

diff --cc drivers/gpu/drm/gma500/framebuffer.c
Simple merge

diff --cc drivers/gpu/drm/gma500/gtt.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_reg.h
Simple merge

diff --cc drivers/gpu/drm/i915/intel_display.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_ringbuffer.c
index ca3972f,5361915..fc66af6
--- 1/drivers/gpu/drm/i915/intel_ringbuffer.c
--- 2/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;
-       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;
-       }
 +      int ret;
 +
 +      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))

diff --cc drivers/gpu/drm/radeon/evergreen.c
Simple merge

diff --cc drivers/gpu/drm/radeon/ni.c
Simple merge

diff --cc drivers/gpu/drm/radeon/r100.c
Simple merge

diff --cc drivers/gpu/drm/radeon/r300.c
Simple merge

diff --cc drivers/gpu/drm/radeon/r420.c
Simple merge

diff --cc drivers/gpu/drm/radeon/r520.c
Simple merge

diff --cc drivers/gpu/drm/radeon/r600.c
Simple merge

diff --cc drivers/gpu/drm/radeon/r600_cs.c
Simple merge

diff --cc drivers/gpu/drm/radeon/r600d.h
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon_cs.c
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon_display.c
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon_fb.c
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon_ring.c
Simple merge

diff --cc drivers/gpu/drm/radeon/rs400.c
Simple merge

diff --cc drivers/gpu/drm/radeon/rs600.c
Simple merge

diff --cc drivers/gpu/drm/radeon/rs690.c
Simple merge

diff --cc drivers/gpu/drm/radeon/rv515.c
Simple merge

diff --cc drivers/gpu/drm/radeon/rv770.c
Simple merge