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.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,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 D89B7C32753 for ; Wed, 14 Aug 2019 18:48:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A0353218BC for ; Wed, 14 Aug 2019 18:48:10 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="JhJS6h06" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729665AbfHNSsJ (ORCPT ); Wed, 14 Aug 2019 14:48:09 -0400 Received: from mail-pl1-f195.google.com ([209.85.214.195]:37371 "EHLO mail-pl1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729502AbfHNSrj (ORCPT ); Wed, 14 Aug 2019 14:47:39 -0400 Received: by mail-pl1-f195.google.com with SMTP id bj8so3952plb.4 for ; Wed, 14 Aug 2019 11:47:38 -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=IPzeQ2CUMdGC3xubSflSEVQzVTUBARkxSdnQGwtck+A=; b=JhJS6h06u1B9jqFTOn+CwQRoRUhrXNN3KxxzVeQC7MMbPEdCS3hf1OVLyf50PTvtjX Eavd8K17SGQWSqK/F6ko5GtkXtkbqdtRPqFJD2SRDSr6nHwiE7/t066G51Pep8u22D/8 KEL/25qrR/NG9tHTc8YmDvdM1JHd5w5asBezd/WNJwXB5uL0JldYKePpWjHmBU++U2UU Yp1Ki2xdTwnLaWHKWLuBvTKq3/D6Iy+vq1kBeg2GuuKIZ9TRC1VbLffKG6PFz66LVrDZ aoe6oWl54tOmU380QHfX/wb/WRGhESj0FRQJUGyOLWXM6GDHPNvMhgU/npBdk9uQbJHT ZLug== 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=IPzeQ2CUMdGC3xubSflSEVQzVTUBARkxSdnQGwtck+A=; b=Znxr34pOZzLFO+ttr3ntNVbZHVSEoAHdzrfY4gd1jD3u4qiVXqumbdeFYqUL90ACyW z3I3v4GYPQpZ2+faZdf0MBcOuwhW0oabPxiNKWFhx4YqTIbwSR1hY+CAqRwUPvB+4mg5 HQhXuVJIJuVKR70XRol2+PFZQosA9P7W2EIVVn0SiA3d94P8/X5SsTuwzVHh9M8kynbt Cijy8kWZGAYvoVZtpz8cd7S2MeM6Ml4+mbPbS8/L+Jq/Ygj/vxrOx5+BolRwAsTysfyQ 0lWeM2EyXkmquaoGSL3chHU6Cub8KZQNOqatGLTBC+CS+xD7yNjUcMFujb+IN4J/4w25 z8aQ== X-Gm-Message-State: APjAAAVD6mJqErwef2F4RQDQap05LXTUjWOKXlNKUrRQVbhnSmxydKUW DzYq1wWMj/fKqI0Xo9w3GX+OEBz082M= X-Google-Smtp-Source: APXvYqyUK1+R0//fvavu46QlOZxKHVtICulhldBFx7PuI83uF7+77CJwZapDfZcjU0OKXdcrz1x87g== X-Received: by 2002:a17:902:1107:: with SMTP id d7mr778830pla.184.1565808457932; Wed, 14 Aug 2019 11:47:37 -0700 (PDT) Received: from localhost.localdomain ([2601:1c2:680:1319:692:26ff:feda:3a81]) by smtp.gmail.com with ESMTPSA id y16sm610855pfc.36.2019.08.14.11.47.36 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 14 Aug 2019 11:47:37 -0700 (PDT) From: John Stultz To: lkml Cc: Xu YiPing , Rongrong Zou , Xinliang Liu , David Airlie , Daniel Vetter , dri-devel , Sam Ravnborg , John Stultz Subject: [RESEND][PATCH v3 20/26] drm: kirin: Add register connect helper functions in drm init Date: Wed, 14 Aug 2019 18:46:56 +0000 Message-Id: <20190814184702.54275-21-john.stultz@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190814184702.54275-1-john.stultz@linaro.org> References: <20190814184702.54275-1-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: Rongrong Zou Cc: Xinliang Liu Cc: David Airlie Cc: Daniel Vetter Cc: dri-devel Cc: Sam Ravnborg Reviewed-by: Sam Ravnborg Signed-off-by: Xu YiPing [jstultz: reworded commit message] Signed-off-by: John Stultz --- .../gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 1 + .../gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 43 +++++++++++++++++++ .../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 0bc2e538913b..66434c0cce6e 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 296661ba300f..1c9658e9565e 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c @@ -97,6 +97,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; @@ -116,8 +150,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 fdbfc4a90f22..95f56c9960d5 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h @@ -39,6 +39,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.17.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: John Stultz Subject: [RESEND][PATCH v3 20/26] drm: kirin: Add register connect helper functions in drm init Date: Wed, 14 Aug 2019 18:46:56 +0000 Message-ID: <20190814184702.54275-21-john.stultz@linaro.org> References: <20190814184702.54275-1-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 DB55E6E7EF for ; Wed, 14 Aug 2019 18:47:39 +0000 (UTC) Received: by mail-pl1-x642.google.com with SMTP id y8so8962496plr.12 for ; Wed, 14 Aug 2019 11:47:39 -0700 (PDT) In-Reply-To: <20190814184702.54275-1-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 , dri-devel , Xinliang Liu , Rongrong Zou , Sam Ravnborg List-Id: dri-devel@lists.freedesktop.org RnJvbTogWHUgWWlQaW5nIDx4dXlpcGluZ0BoaXNpbGljb24uY29tPgoKQXMgcGFydCBvZiByZWZh Y3RvcmluZyB0aGUga2lyaW4gZHJpdmVyIHRvIGJldHRlciBzdXBwb3J0CmRpZmZlcmVudCBoYXJk d2FyZSByZXZpc2lvbnMsIHRoaXMgcGF0Y2ggYWRkcyBhIGZsYWcgdG8gdGhlCmRldmljZSBzcGVj aWZpYyBkcml2ZXIgZGF0YSBzbyB0aGF0IHdlIGNhbiBjb25kaXRpb25hbGx5CnJlZ2lzdGVyIHRo ZSBjb25uZWN0b3JzIGF0IGluaXQuCgpDYzogUm9uZ3JvbmcgWm91IDx6b3Vyb25ncm9uZ0BnbWFp bC5jb20+CkNjOiBYaW5saWFuZyBMaXUgPHoubGl1eGlubGlhbmdAaGlzaWxpY29uLmNvbT4KQ2M6 IERhdmlkIEFpcmxpZSA8YWlybGllZEBsaW51eC5pZT4KQ2M6IERhbmllbCBWZXR0ZXIgPGRhbmll bEBmZndsbC5jaD4KQ2M6IGRyaS1kZXZlbCA8ZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9y Zz4KQ2M6IFNhbSBSYXZuYm9yZyA8c2FtQHJhdm5ib3JnLm9yZz4KUmV2aWV3ZWQtYnk6IFNhbSBS YXZuYm9yZyA8c2FtQHJhdm5ib3JnLm9yZz4KU2lnbmVkLW9mZi1ieTogWHUgWWlQaW5nIDx4dXlp cGluZ0BoaXNpbGljb24uY29tPgpbanN0dWx0ejogcmV3b3JkZWQgY29tbWl0IG1lc3NhZ2VdClNp Z25lZC1vZmYtYnk6IEpvaG4gU3R1bHR6IDxqb2huLnN0dWx0ekBsaW5hcm8ub3JnPgotLS0KIC4u Li9ncHUvZHJtL2hpc2lsaWNvbi9raXJpbi9raXJpbl9kcm1fYWRlLmMgICB8ICAxICsKIC4uLi9n cHUvZHJtL2hpc2lsaWNvbi9raXJpbi9raXJpbl9kcm1fZHJ2LmMgICB8IDQzICsrKysrKysrKysr KysrKysrKysKIC4uLi9ncHUvZHJtL2hpc2lsaWNvbi9raXJpbi9raXJpbl9kcm1fZHJ2LmggICB8 ICAxICsKIDMgZmlsZXMgY2hhbmdlZCwgNDUgaW5zZXJ0aW9ucygrKQoKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9oaXNpbGljb24va2lyaW4va2lyaW5fZHJtX2FkZS5jIGIvZHJpdmVycy9n cHUvZHJtL2hpc2lsaWNvbi9raXJpbi9raXJpbl9kcm1fYWRlLmMKaW5kZXggMGJjMmU1Mzg5MTNi Li42NjQzNGMwY2NlNmUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9oaXNpbGljb24va2ly aW4va2lyaW5fZHJtX2FkZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9oaXNpbGljb24va2lyaW4v a2lyaW5fZHJtX2FkZS5jCkBAIC0xMDc2LDYgKzEwNzYsNyBAQCBzdGF0aWMgc3RydWN0IGRybV9k cml2ZXIgYWRlX2RyaXZlciA9IHsKIH07CiAKIHN0cnVjdCBraXJpbl9kcm1fZGF0YSBhZGVfZHJp dmVyX2RhdGEgPSB7CisJLnJlZ2lzdGVyX2Nvbm5lY3RzID0gZmFsc2UsCiAJLm51bV9wbGFuZXMg PSBBREVfQ0hfTlVNLAogCS5wcmltX3BsYW5lID0gQURFX0NIMSwKIAkuY2hhbm5lbF9mb3JtYXRz ID0gY2hhbm5lbF9mb3JtYXRzLApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2hpc2lsaWNv bi9raXJpbi9raXJpbl9kcm1fZHJ2LmMgYi9kcml2ZXJzL2dwdS9kcm0vaGlzaWxpY29uL2tpcmlu L2tpcmluX2RybV9kcnYuYwppbmRleCAyOTY2NjFiYTMwMGYuLjFjOTY1OGU5NTY1ZSAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2hpc2lsaWNvbi9raXJpbi9raXJpbl9kcm1fZHJ2LmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2hpc2lsaWNvbi9raXJpbi9raXJpbl9kcm1fZHJ2LmMKQEAgLTk3 LDYgKzk3LDQwIEBAIHN0YXRpYyBpbnQgY29tcGFyZV9vZihzdHJ1Y3QgZGV2aWNlICpkZXYsIHZv aWQgKmRhdGEpCiAJcmV0dXJuIGRldi0+b2Zfbm9kZSA9PSBkYXRhOwogfQogCitzdGF0aWMgaW50 IGtpcmluX2RybV9jb25uZWN0b3JzX3JlZ2lzdGVyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCit7 CisJc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvcjsKKwlzdHJ1Y3QgZHJtX2Nvbm5lY3Rv ciAqZmFpbGVkX2Nvbm5lY3RvcjsKKwlzdHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9saXN0X2l0ZXIgY29u bl9pdGVyOworCWludCByZXQ7CisKKwltdXRleF9sb2NrKCZkZXYtPm1vZGVfY29uZmlnLm11dGV4 KTsKKwlkcm1fY29ubmVjdG9yX2xpc3RfaXRlcl9iZWdpbihkZXYsICZjb25uX2l0ZXIpOworCWRy bV9mb3JfZWFjaF9jb25uZWN0b3JfaXRlcihjb25uZWN0b3IsICZjb25uX2l0ZXIpIHsKKwkJcmV0 ID0gZHJtX2Nvbm5lY3Rvcl9yZWdpc3Rlcihjb25uZWN0b3IpOworCQlpZiAocmV0KSB7CisJCQlm YWlsZWRfY29ubmVjdG9yID0gY29ubmVjdG9yOworCQkJZ290byBlcnI7CisJCX0KKwl9CisJZHJt X2Nvbm5lY3Rvcl9saXN0X2l0ZXJfZW5kKCZjb25uX2l0ZXIpOworCW11dGV4X3VubG9jaygmZGV2 LT5tb2RlX2NvbmZpZy5tdXRleCk7CisKKwlyZXR1cm4gMDsKKworZXJyOgorCWRybV9jb25uZWN0 b3JfbGlzdF9pdGVyX2JlZ2luKGRldiwgJmNvbm5faXRlcik7CisJZHJtX2Zvcl9lYWNoX2Nvbm5l Y3Rvcl9pdGVyKGNvbm5lY3RvciwgJmNvbm5faXRlcikgeworCQlpZiAoZmFpbGVkX2Nvbm5lY3Rv ciA9PSBjb25uZWN0b3IpCisJCQlicmVhazsKKwkJZHJtX2Nvbm5lY3Rvcl91bnJlZ2lzdGVyKGNv bm5lY3Rvcik7CisJfQorCWRybV9jb25uZWN0b3JfbGlzdF9pdGVyX2VuZCgmY29ubl9pdGVyKTsK KwltdXRleF91bmxvY2soJmRldi0+bW9kZV9jb25maWcubXV0ZXgpOworCisJcmV0dXJuIHJldDsK K30KKwogc3RhdGljIGludCBraXJpbl9kcm1fYmluZChzdHJ1Y3QgZGV2aWNlICpkZXYpCiB7CiAJ c3RydWN0IGRybV9kZXZpY2UgKmRybV9kZXY7CkBAIC0xMTYsOCArMTUwLDE3IEBAIHN0YXRpYyBp bnQga2lyaW5fZHJtX2JpbmQoc3RydWN0IGRldmljZSAqZGV2KQogCiAJZHJtX2ZiZGV2X2dlbmVy aWNfc2V0dXAoZHJtX2RldiwgMzIpOwogCisJLyogY29ubmVjdG9ycyBzaG91bGQgYmUgcmVnaXN0 ZXJlZCBhZnRlciBkcm0gZGV2aWNlIHJlZ2lzdGVyICovCisJaWYgKGRyaXZlcl9kYXRhLT5yZWdp c3Rlcl9jb25uZWN0cyA9PSB0cnVlKSB7CisJCXJldCA9IGtpcmluX2RybV9jb25uZWN0b3JzX3Jl Z2lzdGVyKGRybV9kZXYpOworCQlpZiAocmV0KQorCQkJZ290byBlcnJfZHJtX2Rldl91bnJlZ2lz dGVyOworCX0KKwogCXJldHVybiAwOwogCitlcnJfZHJtX2Rldl91bnJlZ2lzdGVyOgorCWRybV9k ZXZfdW5yZWdpc3Rlcihkcm1fZGV2KTsKIGVycl9rbXNfY2xlYW51cDoKIAlraXJpbl9kcm1fa21z X2NsZWFudXAoZHJtX2Rldik7CiBlcnJfZHJtX2Rldl9wdXQ6CmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaGlzaWxpY29uL2tpcmluL2tpcmluX2RybV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2Ry bS9oaXNpbGljb24va2lyaW4va2lyaW5fZHJtX2Rydi5oCmluZGV4IGZkYmZjNGE5MGYyMi4uOTVm NTZjOTk2MGQ1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaGlzaWxpY29uL2tpcmluL2tp cmluX2RybV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaGlzaWxpY29uL2tpcmluL2tpcmlu X2RybV9kcnYuaApAQCAtMzksNiArMzksNyBAQCBzdHJ1Y3Qga2lyaW5fZHJtX2RhdGEgewogCXUz MiBjaGFubmVsX2Zvcm1hdHNfY250OwogCWludCBjb25maWdfbWF4X3dpZHRoOwogCWludCBjb25m aWdfbWF4X2hlaWdodDsKKwlib29sIHJlZ2lzdGVyX2Nvbm5lY3RzOwogCXUzMiBudW1fcGxhbmVz OwogCXUzMiBwcmltX3BsYW5lOwogCi0tIAoyLjE3LjEKCl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVs QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWls bWFuL2xpc3RpbmZvL2RyaS1kZXZlbA==