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

Pull drm updates from Dave Airlie:
 "This is the main git pull for the drm,

  I pretty much froze major pulls at -rc5/6 time, and haven't had much
  fallout, so will probably continue doing that.

  Lots of changes all over, big internal header cleanup to make it clear
  drm features are legacy things and what are things that modern KMS
  drivers should be using.  Also big move to use the new generic fences
  in all the TTM drivers.

  core:
        atomic prep work,
        vblank rework changes, allows immediate vblank disables
        major header reworking and cleanups to better delinate legacy
        interfaces from what KMS drivers should be using.
        cursor planes locking fixes

  ttm:
        move to generic fences (affects all TTM drivers)
        ppc64 caching fixes

  radeon:
        userptr support,
        uvd for old asics,
        reset rework for fence changes
        better buffer placement changes,
        dpm feature enablement
        hdmi audio support fixes

  intel:
        Cherryview work,
        180 degree rotation,
        skylake prep work,
        execlist command submission
        full ppgtt prep work
        cursor improvements
        edid caching,
        vdd handling improvements

  nouveau:
        fence reworking
        kepler memory clock work
        gt21x clock work
        fan control improvements
        hdmi infoframe fixes
        DP audio

  ast:
        ppc64 fixes
        caching fix

  rcar:
        rcar-du DT support

  ipuv3:
        prep work for capture support

  msm:
        LVDS support for mdp4, new panel, gpu refactoring

  exynos:
        exynos3250 SoC support, drop bad mmap interface,
        mipi dsi changes, and component match support"

* 'drm-next' of git://people.freedesktop.org/~airlied/linux: (640 commits)
  drm/mst: rework payload table allocation to conform better.
  drm/ast: Fix HW cursor image
  drm/radeon/kv: add uvd/vce info to dpm debugfs output
  drm/radeon/ci: add uvd/vce info to dpm debugfs output
  drm/radeon: export reservation_object from dmabuf to ttm
  drm/radeon: cope with foreign fences inside the reservation object
  drm/radeon: cope with foreign fences inside display
  drm/core: use helper to check driver features
  drm/radeon/cik: write gfx ucode version to ucode addr reg
  drm/radeon/si: print full CS when we hit a packet 0
  drm/radeon: remove unecessary includes
  drm/radeon/combios: declare legacy_connector_convert as static
  drm/radeon/atombios: declare connector convert tables as static
  drm/radeon: drop btc_get_max_clock_from_voltage_dependency_table
  drm/radeon/dpm: drop clk/voltage dependency filters for BTC
  drm/radeon/dpm: drop clk/voltage dependency filters for CI
  drm/radeon/dpm: drop clk/voltage dependency filters for SI
  drm/radeon/dpm: drop clk/voltage dependency filters for NI
  drm/radeon: disable audio when we disable hdmi (v2)
  drm/radeon: split audio enable between eg and r600 (v2)
  ...

1 files changed, 85 insertions, 98 deletions

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c b/drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c
index 6327cfc36805..cff2bf9db9d2 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c
@@ -30,66 +30,101 @@
 #include <drm/ttm/ttm_placement.h>
 #include <drm/ttm/ttm_page_alloc.h>
 
-static uint32_t vram_placement_flags = TTM_PL_FLAG_VRAM |
-        TTM_PL_FLAG_CACHED;
-
-static uint32_t vram_ne_placement_flags = TTM_PL_FLAG_VRAM |
-        TTM_PL_FLAG_CACHED |
-        TTM_PL_FLAG_NO_EVICT;
+static struct ttm_place vram_placement_flags = {
+        .fpfn = 0,
+        .lpfn = 0,
+        .flags = TTM_PL_FLAG_VRAM | TTM_PL_FLAG_CACHED
+};
 
-static uint32_t sys_placement_flags = TTM_PL_FLAG_SYSTEM |
-        TTM_PL_FLAG_CACHED;
+static struct ttm_place vram_ne_placement_flags = {
+        .fpfn = 0,
+        .lpfn = 0,
+        .flags = TTM_PL_FLAG_VRAM | TTM_PL_FLAG_CACHED | TTM_PL_FLAG_NO_EVICT
+};
 
-static uint32_t sys_ne_placement_flags = TTM_PL_FLAG_SYSTEM |
-        TTM_PL_FLAG_CACHED |
-        TTM_PL_FLAG_NO_EVICT;
+static struct ttm_place sys_placement_flags = {
+        .fpfn = 0,
+        .lpfn = 0,
+        .flags = TTM_PL_FLAG_SYSTEM | TTM_PL_FLAG_CACHED
+};
 
-static uint32_t gmr_placement_flags = VMW_PL_FLAG_GMR |
-        TTM_PL_FLAG_CACHED;
+static struct ttm_place sys_ne_placement_flags = {
+        .fpfn = 0,
+        .lpfn = 0,
+        .flags = TTM_PL_FLAG_SYSTEM | TTM_PL_FLAG_CACHED | TTM_PL_FLAG_NO_EVICT
+};
 
-static uint32_t gmr_ne_placement_flags = VMW_PL_FLAG_GMR |
-        TTM_PL_FLAG_CACHED |
-        TTM_PL_FLAG_NO_EVICT;
+static struct ttm_place gmr_placement_flags = {
+        .fpfn = 0,
+        .lpfn = 0,
+        .flags = VMW_PL_FLAG_GMR | TTM_PL_FLAG_CACHED
+};
 
-static uint32_t mob_placement_flags = VMW_PL_FLAG_MOB |
-        TTM_PL_FLAG_CACHED;
+static struct ttm_place gmr_ne_placement_flags = {
+        .fpfn = 0,
+        .lpfn = 0,
+        .flags = VMW_PL_FLAG_GMR | TTM_PL_FLAG_CACHED | TTM_PL_FLAG_NO_EVICT
+};
 
-struct ttm_placement vmw_vram_placement = {
+static struct ttm_place mob_placement_flags = {
         .fpfn = 0,
         .lpfn = 0,
+        .flags = VMW_PL_FLAG_MOB | TTM_PL_FLAG_CACHED
+};
+
+struct ttm_placement vmw_vram_placement = {
         .num_placement = 1,
         .placement = &vram_placement_flags,
         .num_busy_placement = 1,
         .busy_placement = &vram_placement_flags
 };
 
-static uint32_t vram_gmr_placement_flags[] = {
-        TTM_PL_FLAG_VRAM | TTM_PL_FLAG_CACHED,
-        VMW_PL_FLAG_GMR | TTM_PL_FLAG_CACHED
+static struct ttm_place vram_gmr_placement_flags[] = {
+        {
+                .fpfn = 0,
+                .lpfn = 0,
+                .flags = TTM_PL_FLAG_VRAM | TTM_PL_FLAG_CACHED
+        }, {
+                .fpfn = 0,
+                .lpfn = 0,
+                .flags = VMW_PL_FLAG_GMR | TTM_PL_FLAG_CACHED
+        }
 };
 
-static uint32_t gmr_vram_placement_flags[] = {
-        VMW_PL_FLAG_GMR | TTM_PL_FLAG_CACHED,
-        TTM_PL_FLAG_VRAM | TTM_PL_FLAG_CACHED
+static struct ttm_place gmr_vram_placement_flags[] = {
+        {
+                .fpfn = 0,
+                .lpfn = 0,
+                .flags = VMW_PL_FLAG_GMR | TTM_PL_FLAG_CACHED
+        }, {
+                .fpfn = 0,
+                .lpfn = 0,
+                .flags = TTM_PL_FLAG_VRAM | TTM_PL_FLAG_CACHED
+        }
 };
 
 struct ttm_placement vmw_vram_gmr_placement = {
-        .fpfn = 0,
-        .lpfn = 0,
         .num_placement = 2,
         .placement = vram_gmr_placement_flags,
         .num_busy_placement = 1,
         .busy_placement = &gmr_placement_flags
 };
 
-static uint32_t vram_gmr_ne_placement_flags[] = {
-        TTM_PL_FLAG_VRAM | TTM_PL_FLAG_CACHED | TTM_PL_FLAG_NO_EVICT,
-        VMW_PL_FLAG_GMR | TTM_PL_FLAG_CACHED | TTM_PL_FLAG_NO_EVICT
+static struct ttm_place vram_gmr_ne_placement_flags[] = {
+        {
+                .fpfn = 0,
+                .lpfn = 0,
+                .flags = TTM_PL_FLAG_VRAM | TTM_PL_FLAG_CACHED |
+                         TTM_PL_FLAG_NO_EVICT
+        }, {
+                .fpfn = 0,
+                .lpfn = 0,
+                .flags = VMW_PL_FLAG_GMR | TTM_PL_FLAG_CACHED |
+                         TTM_PL_FLAG_NO_EVICT
+        }
 };
 
 struct ttm_placement vmw_vram_gmr_ne_placement = {
-        .fpfn = 0,
-        .lpfn = 0,
         .num_placement = 2,
         .placement = vram_gmr_ne_placement_flags,
         .num_busy_placement = 1,
@@ -97,8 +132,6 @@ struct ttm_placement vmw_vram_gmr_ne_placement = {
 };
 
 struct ttm_placement vmw_vram_sys_placement = {
-        .fpfn = 0,
-        .lpfn = 0,
         .num_placement = 1,
         .placement = &vram_placement_flags,
         .num_busy_placement = 1,
@@ -106,8 +139,6 @@ struct ttm_placement vmw_vram_sys_placement = {
 };
 
 struct ttm_placement vmw_vram_ne_placement = {
-        .fpfn = 0,
-        .lpfn = 0,
         .num_placement = 1,
         .placement = &vram_ne_placement_flags,
         .num_busy_placement = 1,
@@ -115,8 +146,6 @@ struct ttm_placement vmw_vram_ne_placement = {
 };
 
 struct ttm_placement vmw_sys_placement = {
-        .fpfn = 0,
-        .lpfn = 0,
         .num_placement = 1,
         .placement = &sys_placement_flags,
         .num_busy_placement = 1,
@@ -124,24 +153,33 @@ struct ttm_placement vmw_sys_placement = {
 };
 
 struct ttm_placement vmw_sys_ne_placement = {
-        .fpfn = 0,
-        .lpfn = 0,
         .num_placement = 1,
         .placement = &sys_ne_placement_flags,
         .num_busy_placement = 1,
         .busy_placement = &sys_ne_placement_flags
 };
 
-static uint32_t evictable_placement_flags[] = {
-        TTM_PL_FLAG_SYSTEM | TTM_PL_FLAG_CACHED,
-        TTM_PL_FLAG_VRAM | TTM_PL_FLAG_CACHED,
-        VMW_PL_FLAG_GMR | TTM_PL_FLAG_CACHED,
-        VMW_PL_FLAG_MOB | TTM_PL_FLAG_CACHED
+static struct ttm_place evictable_placement_flags[] = {
+        {
+                .fpfn = 0,
+                .lpfn = 0,
+                .flags = TTM_PL_FLAG_SYSTEM | TTM_PL_FLAG_CACHED
+        }, {
+                .fpfn = 0,
+                .lpfn = 0,
+                .flags = TTM_PL_FLAG_VRAM | TTM_PL_FLAG_CACHED
+        }, {
+                .fpfn = 0,
+                .lpfn = 0,
+                .flags = VMW_PL_FLAG_GMR | TTM_PL_FLAG_CACHED
+        }, {
+                .fpfn = 0,
+                .lpfn = 0,
+                .flags = VMW_PL_FLAG_MOB | TTM_PL_FLAG_CACHED
+        }
 };
 
 struct ttm_placement vmw_evictable_placement = {
-        .fpfn = 0,
-        .lpfn = 0,
         .num_placement = 4,
         .placement = evictable_placement_flags,
         .num_busy_placement = 1,
@@ -149,8 +187,6 @@ struct ttm_placement vmw_evictable_placement = {
 };
 
 struct ttm_placement vmw_srf_placement = {
-        .fpfn = 0,
-        .lpfn = 0,
         .num_placement = 1,
         .num_busy_placement = 2,
         .placement = &gmr_placement_flags,
@@ -158,8 +194,6 @@ struct ttm_placement vmw_srf_placement = {
 };
 
 struct ttm_placement vmw_mob_placement = {
-        .fpfn = 0,
-        .lpfn = 0,
         .num_placement = 1,
         .num_busy_placement = 1,
         .placement = &mob_placement_flags,
@@ -768,44 +802,6 @@ static int vmw_ttm_fault_reserve_notify(struct ttm_buffer_object *bo)
 }
 
 /**
- * FIXME: We're using the old vmware polling method to sync.
- * Do this with fences instead.
- */
-
-static void *vmw_sync_obj_ref(void *sync_obj)
-{
-
-        return (void *)
-                vmw_fence_obj_reference((struct vmw_fence_obj *) sync_obj);
-}
-
-static void vmw_sync_obj_unref(void **sync_obj)
-{
-        vmw_fence_obj_unreference((struct vmw_fence_obj **) sync_obj);
-}
-
-static int vmw_sync_obj_flush(void *sync_obj)
-{
-        vmw_fence_obj_flush((struct vmw_fence_obj *) sync_obj);
-        return 0;
-}
-
-static bool vmw_sync_obj_signaled(void *sync_obj)
-{
-        return  vmw_fence_obj_signaled((struct vmw_fence_obj *) sync_obj,
-                                       DRM_VMW_FENCE_FLAG_EXEC);
-
-}
-
-static int vmw_sync_obj_wait(void *sync_obj, bool lazy, bool interruptible)
-{
-        return vmw_fence_obj_wait((struct vmw_fence_obj *) sync_obj,
-                                  DRM_VMW_FENCE_FLAG_EXEC,
-                                  lazy, interruptible,
-                                  VMW_FENCE_WAIT_TIMEOUT);
-}
-
-/**
  * vmw_move_notify - TTM move_notify_callback
  *
  * @bo:             The TTM buffer object about to move.
@@ -829,11 +825,7 @@ static void vmw_move_notify(struct ttm_buffer_object *bo,
  */
 static void vmw_swap_notify(struct ttm_buffer_object *bo)
 {
-        struct ttm_bo_device *bdev = bo->bdev;
-
-        spin_lock(&bdev->fence_lock);
         ttm_bo_wait(bo, false, false, false);
-        spin_unlock(&bdev->fence_lock);
 }
 
 
@@ -846,11 +838,6 @@ struct ttm_bo_driver vmw_bo_driver = {
         .evict_flags = vmw_evict_flags,
         .move = NULL,
         .verify_access = vmw_verify_access,
-        .sync_obj_signaled = vmw_sync_obj_signaled,
-        .sync_obj_wait = vmw_sync_obj_wait,
-        .sync_obj_flush = vmw_sync_obj_flush,
-        .sync_obj_unref = vmw_sync_obj_unref,
-        .sync_obj_ref = vmw_sync_obj_ref,
         .move_notify = vmw_move_notify,
         .swap_notify = vmw_swap_notify,
         .fault_reserve_notify = &vmw_ttm_fault_reserve_notify,