From: Andy Yan <andy.yan@rock-chips.com>
To: Miquel Raynal <miquel.raynal@bootlin.com>,
Rob Herring <robh+dt@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
devicetree@vger.kernel.org, Heiko Stuebner <heiko@sntech.de>,
linux-rockchip@lists.infradead.org,
Daniel Vetter <daniel@ffwll.ch>, David Airlie <airlied@linux.ie>,
Sandy Huang <hjc@rock-chips.com>
Cc: Paul Kocialkowski <paul.kocialkowski@bootlin.com>,
linux-arm-kernel@lists.infradead.org,
Thomas Petazzoni <thomas.petazzoni@bootlin.com>,
dri-devel@lists.freedesktop.org,
Maxime Chevallier <maxime.chevallier@bootlin.com>
Subject: Re: [PATCH 09/12] drm/rockchip: lvds: Add PX30 support【请注意，邮件由linux-rockchip-bounces+andy.yan=rock-chips.com@lists.infradead.org代发】
Date: Mon, 16 Dec 2019 20:00:31 +0800 [thread overview]
Message-ID: <02b3373e-790b-5f0c-40a0-7cc423a0dac5@rock-chips.com> (raw)
In-Reply-To: <20191213181051.25983-10-miquel.raynal@bootlin.com>
Hi Miquel:
Thanks for your work here.
A discussion about the grf write macro bellow.
On 12/14/19 2:10 AM, Miquel Raynal wrote:
> Introduce PX30 LVDS support. This means adding the relevant helper
> functions, a specific probe and also the initialization of a specific
> PHY.
>
> Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
> ---
> drivers/gpu/drm/rockchip/rockchip_lvds.c | 173 +++++++++++++++++++++++
> drivers/gpu/drm/rockchip/rockchip_lvds.h | 14 ++
> 2 files changed, 187 insertions(+)
>
> diff --git a/drivers/gpu/drm/rockchip/rockchip_lvds.c b/drivers/gpu/drm/rockchip/rockchip_lvds.c
> index a0c203dcd66f..e550c2f102e0 100644
> --- a/drivers/gpu/drm/rockchip/rockchip_lvds.c
> +++ b/drivers/gpu/drm/rockchip/rockchip_lvds.c
> @@ -10,6 +10,7 @@
> #include <linux/component.h>
> #include <linux/mfd/syscon.h>
> #include <linux/of_graph.h>
> +#include <linux/phy/phy.h>
> #include <linux/pinctrl/devinfo.h>
> #include <linux/platform_device.h>
> #include <linux/pm_runtime.h>
> @@ -54,6 +55,7 @@ struct rockchip_lvds {
> void __iomem *regs;
> struct regmap *grf;
> struct clk *pclk;
> + struct phy *dphy;
> const struct rockchip_lvds_soc_data *soc_data;
> int output; /* rgb lvds or dual lvds output */
> int format; /* vesa or jeida format */
> @@ -322,6 +324,133 @@ static void rk3288_lvds_encoder_disable(struct drm_encoder *encoder)
> drm_panel_unprepare(lvds->panel);
> }
>
> +static int px30_lvds_poweron(struct rockchip_lvds *lvds)
> +{
> + int ret;
> +
> + ret = pm_runtime_get_sync(lvds->dev);
> + if (ret < 0) {
> + DRM_DEV_ERROR(lvds->dev, "failed to get pm runtime: %d\n", ret);
> + return ret;
> + }
> +
> + /* Enable LVDS mode */
> + return regmap_update_bits(lvds->grf, PX30_LVDS_GRF_PD_VO_CON1,
> + PX30_LVDS_MODE_EN(1) | PX30_LVDS_P2S_EN(1),
> + PX30_LVDS_MODE_EN(1) | PX30_LVDS_P2S_EN(1));
> +}
> +
> +static void px30_lvds_poweroff(struct rockchip_lvds *lvds)
> +{
> + regmap_update_bits(lvds->grf, PX30_LVDS_GRF_PD_VO_CON1,
> + PX30_LVDS_MODE_EN(1) | PX30_LVDS_P2S_EN(1),
> + PX30_LVDS_MODE_EN(0) | PX30_LVDS_P2S_EN(0));
> +
> + pm_runtime_put(lvds->dev);
> +}
> +
> +static int px30_lvds_grf_config(struct drm_encoder *encoder,
> + struct drm_display_mode *mode)
> +{
> + struct rockchip_lvds *lvds = encoder_to_lvds(encoder);
> + u8 nhsync = !(mode->flags & DRM_MODE_FLAG_PHSYNC);
> + u8 nvsync = !(mode->flags & DRM_MODE_FLAG_PVSYNC);
> + u8 ndclk = !(mode->flags & DRM_MODE_FLAG_PCSYNC);
> + int ret;
> +
> + if (lvds->output != DISPLAY_OUTPUT_LVDS) {
> + DRM_DEV_ERROR(lvds->dev, "Unsupported display output %d\n",
> + lvds->output);
> + return -EINVAL;
> + }
> +
> + if (nhsync ^ nvsync) {
> + DRM_DEV_ERROR(lvds->dev, "Unsupported Hsync/Vsync polarity\n");
> + return -EINVAL;
> + }
> +
> + /* Set format */
> + ret = regmap_update_bits(lvds->grf, PX30_LVDS_GRF_PD_VO_CON1,
> + PX30_LVDS_FORMAT(lvds->format),
> + PX30_LVDS_FORMAT(lvds->format));
> + if (ret)
> + return ret;
> +
> + /* Control Hsync/Vsync polarity */
> + ret = regmap_update_bits(lvds->grf, PX30_LVDS_GRF_PD_VO_CON0,
> + PX30_LVDS_TIE_CLKS(1),
> + PX30_LVDS_TIE_CLKS(1));
> + if (ret)
> + return ret;
> +
> + /* Set Hsync/Vsync polarity */
> + ret = regmap_update_bits(lvds->grf, PX30_LVDS_GRF_PD_VO_CON0,
> + PX30_LVDS_INVERT_CLKS(1),
> + PX30_LVDS_INVERT_CLKS(nhsync));
> + if (ret)
> + return ret;
> +
> + /* Set dclk polarity */
> + return regmap_update_bits(lvds->grf, PX30_LVDS_GRF_PD_VO_CON0,
> + PX30_LVDS_INVERT_DCLK(1),
> + PX30_LVDS_INVERT_DCLK(ndclk));
> +}
> +
> +static int px30_lvds_set_vop_source(struct rockchip_lvds *lvds,
> + struct drm_encoder *encoder)
> +{
> + int vop;
> +
> + vop = drm_of_encoder_active_endpoint_id(lvds->dev->of_node, encoder);
> + if (vop < 0)
> + return vop;
> +
> + return regmap_update_bits(lvds->grf, PX30_LVDS_GRF_PD_VO_CON1,
> + PX30_LVDS_VOP_SEL(1),
> + PX30_LVDS_VOP_SEL(vop));
> +}
> +
> +static void px30_lvds_encoder_enable(struct drm_encoder *encoder)
> +{
> + struct rockchip_lvds *lvds = encoder_to_lvds(encoder);
> + struct drm_display_mode *mode = &encoder->crtc->state->adjusted_mode;
> + int ret;
> +
> + drm_panel_prepare(lvds->panel);
> +
> + ret = px30_lvds_poweron(lvds);
> + if (ret) {
> + DRM_DEV_ERROR(lvds->dev, "failed to power on LVDS: %d\n", ret);
> + drm_panel_unprepare(lvds->panel);
> + return;
> + }
> +
> + ret = px30_lvds_grf_config(encoder, mode);
> + if (ret) {
> + DRM_DEV_ERROR(lvds->dev, "failed to configure LVDS: %d\n", ret);
> + drm_panel_unprepare(lvds->panel);
> + return;
> + }
> +
> + ret = px30_lvds_set_vop_source(lvds, encoder);
> + if (ret) {
> + DRM_DEV_ERROR(lvds->dev, "failed to set VOP source: %d\n", ret);
> + drm_panel_unprepare(lvds->panel);
> + return;
> + }
> +
> + drm_panel_enable(lvds->panel);
> +}
> +
> +static void px30_lvds_encoder_disable(struct drm_encoder *encoder)
> +{
> + struct rockchip_lvds *lvds = encoder_to_lvds(encoder);
> +
> + drm_panel_disable(lvds->panel);
> + px30_lvds_poweroff(lvds);
> + drm_panel_unprepare(lvds->panel);
> +}
> +
> static const
> struct drm_encoder_helper_funcs rk3288_lvds_encoder_helper_funcs = {
> .enable = rk3288_lvds_encoder_enable,
> @@ -329,6 +458,13 @@ struct drm_encoder_helper_funcs rk3288_lvds_encoder_helper_funcs = {
> .atomic_check = rockchip_lvds_encoder_atomic_check,
> };
>
> +static const
> +struct drm_encoder_helper_funcs px30_lvds_encoder_helper_funcs = {
> + .enable = px30_lvds_encoder_enable,
> + .disable = px30_lvds_encoder_disable,
> + .atomic_check = rockchip_lvds_encoder_atomic_check,
> +};
> +
> static const struct drm_encoder_funcs rockchip_lvds_encoder_funcs = {
> .destroy = drm_encoder_cleanup,
> };
> @@ -379,16 +515,53 @@ static int rk3288_lvds_probe(struct platform_device *pdev,
> return 0;
> }
>
> +static int px30_lvds_probe(struct platform_device *pdev,
> + struct rockchip_lvds *lvds)
> +{
> + int ret;
> +
> + /* MSB */
> + ret = regmap_update_bits(lvds->grf, PX30_LVDS_GRF_PD_VO_CON1,
> + PX30_LVDS_MSBSEL(1),
> + PX30_LVDS_MSBSEL(1));
> + if (ret)
> + return ret;
> +
> + /* PHY */
> + lvds->dphy = devm_phy_get(&pdev->dev, "dphy");
> + if (IS_ERR(lvds->dphy))
> + return PTR_ERR(lvds->dphy);
> +
> + phy_init(lvds->dphy);
> + if (ret)
> + return ret;
> +
> + phy_set_mode(lvds->dphy, PHY_MODE_LVDS);
> + if (ret)
> + return ret;
> +
> + return phy_power_on(lvds->dphy);
> +}
> +
> static const struct rockchip_lvds_soc_data rk3288_lvds_data = {
> .probe = rk3288_lvds_probe,
> .helper_funcs = &rk3288_lvds_encoder_helper_funcs,
> };
>
> +static const struct rockchip_lvds_soc_data px30_lvds_data = {
> + .probe = px30_lvds_probe,
> + .helper_funcs = &px30_lvds_encoder_helper_funcs,
> +};
> +
> static const struct of_device_id rockchip_lvds_dt_ids[] = {
> {
> .compatible = "rockchip,rk3288-lvds",
> .data = &rk3288_lvds_data
> },
> + {
> + .compatible = "rockchip,px30-lvds",
> + .data = &px30_lvds_data
> + },
> {}
> };
> MODULE_DEVICE_TABLE(of, rockchip_lvds_dt_ids);
> diff --git a/drivers/gpu/drm/rockchip/rockchip_lvds.h b/drivers/gpu/drm/rockchip/rockchip_lvds.h
> index e41e9ab3c306..7cfb102b4854 100644
> --- a/drivers/gpu/drm/rockchip/rockchip_lvds.h
> +++ b/drivers/gpu/drm/rockchip/rockchip_lvds.h
> @@ -106,4 +106,18 @@
> #define LVDS_VESA_18 2
> #define LVDS_JEIDA_18 3
>
> +#define WRITE_EN(v, h, l) ((GENMASK(h, l) << 16) | (v << l))
How about rename WRITE_EN to HIWORD_UPDATE to keep align with other
modules that write grf: such as
dwmac-rk.c/dw-mipi-dsi-rockhip.c/dw-hdmi-rockchip.c
> +
> +#define PX30_LVDS_GRF_PD_VO_CON0 0x434
> +#define PX30_LVDS_TIE_CLKS(val) WRITE_EN(val, 8, 8)
> +#define PX30_LVDS_INVERT_CLKS(val) WRITE_EN(val, 9, 9)
> +#define PX30_LVDS_INVERT_DCLK(val) WRITE_EN(val, 5, 5)
> +
> +#define PX30_LVDS_GRF_PD_VO_CON1 0x438
> +#define PX30_LVDS_FORMAT(val) WRITE_EN(val, 14, 13)
> +#define PX30_LVDS_MODE_EN(val) WRITE_EN(val, 12, 12)
> +#define PX30_LVDS_MSBSEL(val) WRITE_EN(val, 11, 11)
> +#define PX30_LVDS_P2S_EN(val) WRITE_EN(val, 6, 6)
> +#define PX30_LVDS_VOP_SEL(val) WRITE_EN(val, 1, 1)
> +
> #endif /* _ROCKCHIP_LVDS_ */
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-12-16 12:09 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-13 18:10 [PATCH 00/12] Add PX30 LVDS support Miquel Raynal
2019-12-13 18:10 ` [PATCH 01/12] dt-bindings: display: rockchip-lvds: Declare PX30 compatible Miquel Raynal
2019-12-19 23:47 ` Rob Herring
2019-12-13 18:10 ` [PATCH 02/12] dt-bindings: display: rockchip-lvds: Document PX30 PHY Miquel Raynal
2019-12-16 10:48 ` Maxime Ripard
2019-12-13 18:10 ` [PATCH 03/12] drm/rockchip: lvds: Fix indentation of a #define Miquel Raynal
2019-12-13 18:10 ` [PATCH 04/12] drm/rockchip: lvds: Harmonize function names Miquel Raynal
2019-12-13 18:10 ` [PATCH 05/12] drm/rockchip: lvds: Change platform data Miquel Raynal
2019-12-13 18:10 ` [PATCH 06/12] drm/rockchip: lvds: Create an RK3288 specific probe function Miquel Raynal
2019-12-13 18:10 ` [PATCH 07/12] drm/rockchip: lvds: Helpers should return decent values Miquel Raynal
2019-12-13 18:10 ` [PATCH 08/12] drm/rockchip: lvds: Pack functions together Miquel Raynal
2019-12-13 18:10 ` [PATCH 09/12] drm/rockchip: lvds: Add PX30 support Miquel Raynal
2019-12-16 10:58 ` Maxime Ripard
2019-12-16 11:03 ` Miquel Raynal
2019-12-16 11:14 ` Maxime Ripard
2019-12-16 12:00 ` Andy Yan [this message]
2019-12-16 12:10 ` [PATCH 09/12] drm/rockchip: lvds: Add PX30 support【请注意，邮件由linux-rockchip-bounces+andy.yan=rock-chips.com@lists.infradead.org代发】 Miquel Raynal
2019-12-13 18:10 ` [PATCH 10/12] arm64: dts: rockchip: Add PX30 CRTCs graph LVDS endpoints Miquel Raynal
2019-12-13 18:28 ` Heiko Stübner
2019-12-13 18:38 ` Miquel Raynal
2019-12-13 18:10 ` [PATCH 11/12] arm64: dts: rockchip: Add PX30 DSI DPHY Miquel Raynal
2019-12-13 18:10 ` [PATCH 12/12] arm64: dts: rockchip: Add PX30 LVDS Miquel Raynal
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=02b3373e-790b-5f0c-40a0-7cc423a0dac5@rock-chips.com \
--to=andy.yan@rock-chips.com \
--cc=airlied@linux.ie \
--cc=daniel@ffwll.ch \
--cc=devicetree@vger.kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=heiko@sntech.de \
--cc=hjc@rock-chips.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=mark.rutland@arm.com \
--cc=maxime.chevallier@bootlin.com \
--cc=miquel.raynal@bootlin.com \
--cc=paul.kocialkowski@bootlin.com \
--cc=robh+dt@kernel.org \
--cc=thomas.petazzoni@bootlin.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).