| Message ID | 20211217150854.2081-9-granquet@baylibre.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v7,1/8] dt-bindings: mediatek,dpi: Add DP_INTF compatible | expand |
Hi, Guillaume: On Fri, 2021-12-17 at 16:08 +0100, Guillaume Ranquet wrote: > This adds support of eDP panel to the mt8195 DP driver. > > This driver is based on an initial version by > Jason-JH.Lin <jason-jh.lin@mediatek.com>. This patch looks good to me, but I've a question. Do you have both display port platform and eDP platform? If you have only one of these, why do you upstream the one which you never have? Regards, CK > > Signed-off-by: Markus Schneider-Pargmann <msp@baylibre.com> > Signed-off-by: Guillaume Ranquet <granquet@baylibre.com> > --- > drivers/gpu/drm/mediatek/mtk_dp.c | 102 +++++++++++++++++++++------- > -- > 1 file changed, 73 insertions(+), 29 deletions(-) > > diff --git a/drivers/gpu/drm/mediatek/mtk_dp.c > b/drivers/gpu/drm/mediatek/mtk_dp.c > index 41e95a0bcaa2c..a256d55346a23 100644 > --- a/drivers/gpu/drm/mediatek/mtk_dp.c > +++ b/drivers/gpu/drm/mediatek/mtk_dp.c > @@ -228,6 +228,11 @@ static struct regmap_config mtk_dp_regmap_config > = { > .name = "mtk-dp-registers", > }; > > +static bool mtk_dp_is_edp(struct mtk_dp *mtk_dp) > +{ > + return mtk_dp->next_bridge; > +} > + > static struct mtk_dp *mtk_dp_from_bridge(struct drm_bridge *b) > { > return container_of(b, struct mtk_dp, bridge); > @@ -1185,26 +1190,49 @@ static int mtk_dp_get_calibration_data(struct > mtk_dp *mtk_dp) > return PTR_ERR(buf); > } > > - cal_data->glb_bias_trim = > - check_cal_data_valid(1, 0x1e, (buf[0] >> 27) & 0x1f, > 0xf); > - cal_data->clktx_impse = > - check_cal_data_valid(1, 0xe, (buf[0] >> 13) & 0xf, > 0x8); > - cal_data->ln0_tx_impsel_pmos = > - check_cal_data_valid(1, 0xe, (buf[1] >> 28) & 0xf, > 0x8); > - cal_data->ln0_tx_impsel_nmos = > - check_cal_data_valid(1, 0xe, (buf[1] >> 24) & 0xf, > 0x8); > - cal_data->ln1_tx_impsel_pmos = > - check_cal_data_valid(1, 0xe, (buf[1] >> 20) & 0xf, > 0x8); > - cal_data->ln1_tx_impsel_nmos = > - check_cal_data_valid(1, 0xe, (buf[1] >> 16) & 0xf, > 0x8); > - cal_data->ln2_tx_impsel_pmos = > - check_cal_data_valid(1, 0xe, (buf[1] >> 12) & 0xf, > 0x8); > - cal_data->ln2_tx_impsel_nmos = > - check_cal_data_valid(1, 0xe, (buf[1] >> 8) & 0xf, 0x8); > - cal_data->ln3_tx_impsel_pmos = > - check_cal_data_valid(1, 0xe, (buf[1] >> 4) & 0xf, 0x8); > - cal_data->ln3_tx_impsel_nmos = > - check_cal_data_valid(1, 0xe, buf[1] & 0xf, 0x8); > + if (mtk_dp_is_edp(mtk_dp)) { > + cal_data->glb_bias_trim = > + check_cal_data_valid(1, 0x1e, (buf[3] >> 27) & > 0x1f, 0xf); > + cal_data->clktx_impse = > + check_cal_data_valid(1, 0xe, (buf[0] >> 9) & > 0xf, 0x8); > + cal_data->ln0_tx_impsel_pmos = > + check_cal_data_valid(1, 0xe, (buf[2] >> 28) & > 0xf, 0x8); > + cal_data->ln0_tx_impsel_nmos = > + check_cal_data_valid(1, 0xe, (buf[2] >> 24) & > 0xf, 0x8); > + cal_data->ln1_tx_impsel_pmos = > + check_cal_data_valid(1, 0xe, (buf[2] >> 20) & > 0xf, 0x8); > + cal_data->ln1_tx_impsel_nmos = > + check_cal_data_valid(1, 0xe, (buf[2] >> 16) & > 0xf, 0x8); > + cal_data->ln2_tx_impsel_pmos = > + check_cal_data_valid(1, 0xe, (buf[2] >> 12) & > 0xf, 0x8); > + cal_data->ln2_tx_impsel_nmos = > + check_cal_data_valid(1, 0xe, (buf[2] >> 8) & > 0xf, 0x8); > + cal_data->ln3_tx_impsel_pmos = > + check_cal_data_valid(1, 0xe, (buf[2] >> 4) & > 0xf, 0x8); > + cal_data->ln3_tx_impsel_nmos = > + check_cal_data_valid(1, 0xe, buf[2] & 0xf, > 0x8); > + } else { > + cal_data->glb_bias_trim = > + check_cal_data_valid(1, 0x1e, (buf[0] >> 27) & > 0x1f, 0xf); > + cal_data->clktx_impse = > + check_cal_data_valid(1, 0xe, (buf[0] >> 13) & > 0xf, 0x8); > + cal_data->ln0_tx_impsel_pmos = > + check_cal_data_valid(1, 0xe, (buf[1] >> 28) & > 0xf, 0x8); > + cal_data->ln0_tx_impsel_nmos = > + check_cal_data_valid(1, 0xe, (buf[1] >> 24) & > 0xf, 0x8); > + cal_data->ln1_tx_impsel_pmos = > + check_cal_data_valid(1, 0xe, (buf[1] >> 20) & > 0xf, 0x8); > + cal_data->ln1_tx_impsel_nmos = > + check_cal_data_valid(1, 0xe, (buf[1] >> 16) & > 0xf, 0x8); > + cal_data->ln2_tx_impsel_pmos = > + check_cal_data_valid(1, 0xe, (buf[1] >> 12) & > 0xf, 0x8); > + cal_data->ln2_tx_impsel_nmos = > + check_cal_data_valid(1, 0xe, (buf[1] >> 8) & > 0xf, 0x8); > + cal_data->ln3_tx_impsel_pmos = > + check_cal_data_valid(1, 0xe, (buf[1] >> 4) & > 0xf, 0x8); > + cal_data->ln3_tx_impsel_nmos = > + check_cal_data_valid(1, 0xe, buf[1] & 0xf, > 0x8); > + } > > kfree(buf); > > @@ -1322,7 +1350,11 @@ static void mtk_dp_video_mute(struct mtk_dp > *mtk_dp, bool enable) > mtk_dp_update_bits(mtk_dp, MTK_DP_ENC0_P0_3000, val, > VIDEO_MUTE_SEL_DP_ENC0_P0_MASK | > VIDEO_MUTE_SW_DP_ENC0_P0_MASK); > - mtk_dp_sip_atf_call(MTK_DP_SIP_ATF_VIDEO_UNMUTE, enable); > + > + if (mtk_dp_is_edp(mtk_dp)) > + mtk_dp_sip_atf_call(MTK_DP_SIP_ATF_EDP_VIDEO_UNMUTE, > enable); > + else > + mtk_dp_sip_atf_call(MTK_DP_SIP_ATF_VIDEO_UNMUTE, > enable); > } > > static void mtk_dp_audio_mute(struct mtk_dp *mtk_dp, bool mute) > @@ -2326,6 +2358,9 @@ static enum drm_connector_status > mtk_dp_bdg_detect(struct drm_bridge *bridge) > enum drm_connector_status ret = connector_status_disconnected; > u8 sink_count = 0; > > + if (mtk_dp_is_edp(mtk_dp)) > + return connector_status_connected; > + > if (mtk_dp_plug_state(mtk_dp)) { > drm_dp_dpcd_readb(&mtk_dp->aux, DP_SINK_COUNT, > &sink_count); > if (DP_GET_SINK_COUNT(sink_count)) > @@ -2888,7 +2923,11 @@ static int mtk_dp_probe(struct platform_device > *pdev) > } > > mtk_dp->next_bridge = devm_drm_of_get_bridge(dev, dev->of_node, > 1, 0); > - if (IS_ERR(mtk_dp->next_bridge)) { > + if (IS_ERR(mtk_dp->next_bridge) && PTR_ERR(mtk_dp->next_bridge) > == -ENODEV) { > + dev_info(dev, > + "No panel connected in devicetree, continuing > as external DP\n"); > + mtk_dp->next_bridge = NULL; > + } else if (IS_ERR(mtk_dp->next_bridge)) { > ret = PTR_ERR(mtk_dp->next_bridge); > dev_err_probe(dev, ret, "Failed to get bridge\n"); > return ret; > @@ -2915,12 +2954,14 @@ static int mtk_dp_probe(struct > platform_device *pdev) > > platform_set_drvdata(pdev, mtk_dp); > > - mutex_init(&mtk_dp->update_plugged_status_lock); > - ret = mtk_dp_register_audio_driver(dev); > - if (ret) { > - dev_err(dev, "Failed to register audio driver: %d\n", > - ret); > - return ret; > + if (!mtk_dp_is_edp(mtk_dp)) { > + mutex_init(&mtk_dp->update_plugged_status_lock); > + ret = mtk_dp_register_audio_driver(dev); > + if (ret) { > + dev_err(dev, "Failed to register audio driver: > %d\n", > + ret); > + return ret; > + } > } > > mtk_dp->phy_dev = platform_device_register_data(dev, "mediatek- > dp-phy", > @@ -2944,7 +2985,10 @@ static int mtk_dp_probe(struct platform_device > *pdev) > > mtk_dp->bridge.funcs = &mtk_dp_bridge_funcs; > mtk_dp->bridge.of_node = dev->of_node; > - mtk_dp->bridge.type = DRM_MODE_CONNECTOR_DisplayPort; > + if (mtk_dp_is_edp(mtk_dp)) > + mtk_dp->bridge.type = DRM_MODE_CONNECTOR_eDP; > + else > + mtk_dp->bridge.type = DRM_MODE_CONNECTOR_DisplayPort; > > mtk_dp->bridge.ops = > DRM_BRIDGE_OP_DETECT | DRM_BRIDGE_OP_EDID | > DRM_BRIDGE_OP_HPD;
diff --git a/drivers/gpu/drm/mediatek/mtk_dp.c b/drivers/gpu/drm/mediatek/mtk_dp.c index 41e95a0bcaa2c..a256d55346a23 100644 --- a/drivers/gpu/drm/mediatek/mtk_dp.c +++ b/drivers/gpu/drm/mediatek/mtk_dp.c @@ -228,6 +228,11 @@ static struct regmap_config mtk_dp_regmap_config = { .name = "mtk-dp-registers", }; +static bool mtk_dp_is_edp(struct mtk_dp *mtk_dp) +{ + return mtk_dp->next_bridge; +} + static struct mtk_dp *mtk_dp_from_bridge(struct drm_bridge *b) { return container_of(b, struct mtk_dp, bridge); @@ -1185,26 +1190,49 @@ static int mtk_dp_get_calibration_data(struct mtk_dp *mtk_dp) return PTR_ERR(buf); } - cal_data->glb_bias_trim = - check_cal_data_valid(1, 0x1e, (buf[0] >> 27) & 0x1f, 0xf); - cal_data->clktx_impse = - check_cal_data_valid(1, 0xe, (buf[0] >> 13) & 0xf, 0x8); - cal_data->ln0_tx_impsel_pmos = - check_cal_data_valid(1, 0xe, (buf[1] >> 28) & 0xf, 0x8); - cal_data->ln0_tx_impsel_nmos = - check_cal_data_valid(1, 0xe, (buf[1] >> 24) & 0xf, 0x8); - cal_data->ln1_tx_impsel_pmos = - check_cal_data_valid(1, 0xe, (buf[1] >> 20) & 0xf, 0x8); - cal_data->ln1_tx_impsel_nmos = - check_cal_data_valid(1, 0xe, (buf[1] >> 16) & 0xf, 0x8); - cal_data->ln2_tx_impsel_pmos = - check_cal_data_valid(1, 0xe, (buf[1] >> 12) & 0xf, 0x8); - cal_data->ln2_tx_impsel_nmos = - check_cal_data_valid(1, 0xe, (buf[1] >> 8) & 0xf, 0x8); - cal_data->ln3_tx_impsel_pmos = - check_cal_data_valid(1, 0xe, (buf[1] >> 4) & 0xf, 0x8); - cal_data->ln3_tx_impsel_nmos = - check_cal_data_valid(1, 0xe, buf[1] & 0xf, 0x8); + if (mtk_dp_is_edp(mtk_dp)) { + cal_data->glb_bias_trim = + check_cal_data_valid(1, 0x1e, (buf[3] >> 27) & 0x1f, 0xf); + cal_data->clktx_impse = + check_cal_data_valid(1, 0xe, (buf[0] >> 9) & 0xf, 0x8); + cal_data->ln0_tx_impsel_pmos = + check_cal_data_valid(1, 0xe, (buf[2] >> 28) & 0xf, 0x8); + cal_data->ln0_tx_impsel_nmos = + check_cal_data_valid(1, 0xe, (buf[2] >> 24) & 0xf, 0x8); + cal_data->ln1_tx_impsel_pmos = + check_cal_data_valid(1, 0xe, (buf[2] >> 20) & 0xf, 0x8); + cal_data->ln1_tx_impsel_nmos = + check_cal_data_valid(1, 0xe, (buf[2] >> 16) & 0xf, 0x8); + cal_data->ln2_tx_impsel_pmos = + check_cal_data_valid(1, 0xe, (buf[2] >> 12) & 0xf, 0x8); + cal_data->ln2_tx_impsel_nmos = + check_cal_data_valid(1, 0xe, (buf[2] >> 8) & 0xf, 0x8); + cal_data->ln3_tx_impsel_pmos = + check_cal_data_valid(1, 0xe, (buf[2] >> 4) & 0xf, 0x8); + cal_data->ln3_tx_impsel_nmos = + check_cal_data_valid(1, 0xe, buf[2] & 0xf, 0x8); + } else { + cal_data->glb_bias_trim = + check_cal_data_valid(1, 0x1e, (buf[0] >> 27) & 0x1f, 0xf); + cal_data->clktx_impse = + check_cal_data_valid(1, 0xe, (buf[0] >> 13) & 0xf, 0x8); + cal_data->ln0_tx_impsel_pmos = + check_cal_data_valid(1, 0xe, (buf[1] >> 28) & 0xf, 0x8); + cal_data->ln0_tx_impsel_nmos = + check_cal_data_valid(1, 0xe, (buf[1] >> 24) & 0xf, 0x8); + cal_data->ln1_tx_impsel_pmos = + check_cal_data_valid(1, 0xe, (buf[1] >> 20) & 0xf, 0x8); + cal_data->ln1_tx_impsel_nmos = + check_cal_data_valid(1, 0xe, (buf[1] >> 16) & 0xf, 0x8); + cal_data->ln2_tx_impsel_pmos = + check_cal_data_valid(1, 0xe, (buf[1] >> 12) & 0xf, 0x8); + cal_data->ln2_tx_impsel_nmos = + check_cal_data_valid(1, 0xe, (buf[1] >> 8) & 0xf, 0x8); + cal_data->ln3_tx_impsel_pmos = + check_cal_data_valid(1, 0xe, (buf[1] >> 4) & 0xf, 0x8); + cal_data->ln3_tx_impsel_nmos = + check_cal_data_valid(1, 0xe, buf[1] & 0xf, 0x8); + } kfree(buf); @@ -1322,7 +1350,11 @@ static void mtk_dp_video_mute(struct mtk_dp *mtk_dp, bool enable) mtk_dp_update_bits(mtk_dp, MTK_DP_ENC0_P0_3000, val, VIDEO_MUTE_SEL_DP_ENC0_P0_MASK | VIDEO_MUTE_SW_DP_ENC0_P0_MASK); - mtk_dp_sip_atf_call(MTK_DP_SIP_ATF_VIDEO_UNMUTE, enable); + + if (mtk_dp_is_edp(mtk_dp)) + mtk_dp_sip_atf_call(MTK_DP_SIP_ATF_EDP_VIDEO_UNMUTE, enable); + else + mtk_dp_sip_atf_call(MTK_DP_SIP_ATF_VIDEO_UNMUTE, enable); } static void mtk_dp_audio_mute(struct mtk_dp *mtk_dp, bool mute) @@ -2326,6 +2358,9 @@ static enum drm_connector_status mtk_dp_bdg_detect(struct drm_bridge *bridge) enum drm_connector_status ret = connector_status_disconnected; u8 sink_count = 0; + if (mtk_dp_is_edp(mtk_dp)) + return connector_status_connected; + if (mtk_dp_plug_state(mtk_dp)) { drm_dp_dpcd_readb(&mtk_dp->aux, DP_SINK_COUNT, &sink_count); if (DP_GET_SINK_COUNT(sink_count)) @@ -2888,7 +2923,11 @@ static int mtk_dp_probe(struct platform_device *pdev) } mtk_dp->next_bridge = devm_drm_of_get_bridge(dev, dev->of_node, 1, 0); - if (IS_ERR(mtk_dp->next_bridge)) { + if (IS_ERR(mtk_dp->next_bridge) && PTR_ERR(mtk_dp->next_bridge) == -ENODEV) { + dev_info(dev, + "No panel connected in devicetree, continuing as external DP\n"); + mtk_dp->next_bridge = NULL; + } else if (IS_ERR(mtk_dp->next_bridge)) { ret = PTR_ERR(mtk_dp->next_bridge); dev_err_probe(dev, ret, "Failed to get bridge\n"); return ret; @@ -2915,12 +2954,14 @@ static int mtk_dp_probe(struct platform_device *pdev) platform_set_drvdata(pdev, mtk_dp); - mutex_init(&mtk_dp->update_plugged_status_lock); - ret = mtk_dp_register_audio_driver(dev); - if (ret) { - dev_err(dev, "Failed to register audio driver: %d\n", - ret); - return ret; + if (!mtk_dp_is_edp(mtk_dp)) { + mutex_init(&mtk_dp->update_plugged_status_lock); + ret = mtk_dp_register_audio_driver(dev); + if (ret) { + dev_err(dev, "Failed to register audio driver: %d\n", + ret); + return ret; + } } mtk_dp->phy_dev = platform_device_register_data(dev, "mediatek-dp-phy", @@ -2944,7 +2985,10 @@ static int mtk_dp_probe(struct platform_device *pdev) mtk_dp->bridge.funcs = &mtk_dp_bridge_funcs; mtk_dp->bridge.of_node = dev->of_node; - mtk_dp->bridge.type = DRM_MODE_CONNECTOR_DisplayPort; + if (mtk_dp_is_edp(mtk_dp)) + mtk_dp->bridge.type = DRM_MODE_CONNECTOR_eDP; + else + mtk_dp->bridge.type = DRM_MODE_CONNECTOR_DisplayPort; mtk_dp->bridge.ops = DRM_BRIDGE_OP_DETECT | DRM_BRIDGE_OP_EDID | DRM_BRIDGE_OP_HPD;