drm/nouveau: Use atomic VCPI helpers for MST

Currently, nouveau uses the yolo method of setting up MST displays: it
uses the old VCPI helpers (drm_dp_find_vcpi_slots()) for computing the
display configuration. These helpers don't take care to make sure they
take a reference to the mstb port that they're checking, and
additionally don't actually check whether or not the topology still has
enough bandwidth to provide the VCPI tokens required.

So, drop usage of the old helpers and move entirely over to the atomic
helpers.

Changes since v6:
* Cleanup atomic check logic and remove a bunch of unneeded checks -
  danvet
Changes since v5:
* Update nv50_msto_atomic_check() and nv50_mstc_atomic_check() to the
  new requirements for drm_dp_atomic_find_vcpi_slots() and
  drm_dp_atomic_release_vcpi_slots()

Signed-off-by: Lyude Paul <lyude@redhat.com>
Reviewed-by: Ben Skeggs <bskeggs@redhat.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: David Airlie <airlied@redhat.com>
Cc: Jerry Zuo <Jerry.Zuo@amd.com>
Cc: Harry Wentland <harry.wentland@amd.com>
Cc: Juston Li <juston.li@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190111005343.17443-21-lyude@redhat.com

diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c
index b39d0f96854445e98db03e5dcdf52a939a3a32fe..500bf3e0f6f2e9b7db7800005206f2fe318cdb89 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/disp.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c
@@ -754,16 +754,23 @@ nv50_msto_atomic_check(struct drm_encoder *encoder,
                       struct drm_crtc_state *crtc_state,
                       struct drm_connector_state *conn_state)
 {
-       struct nv50_mstc *mstc = nv50_mstc(conn_state->connector);
+       struct drm_atomic_state *state = crtc_state->state;
+       struct drm_connector *connector = conn_state->connector;
+       struct nv50_mstc *mstc = nv50_mstc(connector);
        struct nv50_mstm *mstm = mstc->mstm;
-       int bpp = conn_state->connector->display_info.bpc * 3;
+       int bpp = connector->display_info.bpc * 3;
        int slots;
 
-       mstc->pbn = drm_dp_calc_pbn_mode(crtc_state->adjusted_mode.clock, bpp);
+       mstc->pbn = drm_dp_calc_pbn_mode(crtc_state->adjusted_mode.clock,
+                                        bpp);
 
-       slots = drm_dp_find_vcpi_slots(&mstm->mgr, mstc->pbn);
-       if (slots < 0)
-               return slots;
+       if (drm_atomic_crtc_needs_modeset(crtc_state) &&
+           !drm_connector_is_unregistered(connector)) {
+               slots = drm_dp_atomic_find_vcpi_slots(state, &mstm->mgr,
+                                                     mstc->port, mstc->pbn);
+               if (slots < 0)
+                       return slots;
+       }
 
        return nv50_outp_atomic_check_view(encoder, crtc_state, conn_state,
                                           mstc->native);
@@ -926,12 +933,43 @@ nv50_mstc_get_modes(struct drm_connector *connector)
        return ret;
 }
 
+static int
+nv50_mstc_atomic_check(struct drm_connector *connector,
+                      struct drm_connector_state *new_conn_state)
+{
+       struct drm_atomic_state *state = new_conn_state->state;
+       struct nv50_mstc *mstc = nv50_mstc(connector);
+       struct drm_dp_mst_topology_mgr *mgr = &mstc->mstm->mgr;
+       struct drm_connector_state *old_conn_state =
+               drm_atomic_get_old_connector_state(state, connector);
+       struct drm_crtc_state *crtc_state;
+       struct drm_crtc *new_crtc = new_conn_state->crtc;
+
+       if (!old_conn_state->crtc)
+               return 0;
+
+       /* We only want to free VCPI if this state disables the CRTC on this
+        * connector
+        */
+       if (new_crtc) {
+               crtc_state = drm_atomic_get_new_crtc_state(state, new_crtc);
+
+               if (!crtc_state ||
+                   !drm_atomic_crtc_needs_modeset(crtc_state) ||
+                   crtc_state->enable)
+                       return 0;
+       }
+
+       return drm_dp_atomic_release_vcpi_slots(state, mgr, mstc->port);
+}
+
 static const struct drm_connector_helper_funcs
 nv50_mstc_help = {
        .get_modes = nv50_mstc_get_modes,
        .mode_valid = nv50_mstc_mode_valid,
        .best_encoder = nv50_mstc_best_encoder,
        .atomic_best_encoder = nv50_mstc_atomic_best_encoder,
+       .atomic_check = nv50_mstc_atomic_check,
 };
 
 static enum drm_connector_status
@@ -2104,6 +2142,10 @@ nv50_disp_atomic_check(struct drm_device *dev, struct drm_atomic_state *state)
                        return ret;
        }
 
+       ret = drm_dp_mst_atomic_check(state);
+       if (ret)
+               return ret;
+
        return 0;
 }