From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dariusz Marcinkiewicz Subject: [PATCH v6 6/8] drm: tegra: use cec_notifier_conn_(un)register Date: Tue, 13 Aug 2019 13:02:38 +0200 Message-ID: <20190813110300.83025-7-darekm@google.com> References: <20190813110300.83025-1-darekm@google.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190813110300.83025-1-darekm@google.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org, hverkuil-cisco@xs4all.nl Cc: David Airlie , open list , Jonathan Hunter , Thierry Reding , "open list:DRM DRIVERS FOR NVIDIA TEGRA" , Dariusz Marcinkiewicz List-Id: linux-tegra@vger.kernel.org VXNlIHRoZSBuZXcgY2VjX25vdGlmaWVyX2Nvbm5fKHVuKXJlZ2lzdGVyKCkgZnVuY3Rpb25zIHRv Cih1bilyZWdpc3RlciB0aGUgbm90aWZpZXIgZm9yIHRoZSBIRE1JIGNvbm5lY3RvciwgYW5kIGZp bGwgaW4KdGhlIGNlY19jb25uZWN0b3JfaW5mby4KCkNoYW5nZXMgc2luY2UgdjQ6CgktIG9ubHkg Y3JlYXRlIGEgQ0VDIG5vdGlmaWVyIGZvciBIRE1JIGNvbm5lY3RvcnMKClNpZ25lZC1vZmYtYnk6 IERhcml1c3ogTWFyY2lua2lld2ljeiA8ZGFyZWttQGdvb2dsZS5jb20+ClRlc3RlZC1ieTogSGFu cyBWZXJrdWlsIDxodmVya3VpbC1jaXNjb0B4czRhbGwubmw+Ci0tLQogZHJpdmVycy9ncHUvZHJt L3RlZ3JhL291dHB1dC5jIHwgMjggKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLQogMSBmaWxl IGNoYW5nZWQsIDIxIGluc2VydGlvbnMoKyksIDcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL3RlZ3JhL291dHB1dC5jIGIvZHJpdmVycy9ncHUvZHJtL3RlZ3JhL291 dHB1dC5jCmluZGV4IGJkY2FhNGM3MTY4Y2YuLjM0MzczNzM0ZmY2ODkgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS90ZWdyYS9vdXRwdXQuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vdGVncmEv b3V0cHV0LmMKQEAgLTcwLDYgKzcwLDExIEBAIHRlZ3JhX291dHB1dF9jb25uZWN0b3JfZGV0ZWN0 KHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IsIGJvb2wgZm9yY2UpCiAKIHZvaWQgdGVn cmFfb3V0cHV0X2Nvbm5lY3Rvcl9kZXN0cm95KHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0 b3IpCiB7CisJc3RydWN0IHRlZ3JhX291dHB1dCAqb3V0cHV0ID0gY29ubmVjdG9yX3RvX291dHB1 dChjb25uZWN0b3IpOworCisJaWYgKG91dHB1dC0+Y2VjKQorCQljZWNfbm90aWZpZXJfY29ubl91 bnJlZ2lzdGVyKG91dHB1dC0+Y2VjKTsKKwogCWRybV9jb25uZWN0b3JfdW5yZWdpc3Rlcihjb25u ZWN0b3IpOwogCWRybV9jb25uZWN0b3JfY2xlYW51cChjb25uZWN0b3IpOwogfQpAQCAtMTYzLDE4 ICsxNjgsMTEgQEAgaW50IHRlZ3JhX291dHB1dF9wcm9iZShzdHJ1Y3QgdGVncmFfb3V0cHV0ICpv dXRwdXQpCiAJCWRpc2FibGVfaXJxKG91dHB1dC0+aHBkX2lycSk7CiAJfQogCi0Jb3V0cHV0LT5j ZWMgPSBjZWNfbm90aWZpZXJfZ2V0KG91dHB1dC0+ZGV2KTsKLQlpZiAoIW91dHB1dC0+Y2VjKQot CQlyZXR1cm4gLUVOT01FTTsKLQogCXJldHVybiAwOwogfQogCiB2b2lkIHRlZ3JhX291dHB1dF9y ZW1vdmUoc3RydWN0IHRlZ3JhX291dHB1dCAqb3V0cHV0KQogewotCWlmIChvdXRwdXQtPmNlYykK LQkJY2VjX25vdGlmaWVyX3B1dChvdXRwdXQtPmNlYyk7Ci0KIAlpZiAob3V0cHV0LT5ocGRfZ3Bp bykKIAkJZnJlZV9pcnEob3V0cHV0LT5ocGRfaXJxLCBvdXRwdXQpOwogCkBAIC0xODQsNiArMTgy LDcgQEAgdm9pZCB0ZWdyYV9vdXRwdXRfcmVtb3ZlKHN0cnVjdCB0ZWdyYV9vdXRwdXQgKm91dHB1 dCkKIAogaW50IHRlZ3JhX291dHB1dF9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkcm0sIHN0cnVj dCB0ZWdyYV9vdXRwdXQgKm91dHB1dCkKIHsKKwlpbnQgY29ubmVjdG9yX3R5cGU7CiAJaW50IGVy cjsKIAogCWlmIChvdXRwdXQtPnBhbmVsKSB7CkBAIC0xOTksNiArMTk4LDIxIEBAIGludCB0ZWdy YV9vdXRwdXRfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZHJtLCBzdHJ1Y3QgdGVncmFfb3V0cHV0 ICpvdXRwdXQpCiAJaWYgKG91dHB1dC0+aHBkX2dwaW8pCiAJCWVuYWJsZV9pcnEob3V0cHV0LT5o cGRfaXJxKTsKIAorCWNvbm5lY3Rvcl90eXBlID0gb3V0cHV0LT5jb25uZWN0b3IuY29ubmVjdG9y X3R5cGU7CisJLyoKKwkgKiBDcmVhdGUgYSBDRUMgbm90aWZpZXIgZm9yIEhETUkgY29ubmVjdG9y LgorCSAqLworCWlmIChjb25uZWN0b3JfdHlwZSA9PSBEUk1fTU9ERV9DT05ORUNUT1JfSERNSUEg fHwKKwkgICAgY29ubmVjdG9yX3R5cGUgPT0gRFJNX01PREVfQ09OTkVDVE9SX0hETUlCKSB7CisJ CXN0cnVjdCBjZWNfY29ubmVjdG9yX2luZm8gY29ubl9pbmZvOworCisJCWNlY19maWxsX2Nvbm5f aW5mb19mcm9tX2RybSgmY29ubl9pbmZvLCAmb3V0cHV0LT5jb25uZWN0b3IpOworCQlvdXRwdXQt PmNlYyA9IGNlY19ub3RpZmllcl9jb25uX3JlZ2lzdGVyKG91dHB1dC0+ZGV2LCBOVUxMLAorCQkJ CQkJCSAmY29ubl9pbmZvKTsKKwkJaWYgKCFvdXRwdXQtPmNlYykKKwkJCXJldHVybiAtRU5PTUVN OworCX0KKwogCXJldHVybiAwOwogfQogCi0tIAoyLjIzLjAucmMxLjE1My5nZGVlZDgwMzMwZi1n b29nCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmkt ZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6 Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWw= 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=-17.4 required=3.0 tests=DKIMWL_WL_MED,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,USER_IN_DEF_DKIM_WL 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 798BBC433FF for ; Tue, 13 Aug 2019 11:04:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4CE062067D for ; Tue, 13 Aug 2019 11:04:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="gDO1KkDT" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727929AbfHMLEH (ORCPT ); Tue, 13 Aug 2019 07:04:07 -0400 Received: from mail-vs1-f73.google.com ([209.85.217.73]:40043 "EHLO mail-vs1-f73.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726721AbfHMLEH (ORCPT ); Tue, 13 Aug 2019 07:04:07 -0400 Received: by mail-vs1-f73.google.com with SMTP id v9so28901360vsq.7 for ; Tue, 13 Aug 2019 04:04:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=saq5XDceOIgoGr9TXKhDgKirX3SqKoE0qoHBi968/xk=; b=gDO1KkDTJUciiu/w2pWa46oNOHB2NW+diPTrQSe6UjOmk/n2EoRpy+rDWdBYJuiKzY 6x6LgDF5KDKyv9VXmseeyAu3LhFkBOtjkbVjLcCMTQsulzf1fQZYMwK97ErqMxCmCX3D S7EApgu5kjDAFza//vwbwwa1Gk59twIlmD1KY7DRHQFJrGUzS5zFJe0CbCc0GIqHF4io VFLPmmZnVQfYKNtjAbG8Evu6bf3DyEGgeEqB45NKR7BoQ3ILZ+L7a3sdX45sWfvGO1sY XSFc2NiIuWZftfLGRjyOg7nh1+UFJBut3iAOv4jzfoc8SYbt4t+/WIT5Jms6mAK+9E0I NTQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=saq5XDceOIgoGr9TXKhDgKirX3SqKoE0qoHBi968/xk=; b=p2M5Rws7C2ETp27geigYTyOB2tzZajJFddwrvM/72GB3pUxiRuWvA++dTrMrersNhH BpnteeOHLcax+Mor7i7iyAsNsoZPmDm8PX+szVz3Oc5ktNK5Io31ayGFT49UmUbQcll7 XOgYIvz9MZncq3VS5kqysQL4tPbLb3Nnc1cZD0wZaNX3etUvwOw0V598j6iLlvN6HoAY 4Vqc/zjngrtOnMrR2UxlUbyKatzLt92p4cN31iXbHXe8ab0+mJ335qjTsRftNW9vFelb vmvt+KeGyu6c7L4u5NUdi8RAfjxva0gKWF2pYWuPLrIJK+xlBwoYjdAY5Mp86jprfThG ExOQ== X-Gm-Message-State: APjAAAX4bhvl6m+k7FSLIbTzKCKPPB5TKYTZU6rcncrWzP/1O+Pyq61+ o+HXh20md2v3jN1WmB7Iss2p4QgZ/SE= X-Google-Smtp-Source: APXvYqyRU0LZVcPWtHHZrERKAl27mwogAt6+FnB4yxVhw/aK7Ob1F1wrsG/rm4k4QQRTeI1EszqJIbqVp0I= X-Received: by 2002:a67:fa44:: with SMTP id j4mr10655278vsq.138.1565694246217; Tue, 13 Aug 2019 04:04:06 -0700 (PDT) Date: Tue, 13 Aug 2019 13:02:38 +0200 In-Reply-To: <20190813110300.83025-1-darekm@google.com> Message-Id: <20190813110300.83025-7-darekm@google.com> Mime-Version: 1.0 References: <20190813110300.83025-1-darekm@google.com> X-Mailer: git-send-email 2.23.0.rc1.153.gdeed80330f-goog Subject: [PATCH v6 6/8] drm: tegra: use cec_notifier_conn_(un)register From: Dariusz Marcinkiewicz To: dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org, hverkuil-cisco@xs4all.nl Cc: Dariusz Marcinkiewicz , Thierry Reding , David Airlie , Daniel Vetter , Jonathan Hunter , "open list:DRM DRIVERS FOR NVIDIA TEGRA" , open list Content-Type: text/plain; charset="UTF-8" Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Use the new cec_notifier_conn_(un)register() functions to (un)register the notifier for the HDMI connector, and fill in the cec_connector_info. Changes since v4: - only create a CEC notifier for HDMI connectors Signed-off-by: Dariusz Marcinkiewicz Tested-by: Hans Verkuil --- drivers/gpu/drm/tegra/output.c | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/tegra/output.c b/drivers/gpu/drm/tegra/output.c index bdcaa4c7168cf..34373734ff689 100644 --- a/drivers/gpu/drm/tegra/output.c +++ b/drivers/gpu/drm/tegra/output.c @@ -70,6 +70,11 @@ tegra_output_connector_detect(struct drm_connector *connector, bool force) void tegra_output_connector_destroy(struct drm_connector *connector) { + struct tegra_output *output = connector_to_output(connector); + + if (output->cec) + cec_notifier_conn_unregister(output->cec); + drm_connector_unregister(connector); drm_connector_cleanup(connector); } @@ -163,18 +168,11 @@ int tegra_output_probe(struct tegra_output *output) disable_irq(output->hpd_irq); } - output->cec = cec_notifier_get(output->dev); - if (!output->cec) - return -ENOMEM; - return 0; } void tegra_output_remove(struct tegra_output *output) { - if (output->cec) - cec_notifier_put(output->cec); - if (output->hpd_gpio) free_irq(output->hpd_irq, output); @@ -184,6 +182,7 @@ void tegra_output_remove(struct tegra_output *output) int tegra_output_init(struct drm_device *drm, struct tegra_output *output) { + int connector_type; int err; if (output->panel) { @@ -199,6 +198,21 @@ int tegra_output_init(struct drm_device *drm, struct tegra_output *output) if (output->hpd_gpio) enable_irq(output->hpd_irq); + connector_type = output->connector.connector_type; + /* + * Create a CEC notifier for HDMI connector. + */ + if (connector_type == DRM_MODE_CONNECTOR_HDMIA || + connector_type == DRM_MODE_CONNECTOR_HDMIB) { + struct cec_connector_info conn_info; + + cec_fill_conn_info_from_drm(&conn_info, &output->connector); + output->cec = cec_notifier_conn_register(output->dev, NULL, + &conn_info); + if (!output->cec) + return -ENOMEM; + } + return 0; } -- 2.23.0.rc1.153.gdeed80330f-goog