From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dariusz Marcinkiewicz Subject: [PATCH v6 7/8] drm: dw-hdmi: use cec_notifier_conn_(un)register Date: Tue, 13 Aug 2019 13:02:39 +0200 Message-ID: <20190813110300.83025-8-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-vk1-xa4a.google.com (mail-vk1-xa4a.google.com [IPv6:2607:f8b0:4864:20::a4a]) by gabe.freedesktop.org (Postfix) with ESMTPS id 225CC6E0EF for ; Tue, 13 Aug 2019 11:04:13 +0000 (UTC) Received: by mail-vk1-xa4a.google.com with SMTP id w185so27600vka.20 for ; Tue, 13 Aug 2019 04:04:13 -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: Jernej Skrabec , Jonas Karlman , David Airlie , Neil Armstrong , Douglas Anderson , open list , Laurent Pinchart , Dariusz Marcinkiewicz , Sam Ravnborg List-Id: dri-devel@lists.freedesktop.org VXNlIHRoZSBuZXcgY2VjX25vdGlmaWVyX2Nvbm5fKHVuKXJlZ2lzdGVyKCkgZnVuY3Rpb25zIHRv Cih1bilyZWdpc3RlciB0aGUgbm90aWZpZXIgZm9yIHRoZSBIRE1JIGNvbm5lY3RvciwgYW5kIGZp bGwgaW4KdGhlIGNlY19jb25uZWN0b3JfaW5mby4KCkNoYW5nZXMgc2luY2UgdjQ6CgktIHR5cG8g Zml4CkNoYW5nZXMgc2luY2UgdjI6CgktIHJlbW92ZWQgdW5uZWNlc3NhcnkgTlVMTCBjaGVjayBi ZWZvcmUgYSBjYWxsIHRvCgljZWNfbm90aWZpZXJfY29ubl91bnJlZ2lzdGVyLAoJLSB1c2UgY2Vj X25vdGlmaWVyX3BoeXNfYWRkcl9pbnZhbGlkYXRlIHRvIGludmFsaWRhdGUgcGh5c2ljYWwKCWFk ZHJlc3MuCkNoYW5nZXMgc2luY2UgdjE6CglBZGQgbWVtb3J5IGJhcnJpZXIgdG8gbWFrZSBzdXJl IHRoYXQgdGhlIG5vdGlmaWVyCgliZWNvbWVzIHZpc2libGUgdG8gdGhlIGlycSB0aHJlYWQgb25j ZSBpdCBpcyBmdWxseQoJY29uc3RydWN0ZWQuCgpTaWduZWQtb2ZmLWJ5OiBEYXJpdXN6IE1hcmNp bmtpZXdpY3ogPGRhcmVrbUBnb29nbGUuY29tPgpUZXN0ZWQtYnk6IEhhbnMgVmVya3VpbCA8aHZl cmt1aWwtY2lzY29AeHM0YWxsLm5sPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9icmlkZ2Uvc3lub3Bz eXMvZHctaGRtaS5jIHwgMzYgKysrKysrKysrKysrKystLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2Vk LCAyMiBpbnNlcnRpb25zKCspLCAxNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vYnJpZGdlL3N5bm9wc3lzL2R3LWhkbWkuYyBiL2RyaXZlcnMvZ3B1L2RybS9icmlk Z2Uvc3lub3BzeXMvZHctaGRtaS5jCmluZGV4IDgzYjk0YjY2ZTQ2NGUuLmMwMDE4NDcwMGJiOWQg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9icmlkZ2Uvc3lub3BzeXMvZHctaGRtaS5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9icmlkZ2Uvc3lub3BzeXMvZHctaGRtaS5jCkBAIC0yMTk0LDYg KzIxOTQsOCBAQCBzdGF0aWMgaW50IGR3X2hkbWlfYnJpZGdlX2F0dGFjaChzdHJ1Y3QgZHJtX2Jy aWRnZSAqYnJpZGdlKQogCXN0cnVjdCBkd19oZG1pICpoZG1pID0gYnJpZGdlLT5kcml2ZXJfcHJp dmF0ZTsKIAlzdHJ1Y3QgZHJtX2VuY29kZXIgKmVuY29kZXIgPSBicmlkZ2UtPmVuY29kZXI7CiAJ c3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvciA9ICZoZG1pLT5jb25uZWN0b3I7CisJc3Ry dWN0IGNlY19jb25uZWN0b3JfaW5mbyBjb25uX2luZm87CisJc3RydWN0IGNlY19ub3RpZmllciAq bm90aWZpZXI7CiAKIAljb25uZWN0b3ItPmludGVybGFjZV9hbGxvd2VkID0gMTsKIAljb25uZWN0 b3ItPnBvbGxlZCA9IERSTV9DT05ORUNUT1JfUE9MTF9IUEQ7CkBAIC0yMjA3LDYgKzIyMDksMTgg QEAgc3RhdGljIGludCBkd19oZG1pX2JyaWRnZV9hdHRhY2goc3RydWN0IGRybV9icmlkZ2UgKmJy aWRnZSkKIAogCWRybV9jb25uZWN0b3JfYXR0YWNoX2VuY29kZXIoY29ubmVjdG9yLCBlbmNvZGVy KTsKIAorCWNlY19maWxsX2Nvbm5faW5mb19mcm9tX2RybSgmY29ubl9pbmZvLCBjb25uZWN0b3Ip OworCisJbm90aWZpZXIgPSBjZWNfbm90aWZpZXJfY29ubl9yZWdpc3RlcihoZG1pLT5kZXYsIE5V TEwsICZjb25uX2luZm8pOworCWlmICghbm90aWZpZXIpCisJCXJldHVybiAtRU5PTUVNOworCS8q CisJICogTWFrZSBzdXJlIHRoYXQgZHdfaGRtaV9pcnEgdGhyZWFkIGRvZXMgc2VlIHRoZSBub3Rp ZmllcgorCSAqIHdoZW4gaXQgZnVsbHkgY29uc3RydWN0ZWQuCisJICovCisJc21wX3dtYigpOwor CWhkbWktPmNlY19ub3RpZmllciA9IG5vdGlmaWVyOworCiAJcmV0dXJuIDA7CiB9CiAKQEAgLTIz NzMsOSArMjM4NywxMyBAQCBzdGF0aWMgaXJxcmV0dXJuX3QgZHdfaGRtaV9pcnEoaW50IGlycSwg dm9pZCAqZGV2X2lkKQogCQkJCSAgICAgICBwaHlfc3RhdCAmIEhETUlfUEhZX0hQRCwKIAkJCQkg ICAgICAgcGh5X3N0YXQgJiBIRE1JX1BIWV9SWF9TRU5TRSk7CiAKLQkJaWYgKChwaHlfc3RhdCAm IChIRE1JX1BIWV9SWF9TRU5TRSB8IEhETUlfUEhZX0hQRCkpID09IDApCi0JCQljZWNfbm90aWZp ZXJfc2V0X3BoeXNfYWRkcihoZG1pLT5jZWNfbm90aWZpZXIsCi0JCQkJCQkgICBDRUNfUEhZU19B RERSX0lOVkFMSUQpOworCQlpZiAoKHBoeV9zdGF0ICYgKEhETUlfUEhZX1JYX1NFTlNFIHwgSERN SV9QSFlfSFBEKSkgPT0gMCkgeworCQkJc3RydWN0IGNlY19ub3RpZmllciAqbm90aWZpZXI7CisK KwkJCW5vdGlmaWVyID0gUkVBRF9PTkNFKGhkbWktPmNlY19ub3RpZmllcik7CisJCQlpZiAobm90 aWZpZXIpCisJCQkJY2VjX25vdGlmaWVyX3BoeXNfYWRkcl9pbnZhbGlkYXRlKG5vdGlmaWVyKTsK KwkJfQogCX0KIAogCWlmIChpbnRyX3N0YXQgJiBIRE1JX0lIX1BIWV9TVEFUMF9IUEQpIHsKQEAg LTI2OTMsMTIgKzI3MTEsNiBAQCBfX2R3X2hkbWlfcHJvYmUoc3RydWN0IHBsYXRmb3JtX2Rldmlj ZSAqcGRldiwKIAlpZiAocmV0KQogCQlnb3RvIGVycl9pYWhiOwogCi0JaGRtaS0+Y2VjX25vdGlm aWVyID0gY2VjX25vdGlmaWVyX2dldChkZXYpOwotCWlmICghaGRtaS0+Y2VjX25vdGlmaWVyKSB7 Ci0JCXJldCA9IC1FTk9NRU07Ci0JCWdvdG8gZXJyX2lhaGI7Ci0JfQotCiAJLyoKIAkgKiBUbyBw cmV2ZW50IG92ZXJmbG93cyBpbiBIRE1JX0lIX0ZDX1NUQVQyLCBzZXQgdGhlIGNsayByZWdlbmVy YXRvcgogCSAqIE4gYW5kIGN0cyB2YWx1ZXMgYmVmb3JlIGVuYWJsaW5nIHBoeQpAQCAtMjc5Niw5 ICsyODA4LDYgQEAgX19kd19oZG1pX3Byb2JlKHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYs CiAJCWhkbWktPmRkYyA9IE5VTEw7CiAJfQogCi0JaWYgKGhkbWktPmNlY19ub3RpZmllcikKLQkJ Y2VjX25vdGlmaWVyX3B1dChoZG1pLT5jZWNfbm90aWZpZXIpOwotCiAJY2xrX2Rpc2FibGVfdW5w cmVwYXJlKGhkbWktPmlhaGJfY2xrKTsKIAlpZiAoaGRtaS0+Y2VjX2NsaykKIAkJY2xrX2Rpc2Fi bGVfdW5wcmVwYXJlKGhkbWktPmNlY19jbGspOwpAQCAtMjgyMCw4ICsyODI5LDcgQEAgc3RhdGlj IHZvaWQgX19kd19oZG1pX3JlbW92ZShzdHJ1Y3QgZHdfaGRtaSAqaGRtaSkKIAkvKiBEaXNhYmxl IGFsbCBpbnRlcnJ1cHRzICovCiAJaGRtaV93cml0ZWIoaGRtaSwgfjAsIEhETUlfSUhfTVVURV9Q SFlfU1RBVDApOwogCi0JaWYgKGhkbWktPmNlY19ub3RpZmllcikKLQkJY2VjX25vdGlmaWVyX3B1 dChoZG1pLT5jZWNfbm90aWZpZXIpOworCWNlY19ub3RpZmllcl9jb25uX3VucmVnaXN0ZXIoaGRt aS0+Y2VjX25vdGlmaWVyKTsKIAogCWNsa19kaXNhYmxlX3VucHJlcGFyZShoZG1pLT5pYWhiX2Ns ayk7CiAJY2xrX2Rpc2FibGVfdW5wcmVwYXJlKGhkbWktPmlzZnJfY2xrKTsKLS0gCjIuMjMuMC5y YzEuMTUzLmdkZWVkODAzMzBmLWdvb2cKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZy ZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3Rp bmZvL2RyaS1kZXZlbA== 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 03250C32750 for ; Tue, 13 Aug 2019 11:04:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C1F492067D for ; Tue, 13 Aug 2019 11:04:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="kmTjua/W" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728665AbfHMLEN (ORCPT ); Tue, 13 Aug 2019 07:04:13 -0400 Received: from mail-vk1-f202.google.com ([209.85.221.202]:51851 "EHLO mail-vk1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726721AbfHMLEN (ORCPT ); Tue, 13 Aug 2019 07:04:13 -0400 Received: by mail-vk1-f202.google.com with SMTP id s145so45366507vke.18 for ; Tue, 13 Aug 2019 04:04:12 -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=7PGacRYXVFsNBUaK9AFFTq+0n3dK1YSXmAGYlruF6gc=; b=kmTjua/WpkiMq8nHLEd+LjG0YWASE8dJy8v8DnjnQqJTFv/ip1x0XgtkDMWpTTy6Vu JmjhuBtQZS0wboasCWyAFpMs/HYXk/5ypvK2xWr699mfV4KLxHyTTFpc5NLRaAUy9ZVb 09xFUN1d6+7JVLTL3TNM61eV33vnagLykDXXqMYp5hZ9kAOIchcfYZrpWsOdlXhDuEQf c4h6mkc1dUIB5OGoj6KQwqsRvSIXlTHimed7bvYENAz0v8az7SbA0Cf6TN9dh+X6+99l BzUQPyJV3qYFSbIPsuKMoq2LWYrn0SlY+qhBTtKxpUmnPjjPdUEWi6cu5zm7ql1p9oEX AwPg== 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=7PGacRYXVFsNBUaK9AFFTq+0n3dK1YSXmAGYlruF6gc=; b=TR6/aLQ+8ZFuYR8vvqvVnKDYUmkGF9CX5JMFZ8Y6d5mbAikC1Smsrg0hS0tGujpdbm QdkLUykgUUtpinMXCaLUiD/QGzS3n+ZfhQ1zb2Tk+sI8VcI3krb8qRq90KS6F2E9uxfL D/osFK0dDirV07UYlyhtGoG2myFaSM3QVeG9cwGjmA4Gpmod0AP/8qJPtvHfi9RITuKX 2/cMk90LNh13xcrTMFdqwVEFj1rtW8AzojQsrHrZQioIvn/DUlDhsjguCskJh9kvLlh2 KT77YRz2T/3kwd6G54rOrAHFFgG08uQXG4ie/b1Ur8wySz6DGoQGuuvD9v+k6WF0y++Z aenQ== X-Gm-Message-State: APjAAAUJl7obTxmRnXgdqWzW3FzDaiQIq3igaRuREPbP1ss4S65jo9XL hrFLLP5fiKVGs3SIuu366uvdgBSSgeo= X-Google-Smtp-Source: APXvYqyeQaoLuHS4lwvUuncTOZ0+P8t2+0nXHV4RbzHYhLOmVe7Ku4FbTLBE7VGYoUn20Yyj7SW3SjzIXg0= X-Received: by 2002:a9f:326e:: with SMTP id y43mr1637980uad.4.1565694251963; Tue, 13 Aug 2019 04:04:11 -0700 (PDT) Date: Tue, 13 Aug 2019 13:02:39 +0200 In-Reply-To: <20190813110300.83025-1-darekm@google.com> Message-Id: <20190813110300.83025-8-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 7/8] drm: dw-hdmi: 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 , Andrzej Hajda , Neil Armstrong , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , David Airlie , Daniel Vetter , Sam Ravnborg , Douglas Anderson , 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: - typo fix Changes since v2: - removed unnecessary NULL check before a call to cec_notifier_conn_unregister, - use cec_notifier_phys_addr_invalidate to invalidate physical address. Changes since v1: Add memory barrier to make sure that the notifier becomes visible to the irq thread once it is fully constructed. Signed-off-by: Dariusz Marcinkiewicz Tested-by: Hans Verkuil --- drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 36 ++++++++++++++--------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c index 83b94b66e464e..c00184700bb9d 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c @@ -2194,6 +2194,8 @@ static int dw_hdmi_bridge_attach(struct drm_bridge *bridge) struct dw_hdmi *hdmi = bridge->driver_private; struct drm_encoder *encoder = bridge->encoder; struct drm_connector *connector = &hdmi->connector; + struct cec_connector_info conn_info; + struct cec_notifier *notifier; connector->interlace_allowed = 1; connector->polled = DRM_CONNECTOR_POLL_HPD; @@ -2207,6 +2209,18 @@ static int dw_hdmi_bridge_attach(struct drm_bridge *bridge) drm_connector_attach_encoder(connector, encoder); + cec_fill_conn_info_from_drm(&conn_info, connector); + + notifier = cec_notifier_conn_register(hdmi->dev, NULL, &conn_info); + if (!notifier) + return -ENOMEM; + /* + * Make sure that dw_hdmi_irq thread does see the notifier + * when it fully constructed. + */ + smp_wmb(); + hdmi->cec_notifier = notifier; + return 0; } @@ -2373,9 +2387,13 @@ static irqreturn_t dw_hdmi_irq(int irq, void *dev_id) phy_stat & HDMI_PHY_HPD, phy_stat & HDMI_PHY_RX_SENSE); - if ((phy_stat & (HDMI_PHY_RX_SENSE | HDMI_PHY_HPD)) == 0) - cec_notifier_set_phys_addr(hdmi->cec_notifier, - CEC_PHYS_ADDR_INVALID); + if ((phy_stat & (HDMI_PHY_RX_SENSE | HDMI_PHY_HPD)) == 0) { + struct cec_notifier *notifier; + + notifier = READ_ONCE(hdmi->cec_notifier); + if (notifier) + cec_notifier_phys_addr_invalidate(notifier); + } } if (intr_stat & HDMI_IH_PHY_STAT0_HPD) { @@ -2693,12 +2711,6 @@ __dw_hdmi_probe(struct platform_device *pdev, if (ret) goto err_iahb; - hdmi->cec_notifier = cec_notifier_get(dev); - if (!hdmi->cec_notifier) { - ret = -ENOMEM; - goto err_iahb; - } - /* * To prevent overflows in HDMI_IH_FC_STAT2, set the clk regenerator * N and cts values before enabling phy @@ -2796,9 +2808,6 @@ __dw_hdmi_probe(struct platform_device *pdev, hdmi->ddc = NULL; } - if (hdmi->cec_notifier) - cec_notifier_put(hdmi->cec_notifier); - clk_disable_unprepare(hdmi->iahb_clk); if (hdmi->cec_clk) clk_disable_unprepare(hdmi->cec_clk); @@ -2820,8 +2829,7 @@ static void __dw_hdmi_remove(struct dw_hdmi *hdmi) /* Disable all interrupts */ hdmi_writeb(hdmi, ~0, HDMI_IH_MUTE_PHY_STAT0); - if (hdmi->cec_notifier) - cec_notifier_put(hdmi->cec_notifier); + cec_notifier_conn_unregister(hdmi->cec_notifier); clk_disable_unprepare(hdmi->iahb_clk); clk_disable_unprepare(hdmi->isfr_clk); -- 2.23.0.rc1.153.gdeed80330f-goog