Merge tag 'drm-misc-next-2017-07-26' of git://anongit.freedesktop.org/git/drm-misc into drm-next

drm-misc-next-2017-07-18:
Core Changes:
- A couple fixes to only opening crc when needed (Maarten)
- Change atomic helper swap_state to be interruptible (Maarten)
- fb_helper: Support waiting for an output before setting up (Daniel)
- Allow drivers supporting runtime_pm to use helper_commit_tail (Maxime)

Driver Changes:
- misc: Use %pOF to print device node names (Rob)
- Miscellaneous fixes

drm-misc-next-2017-07-18:
UAPI Changes:
- Fail commits which request an event without including a crtc (Andrey)

Core Changes:
- Add YCBCR 4:2:0 support (Shashank)
- s/drm_atomic_replace_property_blob/drm_property_replace_blob/ (Peter)
- Add proper base class for private objs instead of using void* (Ville)
- Remove pending_read/write_domains from drm_gem_object (Chris)
- Add async plane update support (ie: cursor) to atomic helpers (Gustavo)
- Add old state to .enable and rename to .atomic_enable (Laurent)
- Add drm_atomic_helper_wait_for_flip_done() (Boris)
- Remove drm_driver->set_busid hook (Daniel)
- Migrate vblank documentation into the source files (Daniel)
- Add fb_helper->lock instead of abusing modeset lock (Thierry/Daniel)

Driver Changes:
- stm: Add STM32 DSI controller driver (Phillipe)
- amdgpu: Numerous small/misc fixes
- bridge: Add Synopsys Designware MIPI DSI host bridge driver (Phillipe)
- tinydrm: Add support for Pervasive Displays RePaper displays (Noralf)
- misc: Replace for_each_[obj]_in_state to prep for removal (Maarten)
- misc: Use .atomic_disable for atomic drivers (Laurent)
- vgem: Pin pages when mapped/exported (Chris)
- dw_hdmi: Add support for Rockchip RK3399 (Mark)
- atmel-hlcdc: Add 8-bit color look-up table format (Peter)
- vc4: Send vblank event when disabling a crtc (Boris)
- vc4: Use atomic helpers for fence waits (Eric)
- misc: drop drm_vblank_cleanup cargo-cult (Daniel)

Cc: Daniel Vetter <daniel.vetter@intel.com>
Cc: Boris Brezillon <boris.brezillon@free-electrons.com>
Cc: Eric Anholt <eric@anholt.net>
Cc: Peter Rosin <peda@axentia.se>
Cc: Mark Yao <mark.yao@rock-chips.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Andrey Grodzovsky <Andrey.Grodzovsky@amd.com>
Cc: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Cc: Gustavo Padovan <gustavo.padovan@collabora.com>
Cc: Thierry Reding <treding@nvidia.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Peter Rosin <peda@axentia.se>
Cc: Shashank Sharma <shashank.sharma@intel.com>
Cc: Philippe CORNU <philippe.cornu@st.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Rob Herring <robh@kernel.org>
Cc: Maxime Ripard <maxime.ripard@free-electrons.com>

* tag 'drm-misc-next-2017-07-26' of git://anongit.freedesktop.org/git/drm-misc: (171 commits)
  drm/hisilicon: fix build error without fbdev emulation
  drm/atomic: implement drm_atomic_helper_commit_tail for runtime_pm users
  drm: Improve kerneldoc for drm_modeset_lock
  drm/hisilicon: Remove custom FB helper deferred setup
  drm/exynos: Remove custom FB helper deferred setup
  drm/fb-helper: Support deferred setup
  dma-fence: Don't BUG_ON when not absolutely needed
  drm: Convert to using %pOF instead of full_name
  drm/syncobj: Fix kerneldoc
  drm/atomic: Allow drm_atomic_helper_swap_state to fail
  drm/atomic: Add __must_check to drm_atomic_helper_swap_state.
  drm/vc4: Handle drm_atomic_helper_swap_state failure
  drm/tilcdc: Handle drm_atomic_helper_swap_state failure
  drm/tegra: Handle drm_atomic_helper_swap_state failure
  drm/msm: Handle drm_atomic_helper_swap_state failure
  drm/mediatek: Handle drm_atomic_helper_swap_state failure
  drm/i915: Handle drm_atomic_helper_swap_state failure
  drm/atmel-hlcdc: Handle drm_atomic_helper_swap_state failure
  drm/nouveau: Handle drm_atomic_helper_swap_state failure
  drm/atomic: Change drm_atomic_helper_swap_state to return an error.
  ...

1 files changed, 44 insertions, 45 deletions

diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c
index bfd237c15e76..f7e292bf2baf 100644
--- a/drivers/gpu/drm/drm_dp_mst_topology.c
+++ b/drivers/gpu/drm/drm_dp_mst_topology.c
@@ -31,6 +31,8 @@
 #include <drm/drmP.h>
 
 #include <drm/drm_fixed.h>
+#include <drm/drm_atomic.h>
+#include <drm/drm_atomic_helper.h>
 
 /**
  * DOC: dp mst helper
@@ -1335,15 +1337,17 @@ static void drm_dp_mst_link_probe_work(struct work_struct *work)
 static bool drm_dp_validate_guid(struct drm_dp_mst_topology_mgr *mgr,
                                  u8 *guid)
 {
-        static u8 zero_guid[16];
+        u64 salt;
 
-        if (!memcmp(guid, zero_guid, 16)) {
-                u64 salt = get_jiffies_64();
-                memcpy(&guid[0], &salt, sizeof(u64));
-                memcpy(&guid[8], &salt, sizeof(u64));
-                return false;
-        }
-        return true;
+        if (memchr_inv(guid, 0, 16))
+                return true;
+
+        salt = get_jiffies_64();
+
+        memcpy(&guid[0], &salt, sizeof(u64));
+        memcpy(&guid[8], &salt, sizeof(u64));
+
+        return false;
 }
 
 #if 0
@@ -2515,8 +2519,8 @@ int drm_dp_atomic_find_vcpi_slots(struct drm_atomic_state *state,
         int req_slots;
 
         topology_state = drm_atomic_get_mst_topology_state(state, mgr);
-        if (topology_state == NULL)
-                return -ENOMEM;
+        if (IS_ERR(topology_state))
+                return PTR_ERR(topology_state);
 
         port = drm_dp_get_validated_port_ref(mgr, port);
         if (port == NULL)
@@ -2555,8 +2559,8 @@ int drm_dp_atomic_release_vcpi_slots(struct drm_atomic_state *state,
         struct drm_dp_mst_topology_state *topology_state;
 
         topology_state = drm_atomic_get_mst_topology_state(state, mgr);
-        if (topology_state == NULL)
-                return -ENOMEM;
+        if (IS_ERR(topology_state))
+                return PTR_ERR(topology_state);
 
         /* We cannot rely on port->vcpi.num_slots to update
          * topology_state->avail_slots as the port may not exist if the parent
@@ -2992,41 +2996,32 @@ static void drm_dp_destroy_connector_work(struct work_struct *work)
                 (*mgr->cbs->hotplug)(mgr);
 }
 
-void *drm_dp_mst_duplicate_state(struct drm_atomic_state *state, void *obj)
+static struct drm_private_state *
+drm_dp_mst_duplicate_state(struct drm_private_obj *obj)
 {
-        struct drm_dp_mst_topology_mgr *mgr = obj;
-        struct drm_dp_mst_topology_state *new_mst_state;
+        struct drm_dp_mst_topology_state *state;
 
-        if (WARN_ON(!mgr->state))
+        state = kmemdup(obj->state, sizeof(*state), GFP_KERNEL);
+        if (!state)
                 return NULL;
 
-        new_mst_state = kmemdup(mgr->state, sizeof(*new_mst_state), GFP_KERNEL);
-        if (new_mst_state)
-                new_mst_state->state = state;
-        return new_mst_state;
-}
-
-void drm_dp_mst_swap_state(void *obj, void **obj_state_ptr)
-{
-        struct drm_dp_mst_topology_mgr *mgr = obj;
-        struct drm_dp_mst_topology_state **topology_state_ptr;
-
-        topology_state_ptr = (struct drm_dp_mst_topology_state **)obj_state_ptr;
+        __drm_atomic_helper_private_obj_duplicate_state(obj, &state->base);
 
-        mgr->state->state = (*topology_state_ptr)->state;
-        swap(*topology_state_ptr, mgr->state);
-        mgr->state->state = NULL;
+        return &state->base;
 }
 
-void drm_dp_mst_destroy_state(void *obj_state)
+static void drm_dp_mst_destroy_state(struct drm_private_obj *obj,
+                                     struct drm_private_state *state)
 {
-        kfree(obj_state);
+        struct drm_dp_mst_topology_state *mst_state =
+                to_dp_mst_topology_state(state);
+
+        kfree(mst_state);
 }
 
 static const struct drm_private_state_funcs mst_state_funcs = {
-        .duplicate_state = drm_dp_mst_duplicate_state,
-        .swap_state = drm_dp_mst_swap_state,
-        .destroy_state = drm_dp_mst_destroy_state,
+        .atomic_duplicate_state = drm_dp_mst_duplicate_state,
+        .atomic_destroy_state = drm_dp_mst_destroy_state,
 };
 
 /**
@@ -3050,8 +3045,7 @@ struct drm_dp_mst_topology_state *drm_atomic_get_mst_topology_state(struct drm_a
         struct drm_device *dev = mgr->dev;
 
         WARN_ON(!drm_modeset_is_locked(&dev->mode_config.connection_mutex));
-        return drm_atomic_get_private_obj_state(state, mgr,
-                                                &mst_state_funcs);
+        return to_dp_mst_topology_state(drm_atomic_get_private_obj_state(state, &mgr->base));
 }
 EXPORT_SYMBOL(drm_atomic_get_mst_topology_state);
 
@@ -3071,6 +3065,8 @@ int drm_dp_mst_topology_mgr_init(struct drm_dp_mst_topology_mgr *mgr,
                                  int max_dpcd_transaction_bytes,
                                  int max_payloads, int conn_base_id)
 {
+        struct drm_dp_mst_topology_state *mst_state;
+
         mutex_init(&mgr->lock);
         mutex_init(&mgr->qlock);
         mutex_init(&mgr->payload_lock);
@@ -3099,14 +3095,18 @@ int drm_dp_mst_topology_mgr_init(struct drm_dp_mst_topology_mgr *mgr,
         if (test_calc_pbn_mode() < 0)
                 DRM_ERROR("MST PBN self-test failed\n");
 
-        mgr->state = kzalloc(sizeof(*mgr->state), GFP_KERNEL);
-        if (mgr->state == NULL)
+        mst_state = kzalloc(sizeof(*mst_state), GFP_KERNEL);
+        if (mst_state == NULL)
                 return -ENOMEM;
-        mgr->state->mgr = mgr;
+
+        mst_state->mgr = mgr;
 
         /* max. time slots - one slot for MTP header */
-        mgr->state->avail_slots = 63;
-        mgr->funcs = &mst_state_funcs;
+        mst_state->avail_slots = 63;
+
+        drm_atomic_private_obj_init(&mgr->base,
+                                    &mst_state->base,
+                                    &mst_state_funcs);
 
         return 0;
 }
@@ -3128,8 +3128,7 @@ void drm_dp_mst_topology_mgr_destroy(struct drm_dp_mst_topology_mgr *mgr)
         mutex_unlock(&mgr->payload_lock);
         mgr->dev = NULL;
         mgr->aux = NULL;
-        kfree(mgr->state);
-        mgr->state = NULL;
+        drm_atomic_private_obj_fini(&mgr->base);
         mgr->funcs = NULL;
 }
 EXPORT_SYMBOL(drm_dp_mst_topology_mgr_destroy);