From patchwork Tue Feb 23 03:00:29 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xinliang Liu X-Patchwork-Id: 62662 Delivered-To: patch@linaro.org Received: by 10.112.43.199 with SMTP id y7csp1599434lbl; Mon, 22 Feb 2016 19:04:01 -0800 (PST) X-Received: by 10.66.160.231 with SMTP id xn7mr43585537pab.134.1456196633504; Mon, 22 Feb 2016 19:03:53 -0800 (PST) Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTP id m80si43834255pfi.252.2016.02.22.19.03.53; Mon, 22 Feb 2016 19:03:53 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dkim=neutral (body hash did not verify) header.i=@linaro.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 48B286E375; Tue, 23 Feb 2016 03:03:52 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pf0-x230.google.com (mail-pf0-x230.google.com [IPv6:2607:f8b0:400e:c00::230]) by gabe.freedesktop.org (Postfix) with ESMTPS id 084BE6E375 for ; Tue, 23 Feb 2016 03:03:51 +0000 (UTC) Received: by mail-pf0-x230.google.com with SMTP id q63so103533216pfb.0 for ; Mon, 22 Feb 2016 19:03:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=472moBt/9ocTkghlkLiIArz446EaACBIz+HbvPnSZiE=; b=jqkTof3GtPZ3rw5MyrZDM7UcvTqAScNcXjRGzAOHLJl3gqzCC+jd23wdZclmM2SSaL VPkwHqO+TzO6KdXf0XWSkftO70S+tuVPCbm2upuw5nJa4oQ7SIpHWjsUkUuSQsDWecW3 hgd/MWLjn7TCkKxwjjJ1LN1GPMyB6cn09GF44= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=472moBt/9ocTkghlkLiIArz446EaACBIz+HbvPnSZiE=; b=SHYebXLX43E4LdoQi9k3ZJzKOLhItdRwuO339HW/1bkK4nwyNX2b3iFmFfk8qftMU2 toLSfoXcQWgVeAKoqVKr3lwXcxZgG9vSmDleoDHw1WvKifqjfxuT/wbcxrrD6U2oQr/L ovuuUV4eK3WqGbAeRnqR7FlBLWViyLQGT11D42RjhNlRgawDig22ELBhONr0IlkVu4l7 e0L444uKS8RUJtMIuw82/p68WhiSIVfvLXHpjOpM11KLNHg+Led1ko0sczmy6wthrmwP 9jPVg588T6X+39gosaMpFcEh2RUzWtuRRXBIzznv5VYQyfafPeRwlP/OR1Lyeo4e0uZY Z1wg== X-Gm-Message-State: AG10YOQ2fT6lbrEwMgtkKT5CCLU0g+u9M5l87QP3lnK/dpSbs6LSKP1q3bXNjMJ1SZwfinoa X-Received: by 10.98.8.74 with SMTP id c71mr43448098pfd.155.1456196630687; Mon, 22 Feb 2016 19:03:50 -0800 (PST) Received: from localhost.localdomain ([116.25.56.39]) by smtp.gmail.com with ESMTPSA id l24sm39800554pfb.73.2016.02.22.19.03.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 22 Feb 2016 19:03:50 -0800 (PST) From: Xinliang Liu 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 Subject: [PATCH v5 09/11] drm/hisilicon: Add support for external bridge Date: Tue, 23 Feb 2016 11:00:29 +0800 Message-Id: <1456196431-19923-10-git-send-email-xinliang.liu@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1456196431-19923-1-git-send-email-xinliang.liu@linaro.org> References: <1456196431-19923-1-git-send-email-xinliang.liu@linaro.org> Cc: andy.green@linaro.org, xuyiping@hisilicon.com, guodong.xu@linaro.org, linux-doc@vger.kernel.org, w.f@huawei.com, zourongrong@huawei.com, linuxarm@huawei.com, xuwei5@hisilicon.com, bintian.wang@huawei.com, haojian.zhuang@linaro.org, benjamin.gaignard@linaro.org, puck.chen@hisilicon.com, liguozhu@hisilicon.com, linux-arm-kernel@lists.infradead.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Add support for external HDMI bridge. v5: None. v4: None. v3: - Fix a typo: s/exteranl/external. v2: - Remove abtraction layer. Signed-off-by: Xinliang Liu --- 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");