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

UAPI Changes:
- Return -ENODEV instead of -ENXIO when creating cma fb w/o valid gem (Daniel)
- Add aspect ratio and custom scaling propertis to connector state (Maarten)

Cross-subsystem Changes:
- None

Core Changes:
- Add Laurent as bridge reviewer and Andrzej as bridge maintainer (Archit)
- Maintain new STM driver through -misc (Yannick)
- Misc doc improvements (as is tradition) (Daniel)
- Add driver-private objects to atomic state (Dhinakaran)
- Deprecate preclose hook in modern drivers (use postclose) (Daniel)
- Add hwmode to vblank struct. This fixes mode access in irq context and reduced
  a bunch of boilerplate (Daniel)

Driver Changes:
- vc4: Add out-fence support to vc4 V3D rendering (Eric)
- stm: Add stm32f429 display hw and am-480272h3tmqw-t01h panel support (Yannick)
- vc4: Remove 256MB cma limit from vc4 (Eric)
- dw-hdmi: Disable audio when inactive, instead of always enabled (Romain)
- zte: Add support for VGA to the ZTE driver (Shawn)
- i915: Track DP MST bandwidth and check it in atomic_check (Dhinakaran)
- vgem: Enable gem dmabuf import iface to facilitate ion testing (Laura)
- vc4: Add support for Cygnus (new dt compat string + couple bug fixes) (Eric)
- pl111: Add driver for pl111 CLCD display controller (Eric/Tom)
- vgem: Subclass drm_device instead of standalone platform device (Chris)

Cc: Archit Taneja <architt@codeaurora.org>
Cc: Eric Anholt <eric@anholt.net>
Cc: Yannick Fertre <yannick.fertre@st.com>
Cc: Romain Perier <romain.perier@collabora.com>
Cc: Navare, Manasi D <manasi.d.navare@intel.com>
Cc: Shawn Guo <shawn.guo@linaro.org>
Cc: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Cc: Laura Abbott <labbott@redhat.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Tom Cooksey <tom.cooksey@arm.com>
Cc: Daniel Vetter <daniel.vetter@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>

* tag 'drm-misc-next-2017-05-16' of git://anongit.freedesktop.org/git/drm-misc: (72 commits)
  drm: add missing declaration to drm_blend.h
  drm/dp: Wait up all outstanding tx waiters
  drm/dp: Read the tx msg state once after checking for an event
  drm/prime: Forward declare struct device
  drm/vblank: Lock down vblank->hwmode more
  drm/vblank: drop the mode argument from drm_calc_vbltimestamp_from_scanoutpos
  drm/vblank: Add FIXME comments about moving the vblank ts hooks
  drm/vblank: Switch to bool in_vblank_irq in get_vblank_timestamp
  drm/vblank: Switch drm_driver->get_vblank_timestamp to return a bool
  drm/vgem: Convert to a struct drm_device subclass
  gpu: drm: gma500: remove dead code
  drm/sti: Adjust two checks for null pointers in sti_hqvdp_probe()
  drm/sti: Fix typos in a comment line
  drm/sti: Fix a typo in a comment line
  drm/sti: Replace 17 seq_puts() calls by seq_putc()
  drm/sti: Reduce function calls for sequence output at five places
  drm/sti: use seq_puts to display a string
  drm: Nerf the preclose callback for modern drivers
  drm/exynos: Merge pre/postclose hooks
  drm/tegra: switch to postclose
  ...

1 files changed, 42 insertions, 6 deletions

diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c
index c1f62eb07c07..1dee9933005f 100644
--- a/drivers/gpu/drm/i915/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/intel_dp_mst.c
@@ -39,7 +39,7 @@ static bool intel_dp_mst_compute_config(struct intel_encoder *encoder,
         struct intel_dp *intel_dp = &intel_dig_port->dp;
         struct intel_connector *connector =
                 to_intel_connector(conn_state->connector);
-        struct drm_atomic_state *state;
+        struct drm_atomic_state *state = pipe_config->base.state;
         int bpp;
         int lane_count, slots;
         const struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode;
@@ -57,20 +57,24 @@ static bool intel_dp_mst_compute_config(struct intel_encoder *encoder,
          * seem to suggest we should do otherwise.
          */
         lane_count = drm_dp_max_lane_count(intel_dp->dpcd);
-
         pipe_config->lane_count = lane_count;
 
         pipe_config->pipe_bpp = bpp;
-        pipe_config->port_clock = intel_dp_max_link_rate(intel_dp);
 
-        state = pipe_config->base.state;
+        pipe_config->port_clock = intel_dp_max_link_rate(intel_dp);
 
         if (drm_dp_mst_port_has_audio(&intel_dp->mst_mgr, connector->port))
                 pipe_config->has_audio = true;
-        mst_pbn = drm_dp_calc_pbn_mode(adjusted_mode->crtc_clock, bpp);
 
+        mst_pbn = drm_dp_calc_pbn_mode(adjusted_mode->crtc_clock, bpp);
         pipe_config->pbn = mst_pbn;
-        slots = drm_dp_find_vcpi_slots(&intel_dp->mst_mgr, mst_pbn);
+
+        slots = drm_dp_atomic_find_vcpi_slots(state, &intel_dp->mst_mgr,
+                                              connector->port, mst_pbn);
+        if (slots < 0) {
+                DRM_DEBUG_KMS("failed finding vcpi slots:%d\n", slots);
+                return false;
+        }
 
         intel_link_compute_m_n(bpp, lane_count,
                                adjusted_mode->crtc_clock,
@@ -80,7 +84,38 @@ static bool intel_dp_mst_compute_config(struct intel_encoder *encoder,
         pipe_config->dp_m_n.tu = slots;
 
         return true;
+}
 
+static int intel_dp_mst_atomic_check(struct drm_connector *connector,
+                struct drm_connector_state *new_conn_state)
+{
+        struct drm_atomic_state *state = new_conn_state->state;
+        struct drm_connector_state *old_conn_state;
+        struct drm_crtc *old_crtc;
+        struct drm_crtc_state *crtc_state;
+        int slots, ret = 0;
+
+        old_conn_state = drm_atomic_get_old_connector_state(state, connector);
+        old_crtc = old_conn_state->crtc;
+        if (!old_crtc)
+                return ret;
+
+        crtc_state = drm_atomic_get_new_crtc_state(state, old_crtc);
+        slots = to_intel_crtc_state(crtc_state)->dp_m_n.tu;
+        if (drm_atomic_crtc_needs_modeset(crtc_state) && slots > 0) {
+                struct drm_dp_mst_topology_mgr *mgr;
+                struct drm_encoder *old_encoder;
+
+                old_encoder = old_conn_state->best_encoder;
+                mgr = &enc_to_mst(old_encoder)->primary->dp.mst_mgr;
+
+                ret = drm_dp_atomic_release_vcpi_slots(state, mgr, slots);
+                if (ret)
+                        DRM_DEBUG_KMS("failed releasing %d vcpi slots:%d\n", slots, ret);
+                else
+                        to_intel_crtc_state(crtc_state)->dp_m_n.tu = 0;
+        }
+        return ret;
 }
 
 static void intel_mst_disable_dp(struct intel_encoder *encoder,
@@ -387,6 +422,7 @@ static const struct drm_connector_helper_funcs intel_dp_mst_connector_helper_fun
         .mode_valid = intel_dp_mst_mode_valid,
         .atomic_best_encoder = intel_mst_atomic_best_encoder,
         .best_encoder = intel_mst_best_encoder,
+        .atomic_check = intel_dp_mst_atomic_check,
 };
 
 static void intel_dp_mst_encoder_destroy(struct drm_encoder *encoder)