From patchwork Tue Apr 4 12:15:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 9661473 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E8F1760352 for ; Tue, 4 Apr 2017 12:15:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D9FF127CF3 for ; Tue, 4 Apr 2017 12:15:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CE1BD28502; Tue, 4 Apr 2017 12:15:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6BD3C27CF3 for ; Tue, 4 Apr 2017 12:15:51 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1D33A6E5A3; Tue, 4 Apr 2017 12:15:48 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr0-x22a.google.com (mail-wr0-x22a.google.com [IPv6:2a00:1450:400c:c0c::22a]) by gabe.freedesktop.org (Postfix) with ESMTPS id D6A296E59E for ; Tue, 4 Apr 2017 12:15:45 +0000 (UTC) Received: by mail-wr0-x22a.google.com with SMTP id w43so211571178wrb.0 for ; Tue, 04 Apr 2017 05:15:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=tRTk6LT//sPGTNc9A1Z1pWNaWoTtAV4ZjHsUym/DGB0=; b=R8eK/iccNdYaj4lO/mo96T7NnjcJt6BV769mzuer9MMwF3kgdKwfQy3mqrEaOyG2u0 dDL3R8PmcD8CEcl3Z3+36QVIWI5GLTFyHFSRjGhzIN/KeecMt2xt//wVHbJFOcYpmHYf 6RLaCVWjWkfNdYaFw1uDh71n2xcE+X1FcQgDpvs4xOF4mjbMwoonL/o6G+osf4EfN4fC Edl8c9WiB+qBqjfMnTv+J+4OJRpndp4b4hvvFF7yeVQRxbu3LldmHNiYckIlew8V3VsC 6Lwd+hQvsUEBClbqoOJzsEA4kzuaLm0YG5BZ+eoZzg/Q3SJxSOie3MEU4/OKsCmEv+jK DSQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=tRTk6LT//sPGTNc9A1Z1pWNaWoTtAV4ZjHsUym/DGB0=; b=rFhsx56zUhAHVmj/QUKISnCglxuDCvEfJrm0ZxDJtR1rz6q5vrl+Avp9qoYgC0EGAI DKbmunofEJQwjJ8SEx/n+JUl/uA6AGyt7ftGLsDwKd60wD5qK314gbmYQtPb0V34GR2Z i76iCO//t+u0sAC3wtfPq3tjSxIUy7ZSW3OY76OK5+qF9eqZUY4pSkI0iH888qFIIahJ Ak5wHDB3dO6DFI7Ml2iMxGrdzYd5+ceyX+/jZxsIGwNBEgd7JWFAAlHayG1eroufnANt 9RRvj3uELcWFJWvnjpfjG+n8t1saSc3Qo/WDvCtRWx6faeGURcp7F5xkRV2bYBseDbHR zDzA== X-Gm-Message-State: AFeK/H27urJC8WAjoMCZCSJEKGGSEQqrgIxmmEeJ8ZceTQNn49nUqiU/AJkiqTqLPeO5+xgH X-Received: by 10.28.215.74 with SMTP id o71mr14207605wmg.23.1491308143930; Tue, 04 Apr 2017 05:15:43 -0700 (PDT) Received: from zoidberg.local ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id a66sm250242wrc.58.2017.04.04.05.15.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 04 Apr 2017 05:15:43 -0700 (PDT) From: Neil Armstrong To: airlied@linux.ie Subject: [PATCH v3 03/11] drm/meson: Add support for components Date: Tue, 4 Apr 2017 14:15:23 +0200 Message-Id: <1491308131-22071-4-git-send-email-narmstrong@baylibre.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1491308131-22071-1-git-send-email-narmstrong@baylibre.com> References: <1491308131-22071-1-git-send-email-narmstrong@baylibre.com> Cc: linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, dri-devel@lists.freedesktop.org, Neil Armstrong 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" X-Virus-Scanned: ClamAV using ClamSMTP This patch adds support for optional components connected through the Device Tree endpoints scheme. Acked-by: Daniel Vetter Signed-off-by: Neil Armstrong --- drivers/gpu/drm/meson/meson_drv.c | 113 +++++++++++++++++++++++++++++++++----- 1 file changed, 99 insertions(+), 14 deletions(-) diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c index bc562a0..a2e9f56 100644 --- a/drivers/gpu/drm/meson/meson_drv.c +++ b/drivers/gpu/drm/meson/meson_drv.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include @@ -150,9 +151,9 @@ static bool meson_vpu_has_available_connectors(struct device *dev) .max_register = 0x1000, }; -static int meson_drv_probe(struct platform_device *pdev) +static int meson_drv_bind(struct device *dev) { - struct device *dev = &pdev->dev; + struct platform_device *pdev = to_platform_device(dev); struct meson_drm *priv; struct drm_device *drm; struct resource *res; @@ -215,6 +216,15 @@ static int meson_drv_probe(struct platform_device *pdev) drm_vblank_init(drm, 1); drm_mode_config_init(drm); + drm->mode_config.max_width = 3840; + drm->mode_config.max_height = 2160; + drm->mode_config.funcs = &meson_mode_config_funcs; + + /* Hardware Initialization */ + + meson_venc_init(priv); + meson_vpp_init(priv); + meson_viu_init(priv); /* Encoder Initialization */ @@ -222,11 +232,11 @@ static int meson_drv_probe(struct platform_device *pdev) if (ret) goto free_drm; - /* Hardware Initialization */ - - meson_venc_init(priv); - meson_vpp_init(priv); - meson_viu_init(priv); + ret = component_bind_all(drm->dev, drm); + if (ret) { + dev_err(drm->dev, "Couldn't bind all components\n"); + goto free_drm; + } ret = meson_plane_create(priv); if (ret) @@ -241,9 +251,6 @@ static int meson_drv_probe(struct platform_device *pdev) goto free_drm; drm_mode_config_reset(drm); - drm->mode_config.max_width = 8192; - drm->mode_config.max_height = 8192; - drm->mode_config.funcs = &meson_mode_config_funcs; priv->fbdev = drm_fbdev_cma_init(drm, 32, drm->mode_config.num_connector); @@ -268,9 +275,9 @@ static int meson_drv_probe(struct platform_device *pdev) return ret; } -static int meson_drv_remove(struct platform_device *pdev) +static void meson_drv_unbind(struct device *dev) { - struct drm_device *drm = dev_get_drvdata(&pdev->dev); + struct drm_device *drm = dev_get_drvdata(dev); struct meson_drm *priv = drm->dev_private; drm_dev_unregister(drm); @@ -280,9 +287,88 @@ static int meson_drv_remove(struct platform_device *pdev) drm_vblank_cleanup(drm); drm_dev_unref(drm); - return 0; } +static const struct component_master_ops meson_drv_master_ops = { + .bind = meson_drv_bind, + .unbind = meson_drv_unbind, +}; + +static int compare_of(struct device *dev, void *data) +{ + DRM_DEBUG_DRIVER("Comparing of node %s with %s\n", + of_node_full_name(dev->of_node), + of_node_full_name(data)); + + return dev->of_node == data; +} + +/* Possible connectors nodes to ignore */ +static const struct of_device_id connectors_match[] = { + { .compatible = "composite-video-connector" }, + { .compatible = "svideo-connector" }, + { .compatible = "hdmi-connector" }, + { .compatible = "dvi-connector" }, + {} +}; + +static int meson_probe_remote(struct platform_device *pdev, + struct component_match **match, + struct device_node *parent, + struct device_node *remote) +{ + struct device_node *ep, *remote_node; + int count = 1; + + /* If node is a connector, return and do not add to match table */ + if (of_match_node(connectors_match, remote)) + return 1; + + component_match_add(&pdev->dev, match, compare_of, remote); + + for_each_endpoint_of_node(remote, ep) { + remote_node = of_graph_get_remote_port_parent(ep); + if (!remote_node || + remote_node == parent || /* Ignore parent endpoint */ + !of_device_is_available(remote_node)) + continue; + + count += meson_probe_remote(pdev, match, remote, remote_node); + + of_node_put(remote_node); + } + + return count; +} + +static int meson_drv_probe(struct platform_device *pdev) +{ + struct component_match *match = NULL; + struct device_node *np = pdev->dev.of_node; + struct device_node *ep, *remote; + int count = 0; + + for_each_endpoint_of_node(np, ep) { + remote = of_graph_get_remote_port_parent(ep); + if (!remote || !of_device_is_available(remote)) + continue; + + count += meson_probe_remote(pdev, &match, np, remote); + } + + /* If some endpoints were found, initialize the nodes */ + if (count) { + dev_info(&pdev->dev, "Queued %d outputs on vpu\n", count); + + return component_master_add_with_match(&pdev->dev, + &meson_drv_master_ops, + match); + } + + /* If no output endpoints were available, simply bail out */ + return 0; +}; + static const struct of_device_id dt_match[] = { { .compatible = "amlogic,meson-gxbb-vpu" }, { .compatible = "amlogic,meson-gxl-vpu" }, @@ -293,7 +379,6 @@ static int meson_drv_remove(struct platform_device *pdev) static struct platform_driver meson_drm_platform_driver = { .probe = meson_drv_probe, - .remove = meson_drv_remove, .driver = { .name = "meson-drm", .of_match_table = dt_match,