Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp2318683ybl; Sat, 7 Dec 2019 12:36:54 -0800 (PST) X-Google-Smtp-Source: APXvYqxLcCbIlL/3WrQpUXgVjpM/78HNKXozqKzRbEC57lqZ42GBIYmT+LvMGZKP6Kp3PHfkIAPC X-Received: by 2002:a54:4895:: with SMTP id r21mr2577206oic.107.1575751014515; Sat, 07 Dec 2019 12:36:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575751014; cv=none; d=google.com; s=arc-20160816; b=cvOuHenu5v++QmLaRDncRjgsmbhpHoWSUCbVu7YxCa1podxsQLp/IcXsoQCrywFPFl 5TjiXbfQnWFW5p9ikEBK0LyRhysZr5HRF++jZl/XDYRVlw0AJ2uf1CYOP5tvo5uajZ1m JpmcIZTDx9t4kFG6Mqbd+uOqtVI9SEMF7ZUi+Szc0BfaW8zMTvxaudaiGULL16foFhk1 mvFO+Hwar1uwjmGrO8XylEP9dtLtKQjXC7zuhMruITCwF0ymS90ZztkCyjj4EUbCT56G fWwSPELbQiz+zX1d82cfYZJK5Pbi0mRSjOcjw0t5Ja8jt1yDfPlbmOFoNXc0S5gNV6PZ Q1lQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=kPGabNCq4wvn/E6P0guB04MXnY7RQzJiTE6DO4F+/5c=; b=oegRomm6btwEwxJ7KOVA1Nr9J20OFttNJ4yi2UM5XnoDXZTbW85FBpwBLnExhhAlia AE5JC1AcoUsnBOCG1bHOIY8wczoVqfbV2AmnACCc/8EFDq7yTfZ/GRmQNTfD46UC7tD0 uPlYnfn9udn8S5hDc7GjCIj3AEmlixX0rGJuk3oF85wiMlmf1ShY4HMXhEMA37jQfiCk JEmbHuaI30nAqD9DFNptUcUso7uuaBNUhBfshKdhWMmPnhuGgunu0eS8ETqZuTwHChVH U00+eHNG8HyqHuJhVh2CYiNXI5OlaoHmThzaOvNbmY5IyBLxbgj3oTIza+l2z6s7zZFz EW3w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=fejbPTGE; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n7si3485125oih.237.2019.12.07.12.36.43; Sat, 07 Dec 2019 12:36:54 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=fejbPTGE; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726864AbfLGUgP (ORCPT + 99 others); Sat, 7 Dec 2019 15:36:15 -0500 Received: from mail-pj1-f66.google.com ([209.85.216.66]:32931 "EHLO mail-pj1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726555AbfLGUgP (ORCPT ); Sat, 7 Dec 2019 15:36:15 -0500 Received: by mail-pj1-f66.google.com with SMTP id r67so4185769pjb.0; Sat, 07 Dec 2019 12:36:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kPGabNCq4wvn/E6P0guB04MXnY7RQzJiTE6DO4F+/5c=; b=fejbPTGExleKnqhKzbTJe2QRYYJ83L/AsFX3Orxh9feE9NIPyYEMNxKFqkGDyMQ6rF FQyuovSyMWmvs5v8uI/3n6B8gT2FfXog5EEwnuGRcXfFF3VgFC/y3+TJGx6OliZQNop7 7RAXHmpNEiHg/m+Ma7H5ShJYS5Ylv/fe1oP6AgocW9BFyh3cMzHolHB7tJw9wAIaKUQ6 noB5rFM8gDPsi9qrnkgW9kWd/+5WjBumhgyIVxw5HqzWHuvW5wvWnnIvZWM5TX+RId5m Kc2kn5vZLQW5z9rpfRdzfle2qQaUw9U/KQ8ORcog3GiP0gd3937HnI0FgaXikkWiBjGW PxqA== 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:mime-version:content-transfer-encoding; bh=kPGabNCq4wvn/E6P0guB04MXnY7RQzJiTE6DO4F+/5c=; b=QyJiYQFZUin/6nj1I5wGWnoKJAD/lyX0c70nl3lvIvt+apxUeRwupcKwLQatmpddkc lh2zwQyCA4rh9XDgjY6+7Ghkm3ztX8Ho+GL6YWWIw9aPlR+bqYxb/uKNhW6XPOZEqQQE 7Cfc7SVD5TxOjc7ngw0JuMUV3bPBGU24T7MhdCWig2GvBgsiZLda4micozZ5tBgQXRUE WkqtXEnfitLPL65T8xHBruLsTOcQtAMYdJN5k/3Z+B3mJ+PX6goBb6T/TeTYrmoA3JBB kLE1LHXPmaVV5kds6EBtqJ44/NkOhsTTjXO8WRsIxyDIRkI2CxPIlGyChuZ6HgJDzjaV OhFg== X-Gm-Message-State: APjAAAUtQFTR/vSJ+zv1e/SEzx6tkO1u/Z7msSUYX48zzmLhR4Jjsg+R g+a82jIMXzBBSwXFKCeLkGc= X-Received: by 2002:a17:90b:3cc:: with SMTP id go12mr23177882pjb.89.1575750974098; Sat, 07 Dec 2019 12:36:14 -0800 (PST) Received: from localhost (c-73-25-156-94.hsd1.or.comcast.net. [73.25.156.94]) by smtp.gmail.com with ESMTPSA id 133sm20887100pfy.14.2019.12.07.12.36.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 Dec 2019 12:36:13 -0800 (PST) From: Rob Clark To: dri-devel@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, aarch64-laptops@lists.linaro.org Cc: Laurent Pinchart , Vasily Khoruzhick , Bjorn Andersson , Jeffrey Hugo , Rob Clark , Maarten Lankhorst , Maxime Ripard , Sean Paul , David Airlie , Daniel Vetter , linux-kernel@vger.kernel.org (open list) Subject: [PATCH 2/4] drm/of: add support to find any enabled endpoint Date: Sat, 7 Dec 2019 12:35:51 -0800 Message-Id: <20191207203553.286017-3-robdclark@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191207203553.286017-1-robdclark@gmail.com> References: <20191207203553.286017-1-robdclark@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Rob Clark To handle the case where there are multiple panel endpoints, only one of which is enabled/installed, add support for a wildcard endpoint value to request finding whichever endpoint is enabled. Signed-off-by: Rob Clark --- drivers/gpu/drm/drm_of.c | 41 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_of.c b/drivers/gpu/drm/drm_of.c index 0ca58803ba46..2baf44e401b8 100644 --- a/drivers/gpu/drm/drm_of.c +++ b/drivers/gpu/drm/drm_of.c @@ -219,11 +219,44 @@ int drm_of_encoder_active_endpoint(struct device_node *node, } EXPORT_SYMBOL_GPL(drm_of_encoder_active_endpoint); +static int find_enabled_endpoint(const struct device_node *node, u32 port) +{ + struct device_node *endpoint_node, *remote; + u32 endpoint = 0; + + for (endpoint = 0; ; endpoint++) { + endpoint_node = of_graph_get_endpoint_by_regs(node, port, endpoint); + if (!endpoint_node) { + pr_debug("No more endpoints!\n"); + return -ENODEV; + } + + remote = of_graph_get_remote_port_parent(endpoint_node); + of_node_put(endpoint_node); + if (!remote) { + pr_debug("no valid remote node\n"); + continue; + } + + if (!of_device_is_available(remote)) { + pr_debug("not available for remote node\n"); + of_node_put(remote); + continue; + } + + pr_debug("found enabled endpoint %d for %s\n", endpoint, remote->name); + of_node_put(remote); + return endpoint; + } + + return -ENODEV; +} + /** * drm_of_find_panel_or_bridge - return connected panel or bridge device * @np: device tree node containing encoder output ports * @port: port in the device tree node - * @endpoint: endpoint in the device tree node + * @endpoint: endpoint in the device tree node, or -1 to find an enabled endpoint * @panel: pointer to hold returned drm_panel * @bridge: pointer to hold returned drm_bridge * @@ -246,6 +279,12 @@ int drm_of_find_panel_or_bridge(const struct device_node *np, if (panel) *panel = NULL; + if (endpoint == -1) { + endpoint = find_enabled_endpoint(np, port); + if (endpoint < 0) + return endpoint; + } + remote = of_graph_get_remote_node(np, port, endpoint); if (!remote) return -ENODEV; -- 2.23.0