Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued

Resync, and we need all the fancy new drm_mm stuff to implement more
efficient evict algorithms for softpin.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

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

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

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

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

diff --cc drivers/gpu/drm/i915/intel_sprite.c
index 91bcaff28f35d7d6839e1614ce1411e4eac8748d,8f131a08d440cf02cbcd9ffe255b94e3f4eb6077..63154a5a9305bc807b8025b981ba1d871152140a
--- 1/drivers/gpu/drm/i915/intel_sprite.c
--- 2/drivers/gpu/drm/i915/intel_sprite.c
+++ b/drivers/gpu/drm/i915/intel_sprite.c
@@@ -445,21 -445,21 +445,21 @@@ vlv_update_plane(struct drm_plane *dpla
        if (IS_CHERRYVIEW(dev_priv) && pipe == PIPE_B)
                chv_update_csc(intel_plane, fb->pixel_format);
  
 -      I915_WRITE(SPSTRIDE(pipe, plane), fb->pitches[0]);
 -      I915_WRITE(SPPOS(pipe, plane), (crtc_y << 16) | crtc_x);
 +      I915_WRITE(SPSTRIDE(pipe, plane_id), fb->pitches[0]);
 +      I915_WRITE(SPPOS(pipe, plane_id), (crtc_y << 16) | crtc_x);
  
-       if (fb->modifier[0] == I915_FORMAT_MOD_X_TILED)
+       if (fb->modifier == I915_FORMAT_MOD_X_TILED)
 -              I915_WRITE(SPTILEOFF(pipe, plane), (y << 16) | x);
 +              I915_WRITE(SPTILEOFF(pipe, plane_id), (y << 16) | x);
        else
 -              I915_WRITE(SPLINOFF(pipe, plane), linear_offset);
 +              I915_WRITE(SPLINOFF(pipe, plane_id), linear_offset);
  
 -      I915_WRITE(SPCONSTALPHA(pipe, plane), 0);
 +      I915_WRITE(SPCONSTALPHA(pipe, plane_id), 0);
  
 -      I915_WRITE(SPSIZE(pipe, plane), (crtc_h << 16) | crtc_w);
 -      I915_WRITE(SPCNTR(pipe, plane), sprctl);
 -      I915_WRITE(SPSURF(pipe, plane),
 +      I915_WRITE(SPSIZE(pipe, plane_id), (crtc_h << 16) | crtc_w);
 +      I915_WRITE(SPCNTR(pipe, plane_id), sprctl);
 +      I915_WRITE(SPSURF(pipe, plane_id),
                   intel_fb_gtt_offset(fb, rotation) + sprsurf_offset);
 -      POSTING_READ(SPSURF(pipe, plane));
 +      POSTING_READ(SPSURF(pipe, plane_id));
  }
  
  static void