| Message ID | 20240221-x1e80100-display-refactor-connector-v1-2-86c0e1ebd5ec@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | drm/msm/dp: Rework the eDP/DP modes and add support for X1E80100 | expand |
On Wed, Feb 21, 2024 at 12:50:32AM +0200, Abel Vesa wrote: > diff --git a/drivers/gpu/drm/msm/dp/dp_ctrl.h b/drivers/gpu/drm/msm/dp/dp_ctrl.h > index fa014cee7e21..a10d1b19d172 100644 > --- a/drivers/gpu/drm/msm/dp/dp_ctrl.h > +++ b/drivers/gpu/drm/msm/dp/dp_ctrl.h > @@ -32,6 +32,7 @@ struct dp_ctrl *dp_ctrl_get(struct device *dev, struct dp_link *link, > struct phy *phy); > > void dp_ctrl_reset_irq_ctrl(struct dp_ctrl *dp_ctrl, bool enable); > +int dp_ctrl_phy_set_mode(struct dp_ctrl *dp_ctrl, int mode); > void dp_ctrl_phy_init(struct dp_ctrl *dp_ctrl); > void dp_ctrl_phy_exit(struct dp_ctrl *dp_ctrl); > void dp_ctrl_irq_phy_exit(struct dp_ctrl *dp_ctrl); > diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c > index e4433891becb..9e58285d4ec6 100644 > --- a/drivers/gpu/drm/msm/dp/dp_display.c > +++ b/drivers/gpu/drm/msm/dp/dp_display.c > @@ -1229,6 +1229,7 @@ static int dp_display_probe(struct platform_device *pdev) > int rc = 0; > struct dp_display_private *dp; > const struct msm_dp_desc *desc; > + bool is_edp = false; > > if (!pdev || !pdev->dev.of_node) { > DRM_ERROR("pdev not found\n"); > @@ -1243,13 +1244,19 @@ static int dp_display_probe(struct platform_device *pdev) > if (!desc) > return -EINVAL; > > + if (dp->dp_display.connector_type == DRM_MODE_CONNECTOR_eDP || dp is just allocated, and will be 0. You need to check desc->connector_type here. Regards, Bjorn > + of_property_read_bool(pdev->dev.of_node, "is-edp")) > + is_edp = true; > + > + dp->dp_display.is_edp = is_edp; > dp->dp_display.pdev = pdev; > dp->name = "drm_dp"; > dp->id = desc->id; > - dp->dp_display.connector_type = desc->connector_type; > dp->wide_bus_en = desc->wide_bus_en; > - dp->dp_display.is_edp = > - (dp->dp_display.connector_type == DRM_MODE_CONNECTOR_eDP); > + > + dp->dp_display.connector_type = is_edp ? > + DRM_MODE_CONNECTOR_eDP : > + DRM_MODE_CONNECTOR_DisplayPort; > > rc = dp_init_sub_modules(dp); > if (rc) { > @@ -1257,6 +1264,12 @@ static int dp_display_probe(struct platform_device *pdev) > return -EPROBE_DEFER; > } > > + rc = dp_ctrl_phy_set_mode(dp->ctrl, is_edp ? PHY_SUBMODE_EDP : PHY_SUBMODE_DP); > + if (rc) { > + DRM_ERROR("setting PHY submode failed\n"); > + goto err; > + } > + > /* setup event q */ > mutex_init(&dp->event_mutex); > init_waitqueue_head(&dp->event_q); > > -- > 2.34.1 >
diff --git a/drivers/gpu/drm/msm/dp/dp_ctrl.c b/drivers/gpu/drm/msm/dp/dp_ctrl.c index 320f17fce9a6..bd81cc6bd5e3 100644 --- a/drivers/gpu/drm/msm/dp/dp_ctrl.c +++ b/drivers/gpu/drm/msm/dp/dp_ctrl.c @@ -1533,6 +1533,17 @@ void dp_ctrl_set_psr(struct dp_ctrl *dp_ctrl, bool enter) } } +int dp_ctrl_phy_set_mode(struct dp_ctrl *dp_ctrl, int submode) +{ + struct dp_ctrl_private *ctrl; + struct phy *phy; + + ctrl = container_of(dp_ctrl, struct dp_ctrl_private, dp_ctrl); + phy = ctrl->phy; + + return phy_set_mode_ext(phy, PHY_MODE_DP, submode); +} + void dp_ctrl_phy_init(struct dp_ctrl *dp_ctrl) { struct dp_ctrl_private *ctrl; diff --git a/drivers/gpu/drm/msm/dp/dp_ctrl.h b/drivers/gpu/drm/msm/dp/dp_ctrl.h index fa014cee7e21..a10d1b19d172 100644 --- a/drivers/gpu/drm/msm/dp/dp_ctrl.h +++ b/drivers/gpu/drm/msm/dp/dp_ctrl.h @@ -32,6 +32,7 @@ struct dp_ctrl *dp_ctrl_get(struct device *dev, struct dp_link *link, struct phy *phy); void dp_ctrl_reset_irq_ctrl(struct dp_ctrl *dp_ctrl, bool enable); +int dp_ctrl_phy_set_mode(struct dp_ctrl *dp_ctrl, int mode); void dp_ctrl_phy_init(struct dp_ctrl *dp_ctrl); void dp_ctrl_phy_exit(struct dp_ctrl *dp_ctrl); void dp_ctrl_irq_phy_exit(struct dp_ctrl *dp_ctrl); diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c index e4433891becb..9e58285d4ec6 100644 --- a/drivers/gpu/drm/msm/dp/dp_display.c +++ b/drivers/gpu/drm/msm/dp/dp_display.c @@ -1229,6 +1229,7 @@ static int dp_display_probe(struct platform_device *pdev) int rc = 0; struct dp_display_private *dp; const struct msm_dp_desc *desc; + bool is_edp = false; if (!pdev || !pdev->dev.of_node) { DRM_ERROR("pdev not found\n"); @@ -1243,13 +1244,19 @@ static int dp_display_probe(struct platform_device *pdev) if (!desc) return -EINVAL; + if (dp->dp_display.connector_type == DRM_MODE_CONNECTOR_eDP || + of_property_read_bool(pdev->dev.of_node, "is-edp")) + is_edp = true; + + dp->dp_display.is_edp = is_edp; dp->dp_display.pdev = pdev; dp->name = "drm_dp"; dp->id = desc->id; - dp->dp_display.connector_type = desc->connector_type; dp->wide_bus_en = desc->wide_bus_en; - dp->dp_display.is_edp = - (dp->dp_display.connector_type == DRM_MODE_CONNECTOR_eDP); + + dp->dp_display.connector_type = is_edp ? + DRM_MODE_CONNECTOR_eDP : + DRM_MODE_CONNECTOR_DisplayPort; rc = dp_init_sub_modules(dp); if (rc) { @@ -1257,6 +1264,12 @@ static int dp_display_probe(struct platform_device *pdev) return -EPROBE_DEFER; } + rc = dp_ctrl_phy_set_mode(dp->ctrl, is_edp ? PHY_SUBMODE_EDP : PHY_SUBMODE_DP); + if (rc) { + DRM_ERROR("setting PHY submode failed\n"); + goto err; + } + /* setup event q */ mutex_init(&dp->event_mutex); init_waitqueue_head(&dp->event_q);
Instead of relying on different compatibles for eDP and DP, use the is-edp property from DT to figure out the connector type and then pass on that information to the PHY. Signed-off-by: Abel Vesa <abel.vesa@linaro.org> --- drivers/gpu/drm/msm/dp/dp_ctrl.c | 11 +++++++++++ drivers/gpu/drm/msm/dp/dp_ctrl.h | 1 + drivers/gpu/drm/msm/dp/dp_display.c | 19 ++++++++++++++++--- 3 files changed, 28 insertions(+), 3 deletions(-)