From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dariusz Marcinkiewicz Subject: [PATCH v6 2/8] dw-hdmi-cec: use cec_notifier_cec_adap_(un)register Date: Tue, 13 Aug 2019 13:02:34 +0200 Message-ID: <20190813110300.83025-3-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: Received: from mail-qt1-x84a.google.com (mail-qt1-x84a.google.com [IPv6:2607:f8b0:4864:20::84a]) by gabe.freedesktop.org (Postfix) with ESMTPS id A77906E0EF for ; Tue, 13 Aug 2019 11:03:49 +0000 (UTC) Received: by mail-qt1-x84a.google.com with SMTP id 41so93679536qtm.4 for ; Tue, 13 Aug 2019 04:03:49 -0700 (PDT) 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: Kate Stewart , Jernej Skrabec , Jonas Karlman , David Airlie , Neil Armstrong , open list , Laurent Pinchart , Thomas Gleixner , Dariusz Marcinkiewicz , Enrico Weigelt List-Id: dri-devel@lists.freedesktop.org VXNlIHRoZSBuZXcgY2VjX25vdGlmaWVyX2NlY19hZGFwXyh1bilyZWdpc3RlcigpIGZ1bmN0aW9u cyB0bwoodW4pcmVnaXN0ZXIgdGhlIG5vdGlmaWVyIGZvciB0aGUgQ0VDIGFkYXB0ZXIuCgpBbHNv IGFkZHMgQ0VDX0NBUF9DT05ORUNUT1JfSU5GTyBjYXBhYmlsaXR5IHRvIHRoZSBhZGFwdGVyLgoK Q2hhbmdlcyBzaW5jZSB2MzoKCS0gYWRkIENFQ19DQVBfQ09OTkVDVE9SX0lORk8gdG8gY2VjX2Fs bG9jYXRlX2FkYXB0ZXIsCgktIHJlcGxhY2UgQ0VDX0NBUF9MT0dfQUREUlMgfCBDRUNfQ0FQX1RS QU5TTUlUIHwKCUNFQ19DQVBfUkMgfCBDRUNfQ0FQX1BBU1NUSFJPVUdIIHdpdGggQ0VDX0NBUF9E RUZBVUxUUy4KClNpZ25lZC1vZmYtYnk6IERhcml1c3ogTWFyY2lua2lld2ljeiA8ZGFyZWttQGdv b2dsZS5jb20+ClNpZ25lZC1vZmYtYnk6IEhhbnMgVmVya3VpbCA8aHZlcmt1aWwtY2lzY29AeHM0 YWxsLm5sPgpUZXN0ZWQtYnk6IEhhbnMgVmVya3VpbCA8aHZlcmt1aWwtY2lzY29AeHM0YWxsLm5s PgotLS0KIGRyaXZlcnMvZ3B1L2RybS9icmlkZ2Uvc3lub3BzeXMvZHctaGRtaS1jZWMuYyB8IDEz ICsrKysrKy0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA2IGluc2VydGlvbnMoKyksIDcgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2JyaWRnZS9zeW5vcHN5cy9kdy1o ZG1pLWNlYy5jIGIvZHJpdmVycy9ncHUvZHJtL2JyaWRnZS9zeW5vcHN5cy9kdy1oZG1pLWNlYy5j CmluZGV4IDBmOTQ5OTc4ZDNmY2QuLmFjMWUwMDFkMDg4MjkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9icmlkZ2Uvc3lub3BzeXMvZHctaGRtaS1jZWMuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vYnJpZGdlL3N5bm9wc3lzL2R3LWhkbWktY2VjLmMKQEAgLTI1Niw4ICsyNTYsOCBAQCBzdGF0 aWMgaW50IGR3X2hkbWlfY2VjX3Byb2JlKHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYpCiAJ ZHdfaGRtaV93cml0ZShjZWMsIDAsIEhETUlfQ0VDX1BPTEFSSVRZKTsKIAogCWNlYy0+YWRhcCA9 IGNlY19hbGxvY2F0ZV9hZGFwdGVyKCZkd19oZG1pX2NlY19vcHMsIGNlYywgImR3X2hkbWkiLAot CQkJCQkgQ0VDX0NBUF9MT0dfQUREUlMgfCBDRUNfQ0FQX1RSQU5TTUlUIHwKLQkJCQkJIENFQ19D QVBfUkMgfCBDRUNfQ0FQX1BBU1NUSFJPVUdILAorCQkJCQkgQ0VDX0NBUF9ERUZBVUxUUyB8CisJ CQkJCSBDRUNfQ0FQX0NPTk5FQ1RPUl9JTkZPLAogCQkJCQkgQ0VDX01BWF9MT0dfQUREUlMpOwog CWlmIChJU19FUlIoY2VjLT5hZGFwKSkKIAkJcmV0dXJuIFBUUl9FUlIoY2VjLT5hZGFwKTsKQEAg LTI3OCwxMyArMjc4LDE0IEBAIHN0YXRpYyBpbnQgZHdfaGRtaV9jZWNfcHJvYmUoc3RydWN0IHBs YXRmb3JtX2RldmljZSAqcGRldikKIAlpZiAocmV0IDwgMCkKIAkJcmV0dXJuIHJldDsKIAotCWNl Yy0+bm90aWZ5ID0gY2VjX25vdGlmaWVyX2dldChwZGV2LT5kZXYucGFyZW50KTsKKwljZWMtPm5v dGlmeSA9IGNlY19ub3RpZmllcl9jZWNfYWRhcF9yZWdpc3RlcihwZGV2LT5kZXYucGFyZW50LAor CQkJCQkJICAgICBOVUxMLCBjZWMtPmFkYXApOwogCWlmICghY2VjLT5ub3RpZnkpCiAJCXJldHVy biAtRU5PTUVNOwogCiAJcmV0ID0gY2VjX3JlZ2lzdGVyX2FkYXB0ZXIoY2VjLT5hZGFwLCBwZGV2 LT5kZXYucGFyZW50KTsKIAlpZiAocmV0IDwgMCkgewotCQljZWNfbm90aWZpZXJfcHV0KGNlYy0+ bm90aWZ5KTsKKwkJY2VjX25vdGlmaWVyX2NlY19hZGFwX3VucmVnaXN0ZXIoY2VjLT5ub3RpZnkp OwogCQlyZXR1cm4gcmV0OwogCX0KIApAQCAtMjk0LDggKzI5NSw2IEBAIHN0YXRpYyBpbnQgZHdf aGRtaV9jZWNfcHJvYmUoc3RydWN0IHBsYXRmb3JtX2RldmljZSAqcGRldikKIAkgKi8KIAlkZXZt X3JlbW92ZV9hY3Rpb24oJnBkZXYtPmRldiwgZHdfaGRtaV9jZWNfZGVsLCBjZWMpOwogCi0JY2Vj X3JlZ2lzdGVyX2NlY19ub3RpZmllcihjZWMtPmFkYXAsIGNlYy0+bm90aWZ5KTsKLQogCXJldHVy biAwOwogfQogCkBAIC0zMDMsOCArMzAyLDggQEAgc3RhdGljIGludCBkd19oZG1pX2NlY19yZW1v dmUoc3RydWN0IHBsYXRmb3JtX2RldmljZSAqcGRldikKIHsKIAlzdHJ1Y3QgZHdfaGRtaV9jZWMg KmNlYyA9IHBsYXRmb3JtX2dldF9kcnZkYXRhKHBkZXYpOwogCisJY2VjX25vdGlmaWVyX2NlY19h ZGFwX3VucmVnaXN0ZXIoY2VjLT5ub3RpZnkpOwogCWNlY191bnJlZ2lzdGVyX2FkYXB0ZXIoY2Vj LT5hZGFwKTsKLQljZWNfbm90aWZpZXJfcHV0KGNlYy0+bm90aWZ5KTsKIAogCXJldHVybiAwOwog fQotLSAKMi4yMy4wLnJjMS4xNTMuZ2RlZWQ4MDMzMGYtZ29vZwoKX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmkt ZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3Jn L21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVs 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 6B844C32750 for ; Tue, 13 Aug 2019 11:03:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3D1B620840 for ; Tue, 13 Aug 2019 11:03:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="WONVccTI" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727196AbfHMLDt (ORCPT ); Tue, 13 Aug 2019 07:03:49 -0400 Received: from mail-qt1-f202.google.com ([209.85.160.202]:47111 "EHLO mail-qt1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726600AbfHMLDt (ORCPT ); Tue, 13 Aug 2019 07:03:49 -0400 Received: by mail-qt1-f202.google.com with SMTP id g33so7068674qtc.14 for ; Tue, 13 Aug 2019 04:03:49 -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=8XQAtQU5Jlu+LsGTeIXfkeaCQsZPIsgrkBYJbMGoesk=; b=WONVccTIDftVGDULY91dHjvEzbQk3VhS9tlpsFUt/enibyOhbHo3b0DFcLewogMBDc xloAzgsKjOvC4JHqImA6XZqZ9jRNJ5EK4ZOiClT3bWa5BIHWdOsUPHw3sAG+6mNN+Wfu U8Abd4dxv6ucp2qlfEgK5xSyVYx2UF+yjDweJ+zWobe6kv0lykLYshfNTbDfIMe1Hfxn b+h7b0wcWnyH7KRBwS/M5bb+p26QB/Lh2KK1QgTroLTD2RlwxcRwJaSIJglkwTT8ESJp jRZAETsPoZjKR9LScyy1NPY89PdS90jvaEbg1HjVQGGD98Z3zzDrfnyPal6oeYj+jqDh +eyw== 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=8XQAtQU5Jlu+LsGTeIXfkeaCQsZPIsgrkBYJbMGoesk=; b=MxwYG6JBE2TGeKsrci5tIr9SkITSe6GwLSkTqjCW6IkYZsqGk/DB9RCv3sGpze5n/t EIeBA042Vs2knmXIedEDgcFJRb2zNFa0HYDccexYlC7d4Ph5L4pQSclhqc9EyvQonWWd 9TuzHi5EOccysPPrrJ2OfF7SAtAjQu4WEd31aOsBIjiXcFCN2DpaUscwokSVA38BY2vh dXnObDc0LRKojtQgmGTnLtlHmc7UbehCPhER4gZt53piTfV4luuKaVhrsDaOdI4VTvdV BEVMLe0rV9OHKJ5AVBke3tzpzitTOqMWZRaevhrU96cHM0ugwlSA4f2knt+Bqp8/KA7Z oaPA== X-Gm-Message-State: APjAAAWzLMLfXe7qXZny6eAGMXDXLthrqYpNAt17kncMJhzYnH6AL+zh 3nTJA6+hvhv0vbSqaU0oQ3IiFYAl9CM= X-Google-Smtp-Source: APXvYqyDDzweTJoOpSrCJBhYFA2bPdcntFbwhRbcFvhSWKkyE6mKScSn8KJ6qn2GtAZSopDoFcKlju1Uov8= X-Received: by 2002:ae9:f812:: with SMTP id x18mr26524005qkh.290.1565694228612; Tue, 13 Aug 2019 04:03:48 -0700 (PDT) Date: Tue, 13 Aug 2019 13:02:34 +0200 In-Reply-To: <20190813110300.83025-1-darekm@google.com> Message-Id: <20190813110300.83025-3-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 2/8] dw-hdmi-cec: use cec_notifier_cec_adap_(un)register From: Dariusz Marcinkiewicz To: dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org, hverkuil-cisco@xs4all.nl Cc: Dariusz Marcinkiewicz , Andrzej Hajda , Neil Armstrong , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , David Airlie , Daniel Vetter , Enrico Weigelt , Kate Stewart , Thomas Gleixner , 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_cec_adap_(un)register() functions to (un)register the notifier for the CEC adapter. Also adds CEC_CAP_CONNECTOR_INFO capability to the adapter. Changes since v3: - add CEC_CAP_CONNECTOR_INFO to cec_allocate_adapter, - replace CEC_CAP_LOG_ADDRS | CEC_CAP_TRANSMIT | CEC_CAP_RC | CEC_CAP_PASSTHROUGH with CEC_CAP_DEFAULTS. Signed-off-by: Dariusz Marcinkiewicz Signed-off-by: Hans Verkuil Tested-by: Hans Verkuil --- drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c index 0f949978d3fcd..ac1e001d08829 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c @@ -256,8 +256,8 @@ static int dw_hdmi_cec_probe(struct platform_device *pdev) dw_hdmi_write(cec, 0, HDMI_CEC_POLARITY); cec->adap = cec_allocate_adapter(&dw_hdmi_cec_ops, cec, "dw_hdmi", - CEC_CAP_LOG_ADDRS | CEC_CAP_TRANSMIT | - CEC_CAP_RC | CEC_CAP_PASSTHROUGH, + CEC_CAP_DEFAULTS | + CEC_CAP_CONNECTOR_INFO, CEC_MAX_LOG_ADDRS); if (IS_ERR(cec->adap)) return PTR_ERR(cec->adap); @@ -278,13 +278,14 @@ static int dw_hdmi_cec_probe(struct platform_device *pdev) if (ret < 0) return ret; - cec->notify = cec_notifier_get(pdev->dev.parent); + cec->notify = cec_notifier_cec_adap_register(pdev->dev.parent, + NULL, cec->adap); if (!cec->notify) return -ENOMEM; ret = cec_register_adapter(cec->adap, pdev->dev.parent); if (ret < 0) { - cec_notifier_put(cec->notify); + cec_notifier_cec_adap_unregister(cec->notify); return ret; } @@ -294,8 +295,6 @@ static int dw_hdmi_cec_probe(struct platform_device *pdev) */ devm_remove_action(&pdev->dev, dw_hdmi_cec_del, cec); - cec_register_cec_notifier(cec->adap, cec->notify); - return 0; } @@ -303,8 +302,8 @@ static int dw_hdmi_cec_remove(struct platform_device *pdev) { struct dw_hdmi_cec *cec = platform_get_drvdata(pdev); + cec_notifier_cec_adap_unregister(cec->notify); cec_unregister_adapter(cec->adap); - cec_notifier_put(cec->notify); return 0; } -- 2.23.0.rc1.153.gdeed80330f-goog