From mboxrd@z Thu Jan 1 00:00:00 1970 From: Heiko Stuebner Subject: [PATCH v8 1/3] drm/rockchip: add function to check if endpoint is a subdriver Date: Thu, 30 Aug 2018 23:12:05 +0200 Message-ID: <20180830211207.10480-2-heiko@sntech.de> References: <20180830211207.10480-1-heiko@sntech.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20180830211207.10480-1-heiko@sntech.de> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: hjc@rock-chips.com Cc: linux-rockchip@lists.infradead.org, seanpaul@chromium.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org List-Id: linux-rockchip.vger.kernel.org VG8gYmUgYWJsZSB0byBoYXZlIGJvdGggaW50ZXJuYWwgc3ViZHJpdmVycyBhbmQgZXh0ZXJuYWwg YnJpZGdlCmRyaXZlcnMgYXMgb3V0cHV0IGVuZHBvaW50cyBvZiB2b3BzLCBhZGQgYSBmdW5jdGlv biB0byBiZSBhYmxlCnRvIGRpc3Rpbmd1aXNoIHRoZXNlLgoKY2hhbmdlcyBpbiB2ODoKLSBpbXBy b3ZlZCBmdW5jdGlvbiBkb2N1bWVudGF0aW9uCi0gYmV0dGVyIGVycm9yIGhhbmRsaW5nCi0gcHV0 IGNhbGxzIGZvciBub2RlIGFuZCBwZGV2IHJlZmVyZW5jZXMKY2hhbmdlcyBpbiB2NjoKLSBhZGRl ZCBmdW5jdGlvbiB0byBjaGVjayBzdWJkcml2ZXIgdnMuIGJyaWRnZQoKU2lnbmVkLW9mZi1ieTog SGVpa28gU3R1ZWJuZXIgPGhlaWtvQHNudGVjaC5kZT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vcm9j a2NoaXAvcm9ja2NoaXBfZHJtX2Rydi5jIHwgNDggKysrKysrKysrKysrKysrKysrKysrCiBkcml2 ZXJzL2dwdS9kcm0vcm9ja2NoaXAvcm9ja2NoaXBfZHJtX2Rydi5oIHwgIDEgKwogMiBmaWxlcyBj aGFuZ2VkLCA0OSBpbnNlcnRpb25zKCspCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3Jv Y2tjaGlwL3JvY2tjaGlwX2RybV9kcnYuYyBiL2RyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9yb2Nr Y2hpcF9kcm1fZHJ2LmMKaW5kZXggMWQ5YzRhOTIwMWM4Li41ODY0Y2I0NTJjNWMgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9yb2NrY2hpcF9kcm1fZHJ2LmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL3JvY2tjaGlwL3JvY2tjaGlwX2RybV9kcnYuYwpAQCAtMjQsNiArMjQsNyBA QAogI2luY2x1ZGUgPGxpbnV4L3BtX3J1bnRpbWUuaD4KICNpbmNsdWRlIDxsaW51eC9tb2R1bGUu aD4KICNpbmNsdWRlIDxsaW51eC9vZl9ncmFwaC5oPgorI2luY2x1ZGUgPGxpbnV4L29mX3BsYXRm b3JtLmg+CiAjaW5jbHVkZSA8bGludXgvY29tcG9uZW50Lmg+CiAjaW5jbHVkZSA8bGludXgvY29u c29sZS5oPgogI2luY2x1ZGUgPGxpbnV4L2lvbW11Lmg+CkBAIC0yNjcsNiArMjY4LDUzIEBAIHN0 YXRpYyBjb25zdCBzdHJ1Y3QgZGV2X3BtX29wcyByb2NrY2hpcF9kcm1fcG1fb3BzID0gewogc3Rh dGljIHN0cnVjdCBwbGF0Zm9ybV9kcml2ZXIgKnJvY2tjaGlwX3N1Yl9kcml2ZXJzW01BWF9ST0NL Q0hJUF9TVUJfRFJJVkVSU107CiBzdGF0aWMgaW50IG51bV9yb2NrY2hpcF9zdWJfZHJpdmVyczsK IAorLyoKKyAqIENoZWNrIGlmIGEgdm9wIGVuZHBvaW50IGlzIGxlYWRpbmcgdG8gYSByb2NrY2hp cCBzdWJkcml2ZXIgb3IgYnJpZGdlLgorICogU2hvdWxkIGJlIGNhbGxlZCBmcm9tIHRoZSBjb21w b25lbnQgYmluZCBzdGFnZSBvZiB0aGUgZHJpdmVycworICogdG8gZW5zdXJlIHRoYXQgYWxsIHN1 YmRyaXZlcnMgYXJlIHByb2JlZC4KKyAqCisgKiBAZXA6IGVuZHBvaW50IG9mIGEgcm9ja2NoaXAg dm9wCisgKgorICogcmV0dXJucyB0cnVlIGlmIHN1YmRyaXZlciwgZmFsc2UgaWYgZXh0ZXJuYWwg YnJpZGdlIGFuZCAtRU5PREVWCisgKiBpZiByZW1vdGUgcG9ydCBkb2VzIG5vdCBjb250YWluIGEg ZGV2aWNlLgorICovCitpbnQgcm9ja2NoaXBfZHJtX2VuZHBvaW50X2lzX3N1YmRyaXZlcihzdHJ1 Y3QgZGV2aWNlX25vZGUgKmVwKQoreworCXN0cnVjdCBkZXZpY2Vfbm9kZSAqbm9kZSA9IG9mX2dy YXBoX2dldF9yZW1vdGVfcG9ydF9wYXJlbnQoZXApOworCXN0cnVjdCBwbGF0Zm9ybV9kZXZpY2Ug KnBkZXY7CisJc3RydWN0IGRldmljZV9kcml2ZXIgKmRydjsKKwlpbnQgaTsKKworCWlmICghbm9k ZSkKKwkJcmV0dXJuIC1FTk9ERVY7CisKKwkvKiBzdGF0dXMgZGlzYWJsZWQgd2lsbCBwcmV2ZW50 IGNyZWF0aW9uIG9mIHBsYXRmb3JtLWRldmljZXMgKi8KKwlwZGV2ID0gb2ZfZmluZF9kZXZpY2Vf Ynlfbm9kZShub2RlKTsKKwlvZl9ub2RlX3B1dChub2RlKTsKKwlpZiAoIXBkZXYpCisJCXJldHVy biAtRU5PREVWOworCisJLyoKKwkgKiBBbGwgcm9ja2NoaXAgc3ViZHJpdmVycyBoYXZlIHByb2Jl ZCBhdCB0aGlzIHBvaW50LCBzbworCSAqIGFueSBkZXZpY2Ugbm90IGhhdmluZyBhIGRyaXZlciBu b3cgaXMgYW4gZXh0ZXJuYWwgYnJpZGdlLgorCSAqLworCWRydiA9IHBkZXYtPmRldi5kcml2ZXI7 CisJaWYgKCFkcnYpIHsKKwkJcGxhdGZvcm1fZGV2aWNlX3B1dChwZGV2KTsKKwkJcmV0dXJuIGZh bHNlOworCX0KKworCWZvciAoaSA9IDA7IGkgPCBudW1fcm9ja2NoaXBfc3ViX2RyaXZlcnM7IGkr KykgeworCQlpZiAocm9ja2NoaXBfc3ViX2RyaXZlcnNbaV0gPT0gdG9fcGxhdGZvcm1fZHJpdmVy KGRydikpIHsKKwkJCXBsYXRmb3JtX2RldmljZV9wdXQocGRldik7CisJCQlyZXR1cm4gdHJ1ZTsK KwkJfQorCX0KKworCXBsYXRmb3JtX2RldmljZV9wdXQocGRldik7CisJcmV0dXJuIGZhbHNlOwor fQorCiBzdGF0aWMgaW50IGNvbXBhcmVfZGV2KHN0cnVjdCBkZXZpY2UgKmRldiwgdm9pZCAqZGF0 YSkKIHsKIAlyZXR1cm4gZGV2ID09IChzdHJ1Y3QgZGV2aWNlICopZGF0YTsKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9yb2NrY2hpcF9kcm1fZHJ2LmggYi9kcml2ZXJzL2dw dS9kcm0vcm9ja2NoaXAvcm9ja2NoaXBfZHJtX2Rydi5oCmluZGV4IGQ2N2FkMGEzY2YzNi4uMjFh MDIzYTk3YmI4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvcm9ja2NoaXBf ZHJtX2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9yb2NrY2hpcF9kcm1fZHJ2 LmgKQEAgLTY0LDYgKzY0LDcgQEAgdm9pZCByb2NrY2hpcF9kcm1fZG1hX2RldGFjaF9kZXZpY2Uo c3RydWN0IGRybV9kZXZpY2UgKmRybV9kZXYsCiAJCQkJICAgIHN0cnVjdCBkZXZpY2UgKmRldik7 CiBpbnQgcm9ja2NoaXBfZHJtX3dhaXRfdmFjdF9lbmQoc3RydWN0IGRybV9jcnRjICpjcnRjLCB1 bnNpZ25lZCBpbnQgbXN0aW1lb3V0KTsKIAoraW50IHJvY2tjaGlwX2RybV9lbmRwb2ludF9pc19z dWJkcml2ZXIoc3RydWN0IGRldmljZV9ub2RlICplcCk7CiBleHRlcm4gc3RydWN0IHBsYXRmb3Jt X2RyaXZlciBjZG5fZHBfZHJpdmVyOwogZXh0ZXJuIHN0cnVjdCBwbGF0Zm9ybV9kcml2ZXIgZHdf aGRtaV9yb2NrY2hpcF9wbHRmbV9kcml2ZXI7CiBleHRlcm4gc3RydWN0IHBsYXRmb3JtX2RyaXZl ciBkd19taXBpX2RzaV9kcml2ZXI7Ci0tIAoyLjE3LjAKCl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVs QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWls bWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo= 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=-2.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,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 E1EEDC433F5 for ; Thu, 30 Aug 2018 21:12:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A2E7B20835 for ; Thu, 30 Aug 2018 21:12:25 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A2E7B20835 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=sntech.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727574AbeHaBQ1 (ORCPT ); Thu, 30 Aug 2018 21:16:27 -0400 Received: from gloria.sntech.de ([185.11.138.130]:55362 "EHLO gloria.sntech.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727098AbeHaBQ1 (ORCPT ); Thu, 30 Aug 2018 21:16:27 -0400 Received: from ip5f5a866f.dynamic.kabel-deutschland.de ([95.90.134.111] helo=phil.fritz.box) by gloria.sntech.de with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1fvUEh-00009T-Nn; Thu, 30 Aug 2018 23:12:15 +0200 From: Heiko Stuebner To: hjc@rock-chips.com Cc: seanpaul@chromium.org, linux-rockchip@lists.infradead.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Heiko Stuebner Subject: [PATCH v8 1/3] drm/rockchip: add function to check if endpoint is a subdriver Date: Thu, 30 Aug 2018 23:12:05 +0200 Message-Id: <20180830211207.10480-2-heiko@sntech.de> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180830211207.10480-1-heiko@sntech.de> References: <20180830211207.10480-1-heiko@sntech.de> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org To be able to have both internal subdrivers and external bridge drivers as output endpoints of vops, add a function to be able to distinguish these. changes in v8: - improved function documentation - better error handling - put calls for node and pdev references changes in v6: - added function to check subdriver vs. bridge Signed-off-by: Heiko Stuebner --- drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 48 +++++++++++++++++++++ drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 1 + 2 files changed, 49 insertions(+) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c index 1d9c4a9201c8..5864cb452c5c 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include @@ -267,6 +268,53 @@ static const struct dev_pm_ops rockchip_drm_pm_ops = { static struct platform_driver *rockchip_sub_drivers[MAX_ROCKCHIP_SUB_DRIVERS]; static int num_rockchip_sub_drivers; +/* + * Check if a vop endpoint is leading to a rockchip subdriver or bridge. + * Should be called from the component bind stage of the drivers + * to ensure that all subdrivers are probed. + * + * @ep: endpoint of a rockchip vop + * + * returns true if subdriver, false if external bridge and -ENODEV + * if remote port does not contain a device. + */ +int rockchip_drm_endpoint_is_subdriver(struct device_node *ep) +{ + struct device_node *node = of_graph_get_remote_port_parent(ep); + struct platform_device *pdev; + struct device_driver *drv; + int i; + + if (!node) + return -ENODEV; + + /* status disabled will prevent creation of platform-devices */ + pdev = of_find_device_by_node(node); + of_node_put(node); + if (!pdev) + return -ENODEV; + + /* + * All rockchip subdrivers have probed at this point, so + * any device not having a driver now is an external bridge. + */ + drv = pdev->dev.driver; + if (!drv) { + platform_device_put(pdev); + return false; + } + + for (i = 0; i < num_rockchip_sub_drivers; i++) { + if (rockchip_sub_drivers[i] == to_platform_driver(drv)) { + platform_device_put(pdev); + return true; + } + } + + platform_device_put(pdev); + return false; +} + static int compare_dev(struct device *dev, void *data) { return dev == (struct device *)data; diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h index d67ad0a3cf36..21a023a97bb8 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h @@ -64,6 +64,7 @@ void rockchip_drm_dma_detach_device(struct drm_device *drm_dev, struct device *dev); int rockchip_drm_wait_vact_end(struct drm_crtc *crtc, unsigned int mstimeout); +int rockchip_drm_endpoint_is_subdriver(struct device_node *ep); extern struct platform_driver cdn_dp_driver; extern struct platform_driver dw_hdmi_rockchip_pltfm_driver; extern struct platform_driver dw_mipi_dsi_driver; -- 2.17.0