On Mon, May 01, 2017 at 11:36:59AM -0700, Dhinakaran Pandiyan wrote:
> From: "Pandiyan, Dhinakaran" <dhinakaran.pandiyan@xxxxxxxxx>
>
> Use the added helpers to track MST link bandwidth for atomic modesets.
> Link bw is acquired in the ->atomic_check() phase when CRTCs are being
> enabled with drm_atomic_find_vcpi_slots(). Similarly, link bw is released
> during ->atomic_check() with the connector helper callback ->atomic_check()
> when CRTCs are disabled.
>
> v6: active_changed does not alter vcpi allocations (Maarten)
> v5: Implement connector->atomic_check() in place of atomic_release()
> v4: Return an int from intel_dp_mst_atomic_release() (Maarten)
> v3:
> Handled the case where ->atomic_release() is called more than once
> during an atomic_check() for the same state.
> v2:
> Squashed atomic_release() implementation and caller (Daniel)
> Fixed logic for connector-crtc switching case (Daniel)
> Fixed logic for suspend-resume case.
>
> Cc: Daniel Vetter <daniel.vetter@xxxxxxxx>
> Cc: Maarten Lankhorst <maarten.lankhorst@xxxxxxxxxxxxxxx>
> Cc: Archit Taneja <architt@xxxxxxxxxxxxxx>
> Cc: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
> Cc: Harry Wentland <Harry.wentland@xxxxxxx>
>
> Acked-by: Harry Wentland <harry.wentland@xxxxxxx>
> Reviewed-by: Maarten Lankhorst <maarten.lankhorst@xxxxxxxxxxxxxxx>
> Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/intel_dp_mst.c | 48 ++++++++++++++++++++++++++++++++-----
> 1 file changed, 42 insertions(+), 6 deletions(-)
This only touches i915 code, the prefix for the patch title should be
drm/i915 or drm/i915/dp, not drm/dp. drm/dp is only for core dp code
shared among drivers.
-Daniel
>
> diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c
> index 5af22a7..68c788e 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 = intel_dp_max_lane_count(intel_dp);
> -
> 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,
> @@ -378,6 +413,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)
> --
> 2.7.4
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
