Merge tag 'drm-misc-next-2016-12-30' of git://anongit.freedesktop.org/git/drm-misc...

Directly merge drm-misc into drm-intel since Dave is on vacation and
we need the various drm-misc patches (fb format rework, drm mm fixes,
selftest framework and others). Also pulled back -rc2 in first to
resync with drm-intel-fixes and make sure I can reuse the exact rerere
solutions from drm-tip for safety, and because I'm lazy.

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
Simple merge

diff --cc drivers/gpu/drm/ast/ast_main.c
Simple merge

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

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

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

diff --cc drivers/gpu/drm/i915/i915_gem_evict.c
index 6457fd0c33a893351dac9eb8d42ceedbe079ada2,85ceff1b74b648cbf7438f2a53ed3168bcf12d2e..50129ec1caabc91db1b508f2d4ae8685d0f3f06c
--- 1/drivers/gpu/drm/i915/i915_gem_evict.c
--- 2/drivers/gpu/drm/i915/i915_gem_evict.c
+++ b/drivers/gpu/drm/i915/i915_gem_evict.c
@@@ -96,7 -99,8 +99,8 @@@ i915_gem_evict_something(struct i915_ad
                         u64 start, u64 end,
                         unsigned flags)
  {
 -      struct drm_i915_private *dev_priv = to_i915(vm->dev);
 +      struct drm_i915_private *dev_priv = vm->i915;
+       struct drm_mm_scan scan;
        struct list_head eviction_list;
        struct list_head *phases[] = {
                &vm->inactive_list,
@@@ -104,9 -108,10 +108,10 @@@
                NULL,
        }, **phase;
        struct i915_vma *vma, *next;
+       struct drm_mm_node *node;
        int ret;
  
 -      lockdep_assert_held(&vm->dev->struct_mutex);
 +      lockdep_assert_held(&vm->i915->drm.struct_mutex);
        trace_i915_gem_evict(vm, min_size, alignment, flags);
  
        /*
@@@ -122,21 -127,12 +127,19 @@@
         * On each list, the oldest objects lie at the HEAD with the freshest
         * object on the TAIL.
         */
-       if (start != 0 || end != vm->total) {
-               drm_mm_init_scan_with_range(&vm->mm, min_size,
-                                           alignment, cache_level,
-                                           start, end);
-       } else
-               drm_mm_init_scan(&vm->mm, min_size, alignment, cache_level);
+       drm_mm_scan_init_with_range(&scan, &vm->mm,
+                                   min_size, alignment, cache_level,
+                                   start, end,
+                                   flags & PIN_HIGH ? DRM_MM_CREATE_TOP : 0);
  
 -      if (flags & PIN_NONBLOCK)
 +      /* Retire before we search the active list. Although we have
 +       * reasonable accuracy in our retirement lists, we may have
 +       * a stray pin (preventing eviction) that can only be resolved by
 +       * retiring.
 +       */
 +      if (!(flags & PIN_NONBLOCK))
 +              i915_gem_retire_requests(dev_priv);
 +      else
                phases[1] = NULL;
  
  search_again:

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

diff --cc drivers/gpu/drm/i915/i915_vma.c
index e008e4e8b4817d0749e58952dc83710f21c6c8bc,325b917c5ad788f6549580896c6b1a1b590dcf60..d48c6821461108ede95400692bb22cbac1b900ab
--- 1/drivers/gpu/drm/i915/i915_vma.c
--- 2/drivers/gpu/drm/i915/i915_vma.c
+++ b/drivers/gpu/drm/i915/i915_vma.c
@@@ -327,16 -313,18 +327,16 @@@ bool i915_gem_valid_gtt_space(struct i9
        if (vma->vm->mm.color_adjust == NULL)
                return true;
  
 -      if (!drm_mm_node_allocated(gtt_space))
 -              return true;
 -
 -      if (list_empty(&gtt_space->node_list))
 -              return true;
 +      /* Only valid to be called on an already inserted vma */
 +      GEM_BUG_ON(!drm_mm_node_allocated(node));
 +      GEM_BUG_ON(list_empty(&node->node_list));
  
 -      other = list_entry(gtt_space->node_list.prev, struct drm_mm_node, node_list);
 -      if (other->allocated && !drm_mm_hole_follows(other) && other->color != cache_level)
 +      other = list_prev_entry(node, node_list);
-       if (color_differs(other, cache_level) && !other->hole_follows)
++      if (color_differs(other, cache_level) && !drm_mm_hole_follows(other))
                return false;
  
 -      other = list_entry(gtt_space->node_list.next, struct drm_mm_node, node_list);
 -      if (other->allocated && !drm_mm_hole_follows(gtt_space) && other->color != cache_level)
 +      other = list_next_entry(node, node_list);
-       if (color_differs(other, cache_level) && !node->hole_follows)
++      if (color_differs(other, cache_level) && !drm_mm_hole_follows(node))
                return false;
  
        return true;

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

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

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

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

diff --cc drivers/gpu/drm/i915/intel_overlay.c
index c95362327ffbbdf99ace912d6f2eb7633a83de9d,568d194435fdfbceca29d59123efb61f76ac6fba..4473a611c664b5511d9de55a2e4f05c665a69e6c
--- 1/drivers/gpu/drm/i915/intel_overlay.c
--- 2/drivers/gpu/drm/i915/intel_overlay.c
+++ b/drivers/gpu/drm/i915/intel_overlay.c
@@@ -722,10 -666,8 +722,10 @@@ static void update_colorkey(struct inte
        if (overlay->color_key_enabled)
                flags |= DST_KEY_ENABLE;
  
 -      switch (fb->format->format) {
 +      if (state->base.visible)
-               format = state->base.fb->pixel_format;
++              format = state->base.fb->format->format;
 +
 +      switch (format) {
        case DRM_FORMAT_C8:
                key = 0;
                flags |= CLK_RGB8I_MASK;

diff --cc drivers/gpu/drm/i915/intel_pm.c
index ccdea53210c08f1d7e81f9c14455ee0d353d3243,ce03d9d5aca6c9f425ed555e7b51a047c39ffb47..249623d45be0caa3e891e8a272706dff84dbc4be
--- 1/drivers/gpu/drm/i915/intel_pm.c
--- 2/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@@ -991,13 -960,13 +991,13 @@@ static uint16_t vlv_compute_wm_level(co
        if (dev_priv->wm.pri_latency[level] == 0)
                return USHRT_MAX;
  
 -      if (!state->base.visible)
 +      if (!plane_state->base.visible)
                return 0;
  
-       cpp = drm_format_plane_cpp(plane_state->base.fb->pixel_format, 0);
 -      cpp = state->base.fb->format->cpp[0];
 -      clock = crtc->config->base.adjusted_mode.crtc_clock;
 -      htotal = crtc->config->base.adjusted_mode.crtc_htotal;
 -      width = crtc->config->pipe_src_w;
++      cpp = plane_state->base.fb->format->cpp[0];
 +      clock = adjusted_mode->crtc_clock;
 +      htotal = adjusted_mode->crtc_htotal;
 +      width = crtc_state->pipe_src_w;
        if (WARN_ON(htotal == 0))
                htotal = 1;
  

diff --cc drivers/gpu/drm/i915/intel_sprite.c
index 63154a5a9305bc807b8025b981ba1d871152140a,ff766c0cb873838ab3be991c521cfb69939468a5..7031bc733d971e4f70d32fe9abc2b50aa9a51bc7
--- 1/drivers/gpu/drm/i915/intel_sprite.c
--- 2/drivers/gpu/drm/i915/intel_sprite.c
+++ b/drivers/gpu/drm/i915/intel_sprite.c
@@@ -443,23 -443,23 +443,23 @@@ vlv_update_plane(struct drm_plane *dpla
                sprctl |= SP_SOURCE_KEY;
  
        if (IS_CHERRYVIEW(dev_priv) && pipe == PIPE_B)
-               chv_update_csc(intel_plane, fb->pixel_format);
+               chv_update_csc(intel_plane, fb->format->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 == 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

diff --cc drivers/gpu/drm/tilcdc/tilcdc_crtc.c
Simple merge

diff --cc include/drm/drmP.h
Simple merge

diff --cc lib/Makefile
Simple merge