From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dariusz Marcinkiewicz Subject: [PATCH v6 4/8] drm: tda998x: use cec_notifier_conn_(un)register Date: Tue, 13 Aug 2019 13:02:36 +0200 Message-ID: <20190813110300.83025-5-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-qk1-x74a.google.com (mail-qk1-x74a.google.com [IPv6:2607:f8b0:4864:20::74a]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6F82389CD5 for ; Tue, 13 Aug 2019 11:03:59 +0000 (UTC) Received: by mail-qk1-x74a.google.com with SMTP id g125so8572049qkd.7 for ; Tue, 13 Aug 2019 04:03:59 -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: David Airlie , Dariusz Marcinkiewicz , Russell King , open list List-Id: dri-devel@lists.freedesktop.org VXNlIHRoZSBuZXcgY2VjX25vdGlmaWVyX2Nvbm5fKHVuKXJlZ2lzdGVyKCkgZnVuY3Rpb25zIHRv Cih1bilyZWdpc3RlciB0aGUgbm90aWZpZXIgZm9yIHRoZSBIRE1JIGNvbm5lY3RvciwgYW5kIGZp bGwKaW4gdGhlIGNlY19jb25uZWN0b3JfaW5mby4KCkNoYW5nZXMgc2luY2UgdjI6CgktIGNlY19u b3RpZmllcl9waHlzX2FkZHJfaW52YWxpZGF0ZSB3aGVyZSBhcHByb3ByaWF0ZSwKCS0gZG9uJ3Qg Y2hlY2sgZm9yIE5VTEwgbm90aWZpZXIgYmVmb3JlIGNhbGxpbmcKCWNlY19ub3RpZmllcl9jb25u X3VucmVnaXN0ZXIuCkNoYW5nZXMgc2luY2UgdjE6CglBZGQgbWVtb3J5IGJhcnJpZXIgdG8gbWFr ZSBzdXJlIHRoYXQgdGhlIG5vdGlmaWVyCgliZWNvbWVzIHZpc2libGUgdG8gdGhlIGlycSB0aHJl YWQgb25jZSBpdCBpcwoJZnVsbHkgY29uc3RydWN0ZWQuCgpTaWduZWQtb2ZmLWJ5OiBEYXJpdXN6 IE1hcmNpbmtpZXdpY3ogPGRhcmVrbUBnb29nbGUuY29tPgpUZXN0ZWQtYnk6IEhhbnMgVmVya3Vp bCA8aHZlcmt1aWwtY2lzY29AeHM0YWxsLm5sPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pMmMvdGRh OTk4eF9kcnYuYyB8IDMzICsrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0KIDEgZmlsZSBj aGFuZ2VkLCAyMyBpbnNlcnRpb25zKCspLCAxMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTJjL3RkYTk5OHhfZHJ2LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTJjL3Rk YTk5OHhfZHJ2LmMKaW5kZXggNjFlMDQyOTE4YTdmYy4uMTlhNjNlZTFiM2Y1MyAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2kyYy90ZGE5OTh4X2Rydi5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pMmMvdGRhOTk4eF9kcnYuYwpAQCAtODA0LDkgKzgwNCwxNCBAQCBzdGF0aWMgaXJxcmV0dXJu X3QgdGRhOTk4eF9pcnFfdGhyZWFkKGludCBpcnEsIHZvaWQgKmRhdGEpCiAJCQlpZiAobHZsICYg Q0VDX1JYU0hQRExFVl9IUEQpIHsKIAkJCQl0ZGE5OTh4X2VkaWRfZGVsYXlfc3RhcnQocHJpdik7 CiAJCQl9IGVsc2UgeworCQkJCXN0cnVjdCBjZWNfbm90aWZpZXIgKm5vdGlmeTsKKwogCQkJCXNj aGVkdWxlX3dvcmsoJnByaXYtPmRldGVjdF93b3JrKTsKLQkJCQljZWNfbm90aWZpZXJfc2V0X3Bo eXNfYWRkcihwcml2LT5jZWNfbm90aWZ5LAotCQkJCQkJICAgQ0VDX1BIWVNfQUREUl9JTlZBTElE KTsKKworCQkJCW5vdGlmeSA9IFJFQURfT05DRShwcml2LT5jZWNfbm90aWZ5KTsKKwkJCQlpZiAo bm90aWZ5KQorCQkJCQljZWNfbm90aWZpZXJfcGh5c19hZGRyX2ludmFsaWRhdGUoCisJCQkJCQkJ bm90aWZ5KTsKIAkJCX0KIAogCQkJaGFuZGxlZCA9IHRydWU7CkBAIC0xMzMxLDYgKzEzMzYsOCBA QCBzdGF0aWMgaW50IHRkYTk5OHhfY29ubmVjdG9yX2luaXQoc3RydWN0IHRkYTk5OHhfcHJpdiAq cHJpdiwKIAkJCQkgIHN0cnVjdCBkcm1fZGV2aWNlICpkcm0pCiB7CiAJc3RydWN0IGRybV9jb25u ZWN0b3IgKmNvbm5lY3RvciA9ICZwcml2LT5jb25uZWN0b3I7CisJc3RydWN0IGNlY19jb25uZWN0 b3JfaW5mbyBjb25uX2luZm87CisJc3RydWN0IGNlY19ub3RpZmllciAqbm90aWZpZXI7CiAJaW50 IHJldDsKIAogCWNvbm5lY3Rvci0+aW50ZXJsYWNlX2FsbG93ZWQgPSAxOwpAQCAtMTM0Nyw2ICsx MzU0LDE5IEBAIHN0YXRpYyBpbnQgdGRhOTk4eF9jb25uZWN0b3JfaW5pdChzdHJ1Y3QgdGRhOTk4 eF9wcml2ICpwcml2LAogCWlmIChyZXQpCiAJCXJldHVybiByZXQ7CiAKKwljZWNfZmlsbF9jb25u X2luZm9fZnJvbV9kcm0oJmNvbm5faW5mbywgY29ubmVjdG9yKTsKKworCW5vdGlmaWVyID0gY2Vj X25vdGlmaWVyX2Nvbm5fcmVnaXN0ZXIocHJpdi0+Y2VjX2dsdWUucGFyZW50LAorCQkJCQkgICAg ICBOVUxMLCAmY29ubl9pbmZvKTsKKwlpZiAoIW5vdGlmaWVyKQorCQlyZXR1cm4gLUVOT01FTTsK KwkvKgorCSAqIE1ha2Ugc3VyZSB0aGF0IHRkYTk5OHhfaXJxX3RocmVhZCBkb2VzIHNlZSB0aGUg bm90aWZpZXIKKwkgKiB3aGVuIGl0IGZ1bGx5IGNvbnN0cnVjdGVkLgorCSAqLworCXNtcF93bWIo KTsKKwlwcml2LT5jZWNfbm90aWZ5ID0gbm90aWZpZXI7CisKIAlkcm1fY29ubmVjdG9yX2F0dGFj aF9lbmNvZGVyKCZwcml2LT5jb25uZWN0b3IsCiAJCQkJICAgICBwcml2LT5icmlkZ2UuZW5jb2Rl cik7CiAKQEAgLTE3OTAsOCArMTgxMCw3IEBAIHN0YXRpYyB2b2lkIHRkYTk5OHhfZGVzdHJveShz dHJ1Y3QgZGV2aWNlICpkZXYpCiAKIAlpMmNfdW5yZWdpc3Rlcl9kZXZpY2UocHJpdi0+Y2VjKTsK IAotCWlmIChwcml2LT5jZWNfbm90aWZ5KQotCQljZWNfbm90aWZpZXJfcHV0KHByaXYtPmNlY19u b3RpZnkpOworCWNlY19ub3RpZmllcl9jb25uX3VucmVnaXN0ZXIocHJpdi0+Y2VjX25vdGlmeSk7 CiB9CiAKIHN0YXRpYyBpbnQgdGRhOTk4eF9jcmVhdGUoc3RydWN0IGRldmljZSAqZGV2KQpAQCAt MTkxNiwxMiArMTkzNSw2IEBAIHN0YXRpYyBpbnQgdGRhOTk4eF9jcmVhdGUoc3RydWN0IGRldmlj ZSAqZGV2KQogCQljZWNfd3JpdGUocHJpdiwgUkVHX0NFQ19SWFNIUERJTlRFTkEsIENFQ19SWFNI UERMRVZfSFBEKTsKIAl9CiAKLQlwcml2LT5jZWNfbm90aWZ5ID0gY2VjX25vdGlmaWVyX2dldChk ZXYpOwotCWlmICghcHJpdi0+Y2VjX25vdGlmeSkgewotCQlyZXQgPSAtRU5PTUVNOwotCQlnb3Rv IGZhaWw7Ci0JfQotCiAJcHJpdi0+Y2VjX2dsdWUucGFyZW50ID0gZGV2OwogCXByaXYtPmNlY19n bHVlLmRhdGEgPSBwcml2OwogCXByaXYtPmNlY19nbHVlLmluaXQgPSB0ZGE5OTh4X2NlY19ob29r X2luaXQ7Ci0tIAoyLjIzLjAucmMxLjE1My5nZGVlZDgwMzMwZi1nb29nCgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0 CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3Rv cC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWw= 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 3C304C433FF for ; Tue, 13 Aug 2019 11:04:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 124FE20840 for ; Tue, 13 Aug 2019 11:04:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="Ttc66cpb" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728604AbfHMLD7 (ORCPT ); Tue, 13 Aug 2019 07:03:59 -0400 Received: from mail-qk1-f201.google.com ([209.85.222.201]:43004 "EHLO mail-qk1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728601AbfHMLD7 (ORCPT ); Tue, 13 Aug 2019 07:03:59 -0400 Received: by mail-qk1-f201.google.com with SMTP id p18so22462849qke.9 for ; Tue, 13 Aug 2019 04:03:59 -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=6ulPqZWHu3buhcEJ9W+gaYDffj1X2raN/hmc1DXKRc0=; b=Ttc66cpbZ8f6IDLo5P+0wVxpvOL4SKVLSiOw7YHwSn/XuZU+OLaUtGoHRCorWkaat1 wHSH5LO9HUkbMelvZJAXTbIIKxlRuRGofTbc+1J1foxEeRj2qI4qwLsJ+rvqQnKOUhlh esxHHm3r1yTSn5NKYWJdmluPi4/GbmoggxvsZJ7FmgW3kcTO4WzXH1zjYAljxfoSQqWJ 0dwdWp+SksTGppNbhvwfEOHUPhbusR4sTcuYUCqyACzHhfGvzundOvP5iG7h3CHvfoWe C19TChEbFAxO0/uUA6NZOpJaJi5Dv54wbOd7YlTIWGPp/pAG/vYiwfnT1a1T5Oq173Mk v5pQ== 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=6ulPqZWHu3buhcEJ9W+gaYDffj1X2raN/hmc1DXKRc0=; b=QLYBGwZ51/aRj5ZbhFnMezVNWM7WXwzL0yWC90o6/ebLwsPoHDn9u87Gl0+B/b6l5x 5LJNQAFcUu3YPzFgRUebON9qfeXWKboH6x3lpIDYGmcwa3yIYqj87MGYCo7G0R0RM4cQ j3zfvFvSIfb48zdpChATbOWHUSbZ4HMr4VPdiImDeDNnAx9KRgPV7jpSLrl0yTSibjEn Wy+/jdLBo5YjKmoahDRKO6lbyxsY0Ahpy9XN8q4aBT947ISHhHPL/qXMfqyW25MxHoxU EBOkORJEctQEh6oo7vQ9mZRp/eFwjhd7yq49WW9Jr6iGGFM5C9/4pJuHja/1rY10Fich 8u/w== X-Gm-Message-State: APjAAAXWh66OxDnYptHb+TCfnvGFcpP5Em+TofHrQGbc3WGBWJvhzuNa ZXOYEHq5EXPAjAo2CYok53t+oInQqUY= X-Google-Smtp-Source: APXvYqzOEdfJlhU1SPtyfEAHwdXZr+UgnOS/BqJFVj/N8D9Hp9/fP0qqBoTZWcRHPQw91l6QDOyw/B0nzXU= X-Received: by 2002:ae9:df84:: with SMTP id t126mr30585905qkf.328.1565694238500; Tue, 13 Aug 2019 04:03:58 -0700 (PDT) Date: Tue, 13 Aug 2019 13:02:36 +0200 In-Reply-To: <20190813110300.83025-1-darekm@google.com> Message-Id: <20190813110300.83025-5-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 4/8] drm: tda998x: 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 , Russell King , David Airlie , Daniel Vetter , 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 v2: - cec_notifier_phys_addr_invalidate where appropriate, - don't check for NULL notifier before calling cec_notifier_conn_unregister. 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/i2c/tda998x_drv.c | 33 +++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/i2c/tda998x_drv.c b/drivers/gpu/drm/i2c/tda998x_drv.c index 61e042918a7fc..19a63ee1b3f53 100644 --- a/drivers/gpu/drm/i2c/tda998x_drv.c +++ b/drivers/gpu/drm/i2c/tda998x_drv.c @@ -804,9 +804,14 @@ static irqreturn_t tda998x_irq_thread(int irq, void *data) if (lvl & CEC_RXSHPDLEV_HPD) { tda998x_edid_delay_start(priv); } else { + struct cec_notifier *notify; + schedule_work(&priv->detect_work); - cec_notifier_set_phys_addr(priv->cec_notify, - CEC_PHYS_ADDR_INVALID); + + notify = READ_ONCE(priv->cec_notify); + if (notify) + cec_notifier_phys_addr_invalidate( + notify); } handled = true; @@ -1331,6 +1336,8 @@ static int tda998x_connector_init(struct tda998x_priv *priv, struct drm_device *drm) { struct drm_connector *connector = &priv->connector; + struct cec_connector_info conn_info; + struct cec_notifier *notifier; int ret; connector->interlace_allowed = 1; @@ -1347,6 +1354,19 @@ static int tda998x_connector_init(struct tda998x_priv *priv, if (ret) return ret; + cec_fill_conn_info_from_drm(&conn_info, connector); + + notifier = cec_notifier_conn_register(priv->cec_glue.parent, + NULL, &conn_info); + if (!notifier) + return -ENOMEM; + /* + * Make sure that tda998x_irq_thread does see the notifier + * when it fully constructed. + */ + smp_wmb(); + priv->cec_notify = notifier; + drm_connector_attach_encoder(&priv->connector, priv->bridge.encoder); @@ -1790,8 +1810,7 @@ static void tda998x_destroy(struct device *dev) i2c_unregister_device(priv->cec); - if (priv->cec_notify) - cec_notifier_put(priv->cec_notify); + cec_notifier_conn_unregister(priv->cec_notify); } static int tda998x_create(struct device *dev) @@ -1916,12 +1935,6 @@ static int tda998x_create(struct device *dev) cec_write(priv, REG_CEC_RXSHPDINTENA, CEC_RXSHPDLEV_HPD); } - priv->cec_notify = cec_notifier_get(dev); - if (!priv->cec_notify) { - ret = -ENOMEM; - goto fail; - } - priv->cec_glue.parent = dev; priv->cec_glue.data = priv; priv->cec_glue.init = tda998x_cec_hook_init; -- 2.23.0.rc1.153.gdeed80330f-goog