Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

Pull drm updates from Dave Airlie:
 "This is a combo of -next and some -fixes that came in in the
  intervening time.

  Highlights:

  New drivers:
    ARM Armada driver for Marvell Armada 510 SOCs

  Intel:
    Broadwell initial support under a default off switch,
    Stereo/3D HDMI mode support
    Valleyview improvements
    Displayport improvements
    Haswell fixes
    initial mipi dsi panel support
    CRC support for debugging
    build with CONFIG_FB=n

  Radeon:
    enable DPM on a number of GPUs by default
    secondary GPU powerdown support
    enable HDMI audio by default
    Hawaii support

  Nouveau:
    dynamic pm code infrastructure reworked, does nothing major yet
    GK208 modesetting support
    MSI fixes, on by default again
    PMPEG improvements
    pageflipping fixes

  GMA500:
    minnowboard SDVO support

  VMware:
    misc fixes

  MSM:
    prime, plane and rendernodes support

  Tegra:
    rearchitected to put the drm driver into the drm subsystem.
    HDMI and gr2d support for tegra 114 SoC

  QXL:
    oops fix, and multi-head fixes

  DRM core:
    sysfs lifetime fixes
    client capability ioctl
    further cleanups to device midlayer
    more vblank timestamp fixes"

* 'drm-next' of git://people.freedesktop.org/~airlied/linux: (789 commits)
  drm/nouveau: do not map evicted vram buffers in nouveau_bo_vma_add
  drm/nvc0-/gr: shift wrapping bug in nvc0_grctx_generate_r406800
  drm/nouveau/pwr: fix missing mutex unlock in a failure path
  drm/nv40/therm: fix slowing down fan when pstate undefined
  drm/nv11-: synchronise flips to vblank, unless async flip requested
  drm/nvc0-: remove nasty fifo swmthd hack for flip completion method
  drm/nv10-: we no longer need to create nvsw object on user channels
  drm/nouveau: always queue flips relative to kernel channel activity
  drm/nouveau: there is no need to reserve/fence the new fb when flipping
  drm/nouveau: when bailing out of a pushbuf ioctl, do not remove previous fence
  drm/nouveau: allow nouveau_fence_ref() to be a noop
  drm/nvc8/mc: msi rearm is via the nvc0 method
  drm/ttm: Fix vma page_prot bit manipulation
  drm/vmwgfx: Fix a couple of compile / sparse warnings and errors
  drm/vmwgfx: Resource evict fixes
  drm/edid: compare actual vrefresh for all modes for quirks
  drm: shmob_drm: Convert to clk_prepare/unprepare
  drm/nouveau: fix 32-bit build
  drm/i915/opregion: fix build error on CONFIG_ACPI=n
  Revert "drm/radeon/audio: don't set speaker allocation on DCE4+"
  ...

1 files changed, 33 insertions, 13 deletions

diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
index f1a857ec1021..8d5a646ebe6a 100644
--- a/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
@@ -429,8 +429,20 @@ static void ttm_bo_cleanup_refs_or_queue(struct ttm_buffer_object *bo)
                 sync_obj = driver->sync_obj_ref(bo->sync_obj);
         spin_unlock(&bdev->fence_lock);
 
-        if (!ret)
+        if (!ret) {
+
+                /*
+                 * Make NO_EVICT bos immediately available to
+                 * shrinkers, now that they are queued for
+                 * destruction.
+                 */
+                if (bo->mem.placement & TTM_PL_FLAG_NO_EVICT) {
+                        bo->mem.placement &= ~TTM_PL_FLAG_NO_EVICT;
+                        ttm_bo_add_to_lru(bo);
+                }
+
                 ww_mutex_unlock(&bo->resv->lock);
+        }
 
         kref_get(&bo->list_kref);
         list_add_tail(&bo->ddestroy, &bdev->ddestroy);
@@ -986,24 +998,32 @@ out_unlock:
         return ret;
 }
 
-static int ttm_bo_mem_compat(struct ttm_placement *placement,
-                             struct ttm_mem_reg *mem)
+static bool ttm_bo_mem_compat(struct ttm_placement *placement,
+                              struct ttm_mem_reg *mem,
+                              uint32_t *new_flags)
 {
         int i;
 
         if (mem->mm_node && placement->lpfn != 0 &&
             (mem->start < placement->fpfn ||
              mem->start + mem->num_pages > placement->lpfn))
-                return -1;
+                return false;
 
         for (i = 0; i < placement->num_placement; i++) {
-                if ((placement->placement[i] & mem->placement &
-                        TTM_PL_MASK_CACHING) &&
-                        (placement->placement[i] & mem->placement &
-                        TTM_PL_MASK_MEM))
-                        return i;
+                *new_flags = placement->placement[i];
+                if ((*new_flags & mem->placement & TTM_PL_MASK_CACHING) &&
+                    (*new_flags & mem->placement & TTM_PL_MASK_MEM))
+                        return true;
         }
-        return -1;
+
+        for (i = 0; i < placement->num_busy_placement; i++) {
+                *new_flags = placement->busy_placement[i];
+                if ((*new_flags & mem->placement & TTM_PL_MASK_CACHING) &&
+                    (*new_flags & mem->placement & TTM_PL_MASK_MEM))
+                        return true;
+        }
+
+        return false;
 }
 
 int ttm_bo_validate(struct ttm_buffer_object *bo,
@@ -1012,6 +1032,7 @@ int ttm_bo_validate(struct ttm_buffer_object *bo,
                         bool no_wait_gpu)
 {
         int ret;
+        uint32_t new_flags;
 
         lockdep_assert_held(&bo->resv->lock.base);
         /* Check that range is valid */
@@ -1022,8 +1043,7 @@ int ttm_bo_validate(struct ttm_buffer_object *bo,
         /*
          * Check whether we need to move buffer.
          */
-        ret = ttm_bo_mem_compat(placement, &bo->mem);
-        if (ret < 0) {
+        if (!ttm_bo_mem_compat(placement, &bo->mem, &new_flags)) {
                 ret = ttm_bo_move_buffer(bo, placement, interruptible,
                                          no_wait_gpu);
                 if (ret)
@@ -1033,7 +1053,7 @@ int ttm_bo_validate(struct ttm_buffer_object *bo,
                  * Use the access and other non-mapping-related flag bits from
                  * the compatible memory placement flags to the active flags
                  */
-                ttm_flag_masked(&bo->mem.placement, placement->placement[ret],
+                ttm_flag_masked(&bo->mem.placement, new_flags,
                                 ~TTM_PL_MASK_MEMTYPE);
         }
         /*