From: Abhinav Kumar <quic_abhin...@quicinc.com>
Add connector abstraction for the DP MST. Each MST encoder
is connected through a DRM bridge to a MST connector and each
MST connector has a DP panel abstraction attached to it.
Signed-off-by: Abhinav Kumar <quic_abhin...@quicinc.com>
Signed-off-by: Yongxing Mou <yongxing....@oss.qualcomm.com>
---
drivers/gpu/drm/msm/dp/dp_mst_drm.c | 391 +++++++++++++++++++++++++++++++++++-
drivers/gpu/drm/msm/dp/dp_mst_drm.h | 3 +
2 files changed, 393 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/msm/dp/dp_mst_drm.c
b/drivers/gpu/drm/msm/dp/dp_mst_drm.c
index
73de29136801ef5f45e0b2d09280fe113021b68c..b4f640134af544c77ab262d2cbe0b67e1e2e1b3a
100644
--- a/drivers/gpu/drm/msm/dp/dp_mst_drm.c
+++ b/drivers/gpu/drm/msm/dp/dp_mst_drm.c
@@ -25,6 +25,8 @@
* OF THIS SOFTWARE.
*/
+#include <drm/drm_edid.h>
+#include <drm/drm_managed.h>
#include "dp_mst_drm.h"
#define to_msm_dp_mst_bridge(x) container_of((x), struct
msm_dp_mst_bridge, base)
@@ -525,7 +527,6 @@ int msm_dp_mst_drm_bridge_init(struct msm_dp *dp_display,
struct drm_encoder *en
dev = dp_display->drm_dev;
bridge->display = dp_display;
- bridge->base.funcs = &msm_dp_mst_bridge_ops;
bridge->base.encoder = encoder;
bridge->base.type = dp_display->connector_type;
bridge->base.ops = DRM_BRIDGE_OP_MODES;
@@ -554,3 +555,391 @@ int msm_dp_mst_drm_bridge_init(struct msm_dp *dp_display,
struct drm_encoder *en
end:
return rc;
}
+
+static struct msm_dp_mst_bridge_state *msm_dp_mst_br_priv_state(struct
drm_atomic_state *st,
+ struct
msm_dp_mst_bridge *bridge)
+{
+ struct drm_device *dev = bridge->base.dev;
+ struct drm_private_state *obj_state =
drm_atomic_get_private_obj_state(st, &bridge->obj);
+
+ WARN_ON(!drm_modeset_is_locked(&dev->mode_config.connection_mutex));
+
+ return to_msm_dp_mst_bridge_state_priv(obj_state);
+}
+
+/* DP MST Connector OPs */
+static int
+msm_dp_mst_connector_detect(struct drm_connector *connector,
+ struct drm_modeset_acquire_ctx *ctx,
+ bool force)
+{
+ struct msm_dp_mst_connector *mst_conn =
to_msm_dp_mst_connector(connector);
+ struct msm_dp *dp_display = mst_conn->msm_dp;
+ struct msm_dp_mst *mst = dp_display->msm_dp_mst;
+ enum drm_connector_status status = connector_status_disconnected;
+
+ if (drm_connector_is_unregistered(&mst_conn->connector))
+ return status;
+
+ if (dp_display->link_ready && dp_display->mst_active)
+ status = drm_dp_mst_detect_port(connector,
+ ctx, &mst->mst_mgr,
mst_conn->mst_port);
+
+ drm_dbg_dp(dp_display->drm_dev, "conn:%d status:%d\n",
connector->base.id, status);
+
+ return status;
+}
+
+static int msm_dp_mst_connector_get_modes(struct drm_connector *connector)
+{
+ struct msm_dp_mst_connector *mst_conn =
to_msm_dp_mst_connector(connector);
+ struct msm_dp *dp_display = mst_conn->msm_dp;
+ struct msm_dp_mst *mst = dp_display->msm_dp_mst;
+ const struct drm_edid *drm_edid;
+
+ if (drm_connector_is_unregistered(&mst_conn->connector))
+ return drm_edid_connector_update(connector, NULL);
+
+ drm_edid = drm_dp_mst_edid_read(connector, &mst->mst_mgr,
mst_conn->mst_port);
+ drm_edid_connector_update(connector, drm_edid);
+
+ return drm_edid_connector_add_modes(connector);
+}
+
+static enum drm_mode_status msm_dp_mst_connector_mode_valid(struct
drm_connector *connector,
+ const struct
drm_display_mode *mode)
+{
+ struct msm_dp_mst_connector *mst_conn;
+ struct msm_dp *dp_display;
+ struct drm_dp_mst_port *mst_port;
+ struct msm_dp_panel *dp_panel;
+ struct msm_dp_mst *mst;
+ struct msm_dp_mst_bridge_state *mst_bridge_state;
+ u16 full_pbn, required_pbn;
+ int i, active_enc_cnt = 0;
+
+ if (drm_connector_is_unregistered(connector))
+ return 0;
+
+ mst_conn = to_msm_dp_mst_connector(connector);
+ dp_display = mst_conn->msm_dp;
+ mst = dp_display->msm_dp_mst;
+ mst_port = mst_conn->mst_port;
+ dp_panel = mst_conn->dp_panel;
+
+ if (!dp_panel || !mst_port)
+ return MODE_ERROR;
+
+ for (i = 0; i < mst->max_streams; i++) {
+ mst_bridge_state =
to_msm_dp_mst_bridge_state(mst->mst_bridge[i]);
+ if (mst_bridge_state->connector &&
+ mst_bridge_state->connector != connector)
+ active_enc_cnt++;
+ }
+
+ if (active_enc_cnt < DP_STREAM_MAX)
+ full_pbn = mst_port->full_pbn;
+ else {
+ DRM_ERROR("all MST streams are active\n");
+ return MODE_BAD;
+ }
+
+ required_pbn = drm_dp_calc_pbn_mode(mode->clock,
(connector->display_info.bpc * 3) << 4);
+
+ if (required_pbn > full_pbn) {
+ drm_dbg_dp(dp_display->drm_dev, "mode:%s not supported. pbn %d
vs %d\n",
+ mode->name, required_pbn, full_pbn);
+ return MODE_BAD;
+ }
+
+ return msm_dp_display_mode_valid(dp_display,
&dp_panel->connector->display_info, mode);
+}
+
+static struct drm_encoder *
+msm_dp_mst_atomic_best_encoder(struct drm_connector *connector, struct
drm_atomic_state *state)
+{
+ struct msm_dp_mst_connector *mst_conn =
to_msm_dp_mst_connector(connector);
+ struct msm_dp *dp_display = mst_conn->msm_dp;
+ struct msm_dp_mst *mst = dp_display->msm_dp_mst;
+ struct drm_encoder *enc = NULL;
+ struct msm_dp_mst_bridge_state *mst_bridge_state;
+ u32 i;
+ struct drm_connector_state *conn_state =
drm_atomic_get_new_connector_state(state,
+
connector);
+
+ if (conn_state && conn_state->best_encoder)
+ return conn_state->best_encoder;
+
+ for (i = 0; i < mst->max_streams; i++) {
+ mst_bridge_state = msm_dp_mst_br_priv_state(state,
mst->mst_bridge[i]);
+ if (IS_ERR(mst_bridge_state))
+ goto end;
+
+ if (mst_bridge_state->connector == connector) {
+ enc = mst->mst_bridge[i]->encoder;
+ goto end;
+ }
+ }
+
+ for (i = 0; i < mst->max_streams; i++) {
+ mst_bridge_state = msm_dp_mst_br_priv_state(state,
mst->mst_bridge[i]);
+
+ if (!mst_bridge_state->connector) {
+ mst_bridge_state->connector = connector;
+ mst_bridge_state->msm_dp_panel = mst_conn->dp_panel;
+ enc = mst->mst_bridge[i]->encoder;
+ break;
+ }
+ }
+
+end:
+ if (enc)
+ drm_dbg_dp(dp_display->drm_dev, "mst connector:%d atomic best
encoder:%d\n",
+ connector->base.id, i);
+ else
+ drm_dbg_dp(dp_display->drm_dev, "mst connector:%d atomic best
encoder failed\n",
+ connector->base.id);
+
+ return enc;
+}
+
+static int msm_dp_mst_connector_atomic_check(struct drm_connector *connector,
+ struct drm_atomic_state *state)
+{
+ int rc = 0, slots;
+ struct drm_connector_state *old_conn_state;
+ struct drm_connector_state *new_conn_state;
+ struct drm_crtc *old_crtc;
+ struct drm_crtc_state *crtc_state;
+ struct msm_dp_mst_bridge *bridge;
+ struct msm_dp_mst_bridge_state *mst_bridge_state;
+ struct drm_bridge *drm_bridge;
+ struct msm_dp_mst_connector *mst_conn =
to_msm_dp_mst_connector(connector);
+ struct msm_dp *dp_display = mst_conn->msm_dp;
+ struct msm_dp_mst *mst = dp_display->msm_dp_mst;
+ struct drm_dp_mst_atomic_payload *payload;
+ struct drm_dp_mst_topology_state *mst_state;
+
+ if (!state)
+ return rc;
+
+ new_conn_state = drm_atomic_get_new_connector_state(state, connector);
+ if (!new_conn_state)
+ return rc;
+
+ old_conn_state = drm_atomic_get_old_connector_state(state, connector);
+ if (!old_conn_state)
+ goto end;
+
+ old_crtc = old_conn_state->crtc;
+ if (!old_crtc)
+ goto end;
+
+ crtc_state = drm_atomic_get_new_crtc_state(state, old_crtc);
+
+ /* attempt to release vcpi slots on a modeset change for crtc state */
+ if (drm_atomic_crtc_needs_modeset(crtc_state)) {
+ if (WARN_ON(!old_conn_state->best_encoder)) {
+ rc = -EINVAL;
+ goto end;
+ }
+
+ drm_bridge =
drm_bridge_chain_get_first_bridge(old_conn_state->best_encoder);
+ if (WARN_ON(!drm_bridge)) {
+ rc = -EINVAL;
+ goto end;
+ }
+ bridge = to_msm_dp_mst_bridge(drm_bridge);
+
+ mst_bridge_state = msm_dp_mst_br_priv_state(state, bridge);
+
+ mst_state =
to_drm_dp_mst_topology_state(mst->mst_mgr.base.state);
+
+ payload = drm_atomic_get_mst_payload_state(mst_state,
mst_conn->mst_port);
+
+ slots = payload->time_slots;
+ if (slots > 0) {
+ rc = drm_dp_atomic_release_time_slots(state,
+ &mst->mst_mgr,
+
mst_conn->mst_port);
+ if (rc) {
+ DRM_ERROR("failed releasing %d vcpi slots
%d\n", slots, rc);
+ goto end;
+ }
+ }
+
+ if (!new_conn_state->crtc) {
+ /* for cases where crtc is not disabled the slots are
not
+ * freed by drm_dp_atomic_release_time_slots. this
results
+ * in subsequent atomic_check failing since internal
slots
+ * were freed but not the DP MST mgr's
+ */
+ mst_bridge_state->num_slots = 0;
+ mst_bridge_state->connector = NULL;
+ mst_bridge_state->msm_dp_panel = NULL;
+
+ drm_dbg_dp(dp_display->drm_dev, "clear best encoder:
%d\n", bridge->id);
+ }
+ }
+
+end:
+ drm_dbg_dp(dp_display->drm_dev, "mst connector:%d atomic check ret
%d\n",
+ connector->base.id, rc);
+ return rc;
+}
+
+static void dp_mst_connector_destroy(struct drm_connector *connector)
+{
+ struct msm_dp_mst_connector *mst_conn =
to_msm_dp_mst_connector(connector);
+
+ drm_connector_cleanup(connector);
+ drm_dp_mst_put_port_malloc(mst_conn->mst_port);
+ kfree(mst_conn);
+}
+
+/* DRM MST callbacks */
+static const struct drm_connector_helper_funcs
msm_dp_drm_mst_connector_helper_funcs = {
+ .get_modes = msm_dp_mst_connector_get_modes,
+ .detect_ctx = msm_dp_mst_connector_detect,
+ .mode_valid = msm_dp_mst_connector_mode_valid,
+ .atomic_best_encoder = msm_dp_mst_atomic_best_encoder,
+ .atomic_check = msm_dp_mst_connector_atomic_check,
+};
+
+static const struct drm_connector_funcs msm_dp_drm_mst_connector_funcs = {
+ .reset = drm_atomic_helper_connector_reset,
+ .destroy = dp_mst_connector_destroy,
+ .fill_modes = drm_helper_probe_single_connector_modes,
+ .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
+ .atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
+};
+
+static struct drm_connector *
+msm_dp_mst_add_connector(struct drm_dp_mst_topology_mgr *mgr,
+ struct drm_dp_mst_port *port, const char *pathprop)
+{
+ struct msm_dp_mst *dp_mst;
+ struct drm_device *dev;
+ struct msm_dp *dp_display;
+ struct msm_dp_mst_connector *mst_conn;
+ struct drm_connector *connector;
+ int rc, i;
+
+ dp_mst = container_of(mgr, struct msm_dp_mst, mst_mgr);
+
+ dp_display = dp_mst->msm_dp;
+ dev = dp_display->drm_dev;
+
+ mst_conn = kzalloc(sizeof(*mst_conn), GFP_KERNEL);
+
+ if (!mst_conn)
+ return NULL;
+
+ drm_modeset_lock_all(dev);
+
+ connector = &mst_conn->connector;
+ rc = drm_connector_dynamic_init(dev, connector,
+ &msm_dp_drm_mst_connector_funcs,
+ DRM_MODE_CONNECTOR_DisplayPort, NULL);
+ if (rc) {
+ kfree(mst_conn);
+ drm_modeset_unlock_all(dev);
+ return NULL;
+ }
+
+ mst_conn->dp_panel = msm_dp_display_get_panel(dp_display);
+ if (!mst_conn->dp_panel) {
+ DRM_ERROR("failed to get dp_panel for connector\n");
+ kfree(mst_conn);
+ drm_modeset_unlock_all(dev);
+ return NULL;
+ }
+
+ mst_conn->dp_panel->connector = connector;
+ mst_conn->msm_dp = dp_display;
+
+ drm_connector_helper_add(connector,
&msm_dp_drm_mst_connector_helper_funcs);
+
+ if (connector->funcs->reset)
+ connector->funcs->reset(connector);
+
+ /* add all encoders as possible encoders */
+ for (i = 0; i < dp_mst->max_streams; i++) {
+ rc = drm_connector_attach_encoder(connector,
dp_mst->mst_bridge[i]->encoder);
+
+ if (rc) {
+ DRM_ERROR("failed to attach encoder to connector,
%d\n", rc);
+ kfree(mst_conn);
+ drm_modeset_unlock_all(dev);
+ return NULL;
+ }
+ }
+
+ mst_conn->mst_port = port;
+ drm_dp_mst_get_port_malloc(mst_conn->mst_port);
+
+ drm_object_attach_property(&connector->base,
+ dev->mode_config.path_property, 0);
+ drm_object_attach_property(&connector->base,
+ dev->mode_config.tile_property, 0);
+
+ drm_modeset_unlock_all(dev);
+
+ drm_dbg_dp(dp_display->drm_dev, "add MST connector id:%d\n",
connector->base.id);
+
+ return connector;
+}
+
+static const struct drm_dp_mst_topology_cbs msm_dp_mst_drm_cbs = {
+ .add_connector = msm_dp_mst_add_connector,
+};
+
+int msm_dp_mst_init(struct msm_dp *dp_display, u32 max_streams, struct
drm_dp_aux *drm_aux)
+{
+ struct drm_device *dev;
+ int conn_base_id = 0;
+ int ret;
+ struct msm_dp_mst *msm_dp_mst;
+
+ if (!dp_display) {
+ DRM_ERROR("invalid params\n");
+ return 0;
+ }
+
+ dev = dp_display->drm_dev;
+
+ msm_dp_mst = devm_kzalloc(dev->dev, sizeof(*msm_dp_mst), GFP_KERNEL);
+ if (!msm_dp_mst)
+ return -ENOMEM;
+
+ memset(&msm_dp_mst->mst_mgr, 0, sizeof(msm_dp_mst->mst_mgr));
+ msm_dp_mst->mst_mgr.cbs = &msm_dp_mst_drm_cbs;
+ conn_base_id = dp_display->connector->base.id;
+ msm_dp_mst->msm_dp = dp_display;
+ msm_dp_mst->max_streams = max_streams;
+
+ for (int i = 0; i < DP_STREAM_MAX; i++) {
+ msm_dp_mst->mst_bridge[i] = devm_drm_bridge_alloc(dev->dev,
+ struct msm_dp_mst_bridge, base,
+ &msm_dp_mst_bridge_ops);
+ }
+
+ msm_dp_mst->dp_aux = drm_aux;
+
+ ret = drm_dp_mst_topology_mgr_init(&msm_dp_mst->mst_mgr, dev,
+ drm_aux,
+ MAX_DPCD_TRANSACTION_BYTES,
+ max_streams,
+ conn_base_id);
+ if (ret) {
+ DRM_ERROR("DP DRM MST topology manager init failed\n");
+ return ret;
+ }
+
+ dp_display->msm_dp_mst = msm_dp_mst;
+
+ mutex_init(&msm_dp_mst->mst_lock);
+
+ drm_dbg_dp(dp_display->drm_dev, "DP DRM MST topology manager init
completed\n");
+ return ret;
+}
diff --git a/drivers/gpu/drm/msm/dp/dp_mst_drm.h
b/drivers/gpu/drm/msm/dp/dp_mst_drm.h
index
d75731ca2e5870377026e8ad1057bdcc5f0d4c78..1484fabd92ad0075eac5369aac8ca462acbd3eda
100644
--- a/drivers/gpu/drm/msm/dp/dp_mst_drm.h
+++ b/drivers/gpu/drm/msm/dp/dp_mst_drm.h
@@ -70,6 +70,7 @@ struct msm_dp_mst {
struct drm_dp_mst_topology_mgr mst_mgr;
struct msm_dp_mst_bridge *mst_bridge[DP_STREAM_MAX];
struct msm_dp *msm_dp;
+ struct drm_dp_aux *dp_aux;
u32 max_streams;
struct mutex mst_lock;
};
@@ -83,4 +84,6 @@ struct msm_dp_mst_connector {
int msm_dp_mst_drm_bridge_init(struct msm_dp *dp, struct drm_encoder *encoder);
+int msm_dp_mst_init(struct msm_dp *dp_display, u32 max_streams, struct
drm_dp_aux *drm_aux);
+
#endif /* _DP_MST_DRM_H_ */
--
2.34.1
