From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C9F1DC43603 for ; Sat, 7 Dec 2019 20:36:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 98051206DB for ; Sat, 7 Dec 2019 20:36:28 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="fejbPTGE" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726845AbfLGUgP (ORCPT ); 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-Google-Smtp-Source: APXvYqzDfayEIq2IU2ZF76xRpq1YVP/uNxKHNPyI6TREpRcqY3KTtpmPIdU+GsItMQeh+jnuG7UijA== 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-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@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 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.5 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C3CFFC3F68F for ; Sat, 7 Dec 2019 20:36:17 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9D4C7206DB for ; Sat, 7 Dec 2019 20:36:17 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9D4C7206DB Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9D5B96E233; Sat, 7 Dec 2019 20:36:16 +0000 (UTC) Received: from mail-pl1-x641.google.com (mail-pl1-x641.google.com [IPv6:2607:f8b0:4864:20::641]) by gabe.freedesktop.org (Postfix) with ESMTPS id CE3846E233 for ; Sat, 7 Dec 2019 20:36:14 +0000 (UTC) Received: by mail-pl1-x641.google.com with SMTP id o9so4144647plk.6 for ; Sat, 07 Dec 2019 12:36:14 -0800 (PST) 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=Ql2HEHYvRzBnGOsRmVS8OT9ZHZTg3K+2LrWZE75MnZfPLMFMxosrrtenpKQw2OZWRZ I8wTOA5phM7ZINmB7QMr5G4OIRSC/eHQu9zgaosoDjVcf35tN4Fj0fGKfAQiFFK7Nivu 2Fv2BnaMeU9N0Aybsmr0X+I0rVPRfzGUpZhZNwmbJ3XkHy02U/dKaqy0ogTSUJPeJx+n A+HVPY1qhTTaJe7UJ1lPkYzhf/gOMhPNyxdQC8ffm1eXMfwNNY435tIAxIjUokNdKHjw gbh8ZgdLddXs4v11Y8RslY2ZR01YF1naf6aDhzQe7wfv9ajIoSBLezm3MUzOrCbKEI6p UuTQ== X-Gm-Message-State: APjAAAU/L5PKtRP0WgEjyC80cXoJjVi4mEu2kDAq13g0SwReuhzY3iAq K9mtwmtGwEIJ3QYfyX6i1v0smSs4 X-Google-Smtp-Source: APXvYqzDfayEIq2IU2ZF76xRpq1YVP/uNxKHNPyI6TREpRcqY3KTtpmPIdU+GsItMQeh+jnuG7UijA== 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 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 X-Mailman-Original-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-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Rob Clark , Jeffrey Hugo , open list , Bjorn Andersson , Vasily Khoruzhick , David Airlie , Laurent Pinchart , Sean Paul Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" RnJvbTogUm9iIENsYXJrIDxyb2JkY2xhcmtAY2hyb21pdW0ub3JnPgoKVG8gaGFuZGxlIHRoZSBj YXNlIHdoZXJlIHRoZXJlIGFyZSBtdWx0aXBsZSBwYW5lbCBlbmRwb2ludHMsIG9ubHkgb25lIG9m CndoaWNoIGlzIGVuYWJsZWQvaW5zdGFsbGVkLCBhZGQgc3VwcG9ydCBmb3IgYSB3aWxkY2FyZCBl bmRwb2ludCB2YWx1ZSB0bwpyZXF1ZXN0IGZpbmRpbmcgd2hpY2hldmVyIGVuZHBvaW50IGlzIGVu YWJsZWQuCgpTaWduZWQtb2ZmLWJ5OiBSb2IgQ2xhcmsgPHJvYmRjbGFya0BjaHJvbWl1bS5vcmc+ Ci0tLQogZHJpdmVycy9ncHUvZHJtL2RybV9vZi5jIHwgNDEgKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrLQogMSBmaWxlIGNoYW5nZWQsIDQwIGluc2VydGlvbnMoKyksIDEg ZGVsZXRpb24oLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX29mLmMgYi9kcml2 ZXJzL2dwdS9kcm0vZHJtX29mLmMKaW5kZXggMGNhNTg4MDNiYTQ2Li4yYmFmNDRlNDAxYjggMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fb2YuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v ZHJtX29mLmMKQEAgLTIxOSwxMSArMjE5LDQ0IEBAIGludCBkcm1fb2ZfZW5jb2Rlcl9hY3RpdmVf ZW5kcG9pbnQoc3RydWN0IGRldmljZV9ub2RlICpub2RlLAogfQogRVhQT1JUX1NZTUJPTF9HUEwo ZHJtX29mX2VuY29kZXJfYWN0aXZlX2VuZHBvaW50KTsKIAorc3RhdGljIGludCBmaW5kX2VuYWJs ZWRfZW5kcG9pbnQoY29uc3Qgc3RydWN0IGRldmljZV9ub2RlICpub2RlLCB1MzIgcG9ydCkKK3sK KwlzdHJ1Y3QgZGV2aWNlX25vZGUgKmVuZHBvaW50X25vZGUsICpyZW1vdGU7CisJdTMyIGVuZHBv aW50ID0gMDsKKworCWZvciAoZW5kcG9pbnQgPSAwOyA7IGVuZHBvaW50KyspIHsKKwkJZW5kcG9p bnRfbm9kZSA9IG9mX2dyYXBoX2dldF9lbmRwb2ludF9ieV9yZWdzKG5vZGUsIHBvcnQsIGVuZHBv aW50KTsKKwkJaWYgKCFlbmRwb2ludF9ub2RlKSB7CisJCQlwcl9kZWJ1ZygiTm8gbW9yZSBlbmRw b2ludHMhXG4iKTsKKwkJCXJldHVybiAtRU5PREVWOworCQl9CisKKwkJcmVtb3RlID0gb2ZfZ3Jh cGhfZ2V0X3JlbW90ZV9wb3J0X3BhcmVudChlbmRwb2ludF9ub2RlKTsKKwkJb2Zfbm9kZV9wdXQo ZW5kcG9pbnRfbm9kZSk7CisJCWlmICghcmVtb3RlKSB7CisJCQlwcl9kZWJ1Zygibm8gdmFsaWQg cmVtb3RlIG5vZGVcbiIpOworCQkJY29udGludWU7CisJCX0KKworCQlpZiAoIW9mX2RldmljZV9p c19hdmFpbGFibGUocmVtb3RlKSkgeworCQkJcHJfZGVidWcoIm5vdCBhdmFpbGFibGUgZm9yIHJl bW90ZSBub2RlXG4iKTsKKwkJCW9mX25vZGVfcHV0KHJlbW90ZSk7CisJCQljb250aW51ZTsKKwkJ fQorCisJCXByX2RlYnVnKCJmb3VuZCBlbmFibGVkIGVuZHBvaW50ICVkIGZvciAlc1xuIiwgZW5k cG9pbnQsIHJlbW90ZS0+bmFtZSk7CisJCW9mX25vZGVfcHV0KHJlbW90ZSk7CisJCXJldHVybiBl bmRwb2ludDsKKwl9CisKKwlyZXR1cm4gLUVOT0RFVjsKK30KKwogLyoqCiAgKiBkcm1fb2ZfZmlu ZF9wYW5lbF9vcl9icmlkZ2UgLSByZXR1cm4gY29ubmVjdGVkIHBhbmVsIG9yIGJyaWRnZSBkZXZp Y2UKICAqIEBucDogZGV2aWNlIHRyZWUgbm9kZSBjb250YWluaW5nIGVuY29kZXIgb3V0cHV0IHBv cnRzCiAgKiBAcG9ydDogcG9ydCBpbiB0aGUgZGV2aWNlIHRyZWUgbm9kZQotICogQGVuZHBvaW50 OiBlbmRwb2ludCBpbiB0aGUgZGV2aWNlIHRyZWUgbm9kZQorICogQGVuZHBvaW50OiBlbmRwb2lu dCBpbiB0aGUgZGV2aWNlIHRyZWUgbm9kZSwgb3IgLTEgdG8gZmluZCBhbiBlbmFibGVkIGVuZHBv aW50CiAgKiBAcGFuZWw6IHBvaW50ZXIgdG8gaG9sZCByZXR1cm5lZCBkcm1fcGFuZWwKICAqIEBi cmlkZ2U6IHBvaW50ZXIgdG8gaG9sZCByZXR1cm5lZCBkcm1fYnJpZGdlCiAgKgpAQCAtMjQ2LDYg KzI3OSwxMiBAQCBpbnQgZHJtX29mX2ZpbmRfcGFuZWxfb3JfYnJpZGdlKGNvbnN0IHN0cnVjdCBk ZXZpY2Vfbm9kZSAqbnAsCiAJaWYgKHBhbmVsKQogCQkqcGFuZWwgPSBOVUxMOwogCisJaWYgKGVu ZHBvaW50ID09IC0xKSB7CisJCWVuZHBvaW50ID0gZmluZF9lbmFibGVkX2VuZHBvaW50KG5wLCBw b3J0KTsKKwkJaWYgKGVuZHBvaW50IDwgMCkKKwkJCXJldHVybiBlbmRwb2ludDsKKwl9CisKIAly ZW1vdGUgPSBvZl9ncmFwaF9nZXRfcmVtb3RlX25vZGUobnAsIHBvcnQsIGVuZHBvaW50KTsKIAlp ZiAoIXJlbW90ZSkKIAkJcmV0dXJuIC1FTk9ERVY7Ci0tIAoyLjIzLjAKCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QK ZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9w Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbA==