From mboxrd@z Thu Jan 1 00:00:00 1970 From: John Stultz Subject: [PATCH 19/25] drm: kirin: Add register connect helper functions in drm init Date: Tue, 23 Apr 2019 16:20:50 -0700 Message-ID: <1556061656-1733-20-git-send-email-john.stultz@linaro.org> References: <1556061656-1733-1-git-send-email-john.stultz@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-pl1-x642.google.com (mail-pl1-x642.google.com [IPv6:2607:f8b0:4864:20::642]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7CDBF8979E for ; Tue, 23 Apr 2019 23:21:28 +0000 (UTC) Received: by mail-pl1-x642.google.com with SMTP id e92so6469889plb.6 for ; Tue, 23 Apr 2019 16:21:28 -0700 (PDT) In-Reply-To: <1556061656-1733-1-git-send-email-john.stultz@linaro.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: lkml Cc: Xu YiPing , David Airlie , Chen Feng , dri-devel , Xinliang Liu , Xinwei Kong , Rongrong Zou List-Id: dri-devel@lists.freedesktop.org RnJvbTogWHUgWWlQaW5nIDx4dXlpcGluZ0BoaXNpbGljb24uY29tPgoKQXMgcGFydCBvZiByZWZh Y3RvcmluZyB0aGUga2lyaW4gZHJpdmVyIHRvIGJldHRlciBzdXBwb3J0CmRpZmZlcmVudCBoYXJk d2FyZSByZXZpc2lvbnMsIHRoaXMgcGF0Y2ggYWRkcyBhIGZsYWcgdG8gdGhlCmRldmljZSBzcGVj aWZpYyBkcml2ZXIgZGF0YSBzbyB0aGF0IHdlIGNhbiBjb25kaXRpb25hbGx5CnJlZ2lzdGVyIHRo ZSBjb25uZWN0b3JzIGF0IGluaXQuCgpDYzogWGlubGlhbmcgTGl1IDx6LmxpdXhpbmxpYW5nQGhp c2lsaWNvbi5jb20+CkNjOiBSb25ncm9uZyBab3UgPHpvdXJvbmdyb25nQGdtYWlsLmNvbT4KQ2M6 IFhpbndlaSBLb25nIDxrb25nLmtvbmd4aW53ZWlAaGlzaWxpY29uLmNvbT4KQ2M6IENoZW4gRmVu ZyA8cHVjay5jaGVuQGhpc2lsaWNvbi5jb20+CkNjOiBEYXZpZCBBaXJsaWUgPGFpcmxpZWRAbGlu dXguaWU+CkNjOiBEYW5pZWwgVmV0dGVyIDxkYW5pZWxAZmZ3bGwuY2g+CkNjOiBkcmktZGV2ZWwg PGRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmc+ClNpZ25lZC1vZmYtYnk6IFh1IFlpUGlu ZyA8eHV5aXBpbmdAaGlzaWxpY29uLmNvbT4KW2pzdHVsdHo6IHJld29yZGVkIGNvbW1pdCBtZXNz YWdlXQpTaWduZWQtb2ZmLWJ5OiBKb2huIFN0dWx0eiA8am9obi5zdHVsdHpAbGluYXJvLm9yZz4K LS0tCiBkcml2ZXJzL2dwdS9kcm0vaGlzaWxpY29uL2tpcmluL2tpcmluX2RybV9hZGUuYyB8ICAx ICsKIGRyaXZlcnMvZ3B1L2RybS9oaXNpbGljb24va2lyaW4va2lyaW5fZHJtX2Rydi5jIHwgNDMg KysrKysrKysrKysrKysrKysrKysrKysrKwogZHJpdmVycy9ncHUvZHJtL2hpc2lsaWNvbi9raXJp bi9raXJpbl9kcm1fZHJ2LmggfCAgMSArCiAzIGZpbGVzIGNoYW5nZWQsIDQ1IGluc2VydGlvbnMo KykKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaGlzaWxpY29uL2tpcmluL2tpcmluX2Ry bV9hZGUuYyBiL2RyaXZlcnMvZ3B1L2RybS9oaXNpbGljb24va2lyaW4va2lyaW5fZHJtX2FkZS5j CmluZGV4IGJkZDFiMDAuLmZjYzAxYzIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9oaXNp bGljb24va2lyaW4va2lyaW5fZHJtX2FkZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9oaXNpbGlj b24va2lyaW4va2lyaW5fZHJtX2FkZS5jCkBAIC0xMDc2LDYgKzEwNzYsNyBAQCBzdGF0aWMgc3Ry dWN0IGRybV9kcml2ZXIgYWRlX2RyaXZlciA9IHsKIH07CiAKIHN0cnVjdCBraXJpbl9kcm1fZGF0 YSBhZGVfZHJpdmVyX2RhdGEgPSB7CisJLnJlZ2lzdGVyX2Nvbm5lY3RzID0gZmFsc2UsCiAJLm51 bV9wbGFuZXMgPSBBREVfQ0hfTlVNLAogCS5wcmltX3BsYW5lID0gQURFX0NIMSwKIAkuY2hhbm5l bF9mb3JtYXRzID0gY2hhbm5lbF9mb3JtYXRzLApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2hpc2lsaWNvbi9raXJpbi9raXJpbl9kcm1fZHJ2LmMgYi9kcml2ZXJzL2dwdS9kcm0vaGlzaWxp Y29uL2tpcmluL2tpcmluX2RybV9kcnYuYwppbmRleCBjOTg3YjRlLi41ZWU5MGQ3IDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaGlzaWxpY29uL2tpcmluL2tpcmluX2RybV9kcnYuYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vaGlzaWxpY29uL2tpcmluL2tpcmluX2RybV9kcnYuYwpAQCAtOTks NiArOTksNDAgQEAgc3RhdGljIGludCBjb21wYXJlX29mKHN0cnVjdCBkZXZpY2UgKmRldiwgdm9p ZCAqZGF0YSkKIAlyZXR1cm4gZGV2LT5vZl9ub2RlID09IGRhdGE7CiB9CiAKK3N0YXRpYyBpbnQg a2lyaW5fZHJtX2Nvbm5lY3RvcnNfcmVnaXN0ZXIoc3RydWN0IGRybV9kZXZpY2UgKmRldikKK3sK KwlzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yOworCXN0cnVjdCBkcm1fY29ubmVjdG9y ICpmYWlsZWRfY29ubmVjdG9yOworCXN0cnVjdCBkcm1fY29ubmVjdG9yX2xpc3RfaXRlciBjb25u X2l0ZXI7CisJaW50IHJldDsKKworCW11dGV4X2xvY2soJmRldi0+bW9kZV9jb25maWcubXV0ZXgp OworCWRybV9jb25uZWN0b3JfbGlzdF9pdGVyX2JlZ2luKGRldiwgJmNvbm5faXRlcik7CisJZHJt X2Zvcl9lYWNoX2Nvbm5lY3Rvcl9pdGVyKGNvbm5lY3RvciwgJmNvbm5faXRlcikgeworCQlyZXQg PSBkcm1fY29ubmVjdG9yX3JlZ2lzdGVyKGNvbm5lY3Rvcik7CisJCWlmIChyZXQpIHsKKwkJCWZh aWxlZF9jb25uZWN0b3IgPSBjb25uZWN0b3I7CisJCQlnb3RvIGVycjsKKwkJfQorCX0KKwlkcm1f Y29ubmVjdG9yX2xpc3RfaXRlcl9lbmQoJmNvbm5faXRlcik7CisJbXV0ZXhfdW5sb2NrKCZkZXYt Pm1vZGVfY29uZmlnLm11dGV4KTsKKworCXJldHVybiAwOworCitlcnI6CisJZHJtX2Nvbm5lY3Rv cl9saXN0X2l0ZXJfYmVnaW4oZGV2LCAmY29ubl9pdGVyKTsKKwlkcm1fZm9yX2VhY2hfY29ubmVj dG9yX2l0ZXIoY29ubmVjdG9yLCAmY29ubl9pdGVyKSB7CisJCWlmIChmYWlsZWRfY29ubmVjdG9y ID09IGNvbm5lY3RvcikKKwkJCWJyZWFrOworCQlkcm1fY29ubmVjdG9yX3VucmVnaXN0ZXIoY29u bmVjdG9yKTsKKwl9CisJZHJtX2Nvbm5lY3Rvcl9saXN0X2l0ZXJfZW5kKCZjb25uX2l0ZXIpOwor CW11dGV4X3VubG9jaygmZGV2LT5tb2RlX2NvbmZpZy5tdXRleCk7CisKKwlyZXR1cm4gcmV0Owor fQorCiBzdGF0aWMgaW50IGtpcmluX2RybV9iaW5kKHN0cnVjdCBkZXZpY2UgKmRldikKIHsKIAlz dHJ1Y3QgZHJtX2RldmljZSAqZHJtX2RldjsKQEAgLTExOCw4ICsxNTIsMTcgQEAgc3RhdGljIGlu dCBraXJpbl9kcm1fYmluZChzdHJ1Y3QgZGV2aWNlICpkZXYpCiAKIAlkcm1fZmJkZXZfZ2VuZXJp Y19zZXR1cChkcm1fZGV2LCAzMik7CiAKKwkvKiBjb25uZWN0b3JzIHNob3VsZCBiZSByZWdpc3Rl cmVkIGFmdGVyIGRybSBkZXZpY2UgcmVnaXN0ZXIgKi8KKwlpZiAoZHJpdmVyX2RhdGEtPnJlZ2lz dGVyX2Nvbm5lY3RzID09IHRydWUpIHsKKwkJcmV0ID0ga2lyaW5fZHJtX2Nvbm5lY3RvcnNfcmVn aXN0ZXIoZHJtX2Rldik7CisJCWlmIChyZXQpCisJCQlnb3RvIGVycl9kcm1fZGV2X3VucmVnaXN0 ZXI7CisJfQorCiAJcmV0dXJuIDA7CiAKK2Vycl9kcm1fZGV2X3VucmVnaXN0ZXI6CisJZHJtX2Rl dl91bnJlZ2lzdGVyKGRybV9kZXYpOwogZXJyX2ttc19jbGVhbnVwOgogCWtpcmluX2RybV9rbXNf Y2xlYW51cChkcm1fZGV2KTsKIGVycl9kcm1fZGV2X3B1dDoKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9oaXNpbGljb24va2lyaW4va2lyaW5fZHJtX2Rydi5oIGIvZHJpdmVycy9ncHUvZHJt L2hpc2lsaWNvbi9raXJpbi9raXJpbl9kcm1fZHJ2LmgKaW5kZXggNjFmYjBkYS4uODgxOGNjZiAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2hpc2lsaWNvbi9raXJpbi9raXJpbl9kcm1fZHJ2 LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2hpc2lsaWNvbi9raXJpbi9raXJpbl9kcm1fZHJ2LmgK QEAgLTQzLDYgKzQzLDcgQEAgc3RydWN0IGtpcmluX2RybV9kYXRhIHsKIAl1MzIgY2hhbm5lbF9m b3JtYXRzX2NudDsKIAlpbnQgY29uZmlnX21heF93aWR0aDsKIAlpbnQgY29uZmlnX21heF9oZWln aHQ7CisJYm9vbCByZWdpc3Rlcl9jb25uZWN0czsKIAl1MzIgbnVtX3BsYW5lczsKIAl1MzIgcHJp bV9wbGFuZTsKIAotLSAKMi43LjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVk ZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZv L2RyaS1kZXZlbA== 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.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,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 A02E5C10F03 for ; Tue, 23 Apr 2019 23:22:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6B65C218D2 for ; Tue, 23 Apr 2019 23:22:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="K7nqhQ4o" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729132AbfDWXWE (ORCPT ); Tue, 23 Apr 2019 19:22:04 -0400 Received: from mail-pl1-f195.google.com ([209.85.214.195]:43542 "EHLO mail-pl1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728943AbfDWXV2 (ORCPT ); Tue, 23 Apr 2019 19:21:28 -0400 Received: by mail-pl1-f195.google.com with SMTP id n8so8244354plp.10 for ; Tue, 23 Apr 2019 16:21:28 -0700 (PDT) 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=LzxumMzcEtq/SNQTqskpd8l6h66SMPqIvO/SUnJJpKM=; b=K7nqhQ4oUzp+oLLua5HKg230xAqYILqx/7xXmGUjCnyj9D5AAhdGD+GNp3T8DMLrzl ph04wV1JpRAB90Sbx4IYwihZte0cxfMdYvm9Fisf8m/gOj92AuoBWwzExFK+5os+EUfk p3NXmrbKmHB5VMw6K6aAALPCKQjV4jvoyRGw0l/Tu1sujuXX3UeHto5WaeKkrQ/dbR6I aUuqqVWvIlTUKuONfHdYSFKflXOtOUYxkoJXY2vNpMiZVPSoLKHZajYF5AciTpQuNXmK Zps1LUzTEICkOweLOfLhBidUtU0IsK0kjPaH3ath5NrX6sGAmsAJG/ptOpFWrZi50I08 0mqw== 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=LzxumMzcEtq/SNQTqskpd8l6h66SMPqIvO/SUnJJpKM=; b=itwDiXuTOpHfA1AxmThtbutJOVqCKCVfR2p3vPiBbFDqNVikHA8MUSvjIyu+xuIkcZ q+MaxfF9iGZVEb6yI/USddqkxj0yI8IasLSBgXaDIsmcjdr2X/mt3J2qzIWr4ONjJcvf hFkNruyD7SvQW8dPQ36XUvLvFf9FCOpQpFKMcpU3olq4NE+FmJgQ8xUvlBI1lvIRYiPb p3tiocHxvSvcxyCGId0nOBBHSftw/IoqnC8utRkZddWVFF/LRMFhmQfbniZ+uXGrcE0W jyTvRmxCT/tL1DywOKd7hh4RPN2mWrM2yVq/DDQ+expdKNYT7ZmXwi7/OIE/VA2YGGGG wJhQ== X-Gm-Message-State: APjAAAWpnemM6TmptFYCBH9+3Y74Q6RPbteMAU/uR4lsdbucZuQzr5Bv ckPi/6wResvRUIMnPUJ7l0wvRUj74tE= X-Google-Smtp-Source: APXvYqzCahw17URM7uPDNgnjEJPFq7bbhmKrHgotw8tL24qZ6Ookm3NHOl1b3VFuO++uU1km6VLpmg== X-Received: by 2002:a17:902:7085:: with SMTP id z5mr18996294plk.78.1556061687689; Tue, 23 Apr 2019 16:21:27 -0700 (PDT) Received: from localhost.localdomain ([2601:1c2:680:1319:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id c28sm6984235pgm.42.2019.04.23.16.21.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 23 Apr 2019 16:21:26 -0700 (PDT) From: John Stultz To: lkml Cc: Xu YiPing , Xinliang Liu , Rongrong Zou , Xinwei Kong , Chen Feng , David Airlie , Daniel Vetter , dri-devel , John Stultz Subject: [PATCH 19/25] drm: kirin: Add register connect helper functions in drm init Date: Tue, 23 Apr 2019 16:20:50 -0700 Message-Id: <1556061656-1733-20-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1556061656-1733-1-git-send-email-john.stultz@linaro.org> References: <1556061656-1733-1-git-send-email-john.stultz@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Xu YiPing As part of refactoring the kirin driver to better support different hardware revisions, this patch adds a flag to the device specific driver data so that we can conditionally register the connectors at init. Cc: Xinliang Liu Cc: Rongrong Zou Cc: Xinwei Kong Cc: Chen Feng Cc: David Airlie Cc: Daniel Vetter Cc: dri-devel Signed-off-by: Xu YiPing [jstultz: reworded commit message] Signed-off-by: John Stultz --- drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 1 + drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 43 +++++++++++++++++++++++++ drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h | 1 + 3 files changed, 45 insertions(+) diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c index bdd1b00..fcc01c2 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c @@ -1076,6 +1076,7 @@ static struct drm_driver ade_driver = { }; struct kirin_drm_data ade_driver_data = { + .register_connects = false, .num_planes = ADE_CH_NUM, .prim_plane = ADE_CH1, .channel_formats = channel_formats, diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c index c987b4e..5ee90d7 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c @@ -99,6 +99,40 @@ static int compare_of(struct device *dev, void *data) return dev->of_node == data; } +static int kirin_drm_connectors_register(struct drm_device *dev) +{ + struct drm_connector *connector; + struct drm_connector *failed_connector; + struct drm_connector_list_iter conn_iter; + int ret; + + mutex_lock(&dev->mode_config.mutex); + drm_connector_list_iter_begin(dev, &conn_iter); + drm_for_each_connector_iter(connector, &conn_iter) { + ret = drm_connector_register(connector); + if (ret) { + failed_connector = connector; + goto err; + } + } + drm_connector_list_iter_end(&conn_iter); + mutex_unlock(&dev->mode_config.mutex); + + return 0; + +err: + drm_connector_list_iter_begin(dev, &conn_iter); + drm_for_each_connector_iter(connector, &conn_iter) { + if (failed_connector == connector) + break; + drm_connector_unregister(connector); + } + drm_connector_list_iter_end(&conn_iter); + mutex_unlock(&dev->mode_config.mutex); + + return ret; +} + static int kirin_drm_bind(struct device *dev) { struct drm_device *drm_dev; @@ -118,8 +152,17 @@ static int kirin_drm_bind(struct device *dev) drm_fbdev_generic_setup(drm_dev, 32); + /* connectors should be registered after drm device register */ + if (driver_data->register_connects == true) { + ret = kirin_drm_connectors_register(drm_dev); + if (ret) + goto err_drm_dev_unregister; + } + return 0; +err_drm_dev_unregister: + drm_dev_unregister(drm_dev); err_kms_cleanup: kirin_drm_kms_cleanup(drm_dev); err_drm_dev_put: diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h index 61fb0da..8818ccf 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h @@ -43,6 +43,7 @@ struct kirin_drm_data { u32 channel_formats_cnt; int config_max_width; int config_max_height; + bool register_connects; u32 num_planes; u32 prim_plane; -- 2.7.4