From: Xinliang Liu <xinliang.liu@linaro.org> To: dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, daniel@ffwll.ch, robh@kernel.org, daniel@fooishbar.org, architt@codeaurora.org, airlied@linux.ie, corbet@lwn.net, catalin.marinas@arm.com, will.deacon@arm.com, emil.l.velikov@gmail.com Cc: linux-doc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linuxarm@huawei.com, andy.green@linaro.org, haojian.zhuang@linaro.org, liguozhu@hisilicon.com, xuwei5@hisilicon.com, w.f@huawei.com, puck.chen@hisilicon.com, bintian.wang@huawei.com, benjamin.gaignard@linaro.org, xuyiping@hisilicon.com, kong.kongxinwei@hisilicon.com, zourongrong@huawei.com, lijianhua@huawei.com, sumit.semwal@linaro.org, guodong.xu@linaro.org, Xinliang Liu <xinliang.liu@linaro.org> Subject: [PATCH v4 09/11] drm/hisilicon: Add support for external bridge Date: Sat, 6 Feb 2016 11:24:56 +0800 [thread overview] Message-ID: <1454729098-79807-10-git-send-email-xinliang.liu@linaro.org> (raw) In-Reply-To: <1454729098-79807-1-git-send-email-xinliang.liu@linaro.org> Add support for external HDMI bridge. v4: None. v3: - Fix a typo: s/exteranl/external. v2: - Remove abtraction layer. Signed-off-by: Xinliang Liu <xinliang.liu@linaro.org> --- drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c | 52 ++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c b/drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c index 2837af01e935..1342d84d7c68 100644 --- a/drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c +++ b/drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c @@ -79,6 +79,7 @@ struct dsi_hw_ctx { struct dw_dsi { struct drm_encoder encoder; + struct drm_bridge *bridge; struct mipi_dsi_host host; struct drm_display_mode cur_mode; struct dsi_hw_ctx *ctx; @@ -688,6 +689,25 @@ static int dsi_host_init(struct device *dev, struct dw_dsi *dsi) return 0; } +static int dsi_bridge_init(struct drm_device *dev, struct dw_dsi *dsi) +{ + struct drm_encoder *encoder = &dsi->encoder; + struct drm_bridge *bridge = dsi->bridge; + int ret; + + /* associate the bridge to dsi encoder */ + encoder->bridge = bridge; + bridge->encoder = encoder; + + ret = drm_bridge_attach(dev, bridge); + if (ret) { + DRM_ERROR("failed to attach external bridge\n"); + return ret; + } + + return 0; +} + static int dsi_bind(struct device *dev, struct device *master, void *data) { struct dsi_data *ddata = dev_get_drvdata(dev); @@ -703,6 +723,10 @@ static int dsi_bind(struct device *dev, struct device *master, void *data) if (ret) return ret; + ret = dsi_bridge_init(drm_dev, dsi); + if (ret) + return ret; + return 0; } @@ -719,8 +743,36 @@ static const struct component_ops dsi_ops = { static int dsi_parse_dt(struct platform_device *pdev, struct dw_dsi *dsi) { struct dsi_hw_ctx *ctx = dsi->ctx; + struct device_node *np = pdev->dev.of_node; + struct device_node *endpoint, *bridge_node; + struct drm_bridge *bridge; struct resource *res; + /* + * Get the endpoint node. In our case, dsi has one output port1 + * to which the external HDMI bridge is connected. + */ + endpoint = of_graph_get_endpoint_by_regs(np, 1, -1); + if (!endpoint) { + DRM_ERROR("no valid endpoint node\n"); + return -ENODEV; + } + of_node_put(endpoint); + + bridge_node = of_graph_get_remote_port_parent(endpoint); + if (!bridge_node) { + DRM_ERROR("no valid bridge node\n"); + return -ENODEV; + } + of_node_put(bridge_node); + + bridge = of_drm_find_bridge(bridge_node); + if (!bridge) { + DRM_INFO("wait for external HDMI bridge driver.\n"); + return -EPROBE_DEFER; + } + dsi->bridge = bridge; + ctx->dsi_cfg_clk = devm_clk_get(&pdev->dev, "pclk_dsi"); if (IS_ERR(ctx->dsi_cfg_clk)) { DRM_ERROR("failed to get dsi plck clock\n"); -- 1.9.1
WARNING: multiple messages have this Message-ID (diff)
From: xinliang.liu@linaro.org (Xinliang Liu) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v4 09/11] drm/hisilicon: Add support for external bridge Date: Sat, 6 Feb 2016 11:24:56 +0800 [thread overview] Message-ID: <1454729098-79807-10-git-send-email-xinliang.liu@linaro.org> (raw) In-Reply-To: <1454729098-79807-1-git-send-email-xinliang.liu@linaro.org> Add support for external HDMI bridge. v4: None. v3: - Fix a typo: s/exteranl/external. v2: - Remove abtraction layer. Signed-off-by: Xinliang Liu <xinliang.liu@linaro.org> --- drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c | 52 ++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c b/drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c index 2837af01e935..1342d84d7c68 100644 --- a/drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c +++ b/drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c @@ -79,6 +79,7 @@ struct dsi_hw_ctx { struct dw_dsi { struct drm_encoder encoder; + struct drm_bridge *bridge; struct mipi_dsi_host host; struct drm_display_mode cur_mode; struct dsi_hw_ctx *ctx; @@ -688,6 +689,25 @@ static int dsi_host_init(struct device *dev, struct dw_dsi *dsi) return 0; } +static int dsi_bridge_init(struct drm_device *dev, struct dw_dsi *dsi) +{ + struct drm_encoder *encoder = &dsi->encoder; + struct drm_bridge *bridge = dsi->bridge; + int ret; + + /* associate the bridge to dsi encoder */ + encoder->bridge = bridge; + bridge->encoder = encoder; + + ret = drm_bridge_attach(dev, bridge); + if (ret) { + DRM_ERROR("failed to attach external bridge\n"); + return ret; + } + + return 0; +} + static int dsi_bind(struct device *dev, struct device *master, void *data) { struct dsi_data *ddata = dev_get_drvdata(dev); @@ -703,6 +723,10 @@ static int dsi_bind(struct device *dev, struct device *master, void *data) if (ret) return ret; + ret = dsi_bridge_init(drm_dev, dsi); + if (ret) + return ret; + return 0; } @@ -719,8 +743,36 @@ static const struct component_ops dsi_ops = { static int dsi_parse_dt(struct platform_device *pdev, struct dw_dsi *dsi) { struct dsi_hw_ctx *ctx = dsi->ctx; + struct device_node *np = pdev->dev.of_node; + struct device_node *endpoint, *bridge_node; + struct drm_bridge *bridge; struct resource *res; + /* + * Get the endpoint node. In our case, dsi has one output port1 + * to which the external HDMI bridge is connected. + */ + endpoint = of_graph_get_endpoint_by_regs(np, 1, -1); + if (!endpoint) { + DRM_ERROR("no valid endpoint node\n"); + return -ENODEV; + } + of_node_put(endpoint); + + bridge_node = of_graph_get_remote_port_parent(endpoint); + if (!bridge_node) { + DRM_ERROR("no valid bridge node\n"); + return -ENODEV; + } + of_node_put(bridge_node); + + bridge = of_drm_find_bridge(bridge_node); + if (!bridge) { + DRM_INFO("wait for external HDMI bridge driver.\n"); + return -EPROBE_DEFER; + } + dsi->bridge = bridge; + ctx->dsi_cfg_clk = devm_clk_get(&pdev->dev, "pclk_dsi"); if (IS_ERR(ctx->dsi_cfg_clk)) { DRM_ERROR("failed to get dsi plck clock\n"); -- 1.9.1
next prev parent reply other threads:[~2016-02-06 3:24 UTC|newest] Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-02-06 3:24 [PATCH v4 00/11] Add DRM Driver for HiSilicon Kirin hi6220 SoC Xinliang Liu 2016-02-06 3:24 ` Xinliang Liu 2016-02-06 3:24 ` [PATCH v4 01/11] drm/hisilicon: Add device tree binding for hi6220 display subsystem Xinliang Liu 2016-02-06 3:24 ` Xinliang Liu 2016-02-08 10:43 ` Archit Taneja 2016-02-08 10:43 ` Archit Taneja 2016-02-17 11:46 ` Xinliang Liu 2016-02-17 11:46 ` Xinliang Liu 2016-02-08 20:12 ` Rob Herring 2016-02-08 20:12 ` Rob Herring 2016-02-15 7:30 ` Xinliang Liu 2016-02-15 7:30 ` Xinliang Liu 2016-02-06 3:24 ` [PATCH v4 02/11] drm/hisilicon: Add hisilicon kirin drm master driver Xinliang Liu 2016-02-06 3:24 ` Xinliang Liu 2016-02-06 3:24 ` [PATCH v4 03/11] drm/hisilicon: Add crtc driver for ADE Xinliang Liu 2016-02-06 3:24 ` Xinliang Liu [not found] ` <1454729098-79807-4-git-send-email-xinliang.liu-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> 2016-02-08 10:59 ` Archit Taneja 2016-02-08 10:59 ` Archit Taneja 2016-02-17 11:40 ` Xinliang Liu 2016-02-17 11:40 ` Xinliang Liu 2016-02-06 3:24 ` [PATCH v4 04/11] drm/hisilicon: Add plane " Xinliang Liu 2016-02-06 3:24 ` Xinliang Liu 2016-02-06 3:24 ` [PATCH v4 05/11] drm/hisilicon: Add vblank " Xinliang Liu 2016-02-06 3:24 ` Xinliang Liu 2016-02-06 3:24 ` [PATCH v4 06/11] drm/hisilicon: Add cma fbdev and hotplug Xinliang Liu 2016-02-06 3:24 ` Xinliang Liu 2016-02-06 3:24 ` [PATCH v4 07/11] drm/hisilicon: Add designware dsi encoder driver Xinliang Liu 2016-02-06 3:24 ` Xinliang Liu 2016-02-06 3:24 ` [PATCH v4 08/11] drm/hisilicon: Add designware dsi host driver Xinliang Liu 2016-02-06 3:24 ` Xinliang Liu 2016-02-06 3:24 ` Xinliang Liu [this message] 2016-02-06 3:24 ` [PATCH v4 09/11] drm/hisilicon: Add support for external bridge Xinliang Liu [not found] ` <1454729098-79807-1-git-send-email-xinliang.liu-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> 2016-02-06 3:24 ` [PATCH v4 10/11] MAINTAINERS: Add maintainer for hisilicon DRM driver Xinliang Liu 2016-02-06 3:24 ` Xinliang Liu 2016-02-06 3:24 ` [PATCH v4 11/11] arm64: dts: hisilicon: Add display subsystem DT nodes for hi6220 Xinliang Liu 2016-02-06 3:24 ` Xinliang Liu
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=1454729098-79807-10-git-send-email-xinliang.liu@linaro.org \ --to=xinliang.liu@linaro.org \ --cc=airlied@linux.ie \ --cc=andy.green@linaro.org \ --cc=architt@codeaurora.org \ --cc=benjamin.gaignard@linaro.org \ --cc=bintian.wang@huawei.com \ --cc=catalin.marinas@arm.com \ --cc=corbet@lwn.net \ --cc=daniel@ffwll.ch \ --cc=daniel@fooishbar.org \ --cc=devicetree@vger.kernel.org \ --cc=dri-devel@lists.freedesktop.org \ --cc=emil.l.velikov@gmail.com \ --cc=guodong.xu@linaro.org \ --cc=haojian.zhuang@linaro.org \ --cc=kong.kongxinwei@hisilicon.com \ --cc=liguozhu@hisilicon.com \ --cc=lijianhua@huawei.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-doc@vger.kernel.org \ --cc=linuxarm@huawei.com \ --cc=puck.chen@hisilicon.com \ --cc=robh@kernel.org \ --cc=sumit.semwal@linaro.org \ --cc=w.f@huawei.com \ --cc=will.deacon@arm.com \ --cc=xuwei5@hisilicon.com \ --cc=xuyiping@hisilicon.com \ --cc=zourongrong@huawei.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.