From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from lb3-smtp-cloud2.xs4all.net ([194.109.24.29]:60769 "EHLO lb3-smtp-cloud2.xs4all.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752512AbdCaMUt (ORCPT ); Fri, 31 Mar 2017 08:20:49 -0400 From: Hans Verkuil To: linux-media@vger.kernel.org Cc: Daniel Vetter , Russell King , dri-devel@lists.freedesktop.org, linux-samsung-soc@vger.kernel.org, Krzysztof Kozlowski , Inki Dae , Marek Szyprowski , Javier Martinez Canillas , Benjamin Gaignard , Patrice.chotard@st.com, Hans Verkuil Subject: [PATCHv6 02/10] cec: integrate CEC notifier support Date: Fri, 31 Mar 2017 14:20:28 +0200 Message-Id: <20170331122036.55706-3-hverkuil@xs4all.nl> In-Reply-To: <20170331122036.55706-1-hverkuil@xs4all.nl> References: <20170331122036.55706-1-hverkuil@xs4all.nl> Sender: linux-media-owner@vger.kernel.org List-ID: From: Hans Verkuil Support the CEC notifier framework, simplifying drivers that depend on this. Signed-off-by: Hans Verkuil Tested-by: Marek Szyprowski Tested-by: Benjamin Gaignard Acked-by: Daniel Vetter --- drivers/media/cec/cec-core.c | 22 ++++++++++++++++++++++ include/media/cec.h | 10 ++++++++++ 2 files changed, 32 insertions(+) diff --git a/drivers/media/cec/cec-core.c b/drivers/media/cec/cec-core.c index 37217e205040..e5070b374276 100644 --- a/drivers/media/cec/cec-core.c +++ b/drivers/media/cec/cec-core.c @@ -195,6 +195,24 @@ static void cec_devnode_unregister(struct cec_devnode *devnode) put_device(&devnode->dev); } +#ifdef CONFIG_MEDIA_CEC_NOTIFIER +static void cec_cec_notify(struct cec_adapter *adap, u16 pa) +{ + cec_s_phys_addr(adap, pa, false); +} + +void cec_register_cec_notifier(struct cec_adapter *adap, + struct cec_notifier *notifier) +{ + if (WARN_ON(!adap->devnode.registered)) + return; + + adap->notifier = notifier; + cec_notifier_register(adap->notifier, adap, cec_cec_notify); +} +EXPORT_SYMBOL_GPL(cec_register_cec_notifier); +#endif + struct cec_adapter *cec_allocate_adapter(const struct cec_adap_ops *ops, void *priv, const char *name, u32 caps, u8 available_las) @@ -343,6 +361,10 @@ void cec_unregister_adapter(struct cec_adapter *adap) adap->rc = NULL; #endif debugfs_remove_recursive(adap->cec_dir); +#ifdef CONFIG_MEDIA_CEC_NOTIFIER + if (adap->notifier) + cec_notifier_unregister(adap->notifier); +#endif cec_devnode_unregister(&adap->devnode); } EXPORT_SYMBOL_GPL(cec_unregister_adapter); diff --git a/include/media/cec.h b/include/media/cec.h index 96a0aa770d61..307f5dcaf034 100644 --- a/include/media/cec.h +++ b/include/media/cec.h @@ -30,6 +30,7 @@ #include #include #include +#include /** * struct cec_devnode - cec device node @@ -173,6 +174,10 @@ struct cec_adapter { bool passthrough; struct cec_log_addrs log_addrs; +#ifdef CONFIG_MEDIA_CEC_NOTIFIER + struct cec_notifier *notifier; +#endif + struct dentry *cec_dir; struct dentry *status_file; @@ -213,6 +218,11 @@ void cec_transmit_done(struct cec_adapter *adap, u8 status, u8 arb_lost_cnt, u8 nack_cnt, u8 low_drive_cnt, u8 error_cnt); void cec_received_msg(struct cec_adapter *adap, struct cec_msg *msg); +#ifdef CONFIG_MEDIA_CEC_NOTIFIER +void cec_register_cec_notifier(struct cec_adapter *adap, + struct cec_notifier *notifier); +#endif + #else static inline int cec_register_adapter(struct cec_adapter *adap, -- 2.11.0 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Hans Verkuil Subject: [PATCHv6 02/10] cec: integrate CEC notifier support Date: Fri, 31 Mar 2017 14:20:28 +0200 Message-ID: <20170331122036.55706-3-hverkuil@xs4all.nl> References: <20170331122036.55706-1-hverkuil@xs4all.nl> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170331122036.55706-1-hverkuil@xs4all.nl> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: linux-media@vger.kernel.org Cc: linux-samsung-soc@vger.kernel.org, Russell King , Krzysztof Kozlowski , Patrice.chotard@st.com, Javier Martinez Canillas , Hans Verkuil , dri-devel@lists.freedesktop.org, Daniel Vetter , Marek Szyprowski List-Id: linux-samsung-soc@vger.kernel.org RnJvbTogSGFucyBWZXJrdWlsIDxoYW5zLnZlcmt1aWxAY2lzY28uY29tPgoKU3VwcG9ydCB0aGUg Q0VDIG5vdGlmaWVyIGZyYW1ld29yaywgc2ltcGxpZnlpbmcgZHJpdmVycyB0aGF0CmRlcGVuZCBv biB0aGlzLgoKU2lnbmVkLW9mZi1ieTogSGFucyBWZXJrdWlsIDxoYW5zLnZlcmt1aWxAY2lzY28u Y29tPgpUZXN0ZWQtYnk6IE1hcmVrIFN6eXByb3dza2kgPG0uc3p5cHJvd3NraUBzYW1zdW5nLmNv bT4KVGVzdGVkLWJ5OiBCZW5qYW1pbiBHYWlnbmFyZCA8YmVuamFtaW4uZ2FpZ25hcmRAbGluYXJv Lm9yZz4KQWNrZWQtYnk6IERhbmllbCBWZXR0ZXIgPGRhbmllbC52ZXR0ZXJAZmZ3bGwuY2g+Ci0t LQogZHJpdmVycy9tZWRpYS9jZWMvY2VjLWNvcmUuYyB8IDIyICsrKysrKysrKysrKysrKysrKysr KysKIGluY2x1ZGUvbWVkaWEvY2VjLmggICAgICAgICAgfCAxMCArKysrKysrKysrCiAyIGZpbGVz IGNoYW5nZWQsIDMyIGluc2VydGlvbnMoKykKCmRpZmYgLS1naXQgYS9kcml2ZXJzL21lZGlhL2Nl Yy9jZWMtY29yZS5jIGIvZHJpdmVycy9tZWRpYS9jZWMvY2VjLWNvcmUuYwppbmRleCAzNzIxN2Uy MDUwNDAuLmU1MDcwYjM3NDI3NiAxMDA2NDQKLS0tIGEvZHJpdmVycy9tZWRpYS9jZWMvY2VjLWNv cmUuYworKysgYi9kcml2ZXJzL21lZGlhL2NlYy9jZWMtY29yZS5jCkBAIC0xOTUsNiArMTk1LDI0 IEBAIHN0YXRpYyB2b2lkIGNlY19kZXZub2RlX3VucmVnaXN0ZXIoc3RydWN0IGNlY19kZXZub2Rl ICpkZXZub2RlKQogCXB1dF9kZXZpY2UoJmRldm5vZGUtPmRldik7CiB9CiAKKyNpZmRlZiBDT05G SUdfTUVESUFfQ0VDX05PVElGSUVSCitzdGF0aWMgdm9pZCBjZWNfY2VjX25vdGlmeShzdHJ1Y3Qg Y2VjX2FkYXB0ZXIgKmFkYXAsIHUxNiBwYSkKK3sKKwljZWNfc19waHlzX2FkZHIoYWRhcCwgcGEs IGZhbHNlKTsKK30KKwordm9pZCBjZWNfcmVnaXN0ZXJfY2VjX25vdGlmaWVyKHN0cnVjdCBjZWNf YWRhcHRlciAqYWRhcCwKKwkJCSAgICAgICBzdHJ1Y3QgY2VjX25vdGlmaWVyICpub3RpZmllcikK K3sKKwlpZiAoV0FSTl9PTighYWRhcC0+ZGV2bm9kZS5yZWdpc3RlcmVkKSkKKwkJcmV0dXJuOwor CisJYWRhcC0+bm90aWZpZXIgPSBub3RpZmllcjsKKwljZWNfbm90aWZpZXJfcmVnaXN0ZXIoYWRh cC0+bm90aWZpZXIsIGFkYXAsIGNlY19jZWNfbm90aWZ5KTsKK30KK0VYUE9SVF9TWU1CT0xfR1BM KGNlY19yZWdpc3Rlcl9jZWNfbm90aWZpZXIpOworI2VuZGlmCisKIHN0cnVjdCBjZWNfYWRhcHRl ciAqY2VjX2FsbG9jYXRlX2FkYXB0ZXIoY29uc3Qgc3RydWN0IGNlY19hZGFwX29wcyAqb3BzLAog CQkJCQkgdm9pZCAqcHJpdiwgY29uc3QgY2hhciAqbmFtZSwgdTMyIGNhcHMsCiAJCQkJCSB1OCBh dmFpbGFibGVfbGFzKQpAQCAtMzQzLDYgKzM2MSwxMCBAQCB2b2lkIGNlY191bnJlZ2lzdGVyX2Fk YXB0ZXIoc3RydWN0IGNlY19hZGFwdGVyICphZGFwKQogCWFkYXAtPnJjID0gTlVMTDsKICNlbmRp ZgogCWRlYnVnZnNfcmVtb3ZlX3JlY3Vyc2l2ZShhZGFwLT5jZWNfZGlyKTsKKyNpZmRlZiBDT05G SUdfTUVESUFfQ0VDX05PVElGSUVSCisJaWYgKGFkYXAtPm5vdGlmaWVyKQorCQljZWNfbm90aWZp ZXJfdW5yZWdpc3RlcihhZGFwLT5ub3RpZmllcik7CisjZW5kaWYKIAljZWNfZGV2bm9kZV91bnJl Z2lzdGVyKCZhZGFwLT5kZXZub2RlKTsKIH0KIEVYUE9SVF9TWU1CT0xfR1BMKGNlY191bnJlZ2lz dGVyX2FkYXB0ZXIpOwpkaWZmIC0tZ2l0IGEvaW5jbHVkZS9tZWRpYS9jZWMuaCBiL2luY2x1ZGUv bWVkaWEvY2VjLmgKaW5kZXggOTZhMGFhNzcwZDYxLi4zMDdmNWRjYWYwMzQgMTAwNjQ0Ci0tLSBh L2luY2x1ZGUvbWVkaWEvY2VjLmgKKysrIGIvaW5jbHVkZS9tZWRpYS9jZWMuaApAQCAtMzAsNiAr MzAsNyBAQAogI2luY2x1ZGUgPGxpbnV4L2NlYy1mdW5jcy5oPgogI2luY2x1ZGUgPG1lZGlhL3Jj LWNvcmUuaD4KICNpbmNsdWRlIDxtZWRpYS9jZWMtZWRpZC5oPgorI2luY2x1ZGUgPG1lZGlhL2Nl Yy1ub3RpZmllci5oPgogCiAvKioKICAqIHN0cnVjdCBjZWNfZGV2bm9kZSAtIGNlYyBkZXZpY2Ug bm9kZQpAQCAtMTczLDYgKzE3NCwxMCBAQCBzdHJ1Y3QgY2VjX2FkYXB0ZXIgewogCWJvb2wgcGFz c3Rocm91Z2g7CiAJc3RydWN0IGNlY19sb2dfYWRkcnMgbG9nX2FkZHJzOwogCisjaWZkZWYgQ09O RklHX01FRElBX0NFQ19OT1RJRklFUgorCXN0cnVjdCBjZWNfbm90aWZpZXIgKm5vdGlmaWVyOwor I2VuZGlmCisKIAlzdHJ1Y3QgZGVudHJ5ICpjZWNfZGlyOwogCXN0cnVjdCBkZW50cnkgKnN0YXR1 c19maWxlOwogCkBAIC0yMTMsNiArMjE4LDExIEBAIHZvaWQgY2VjX3RyYW5zbWl0X2RvbmUoc3Ry dWN0IGNlY19hZGFwdGVyICphZGFwLCB1OCBzdGF0dXMsIHU4IGFyYl9sb3N0X2NudCwKIAkJICAg ICAgIHU4IG5hY2tfY250LCB1OCBsb3dfZHJpdmVfY250LCB1OCBlcnJvcl9jbnQpOwogdm9pZCBj ZWNfcmVjZWl2ZWRfbXNnKHN0cnVjdCBjZWNfYWRhcHRlciAqYWRhcCwgc3RydWN0IGNlY19tc2cg Km1zZyk7CiAKKyNpZmRlZiBDT05GSUdfTUVESUFfQ0VDX05PVElGSUVSCit2b2lkIGNlY19yZWdp c3Rlcl9jZWNfbm90aWZpZXIoc3RydWN0IGNlY19hZGFwdGVyICphZGFwLAorCQkJICAgICAgIHN0 cnVjdCBjZWNfbm90aWZpZXIgKm5vdGlmaWVyKTsKKyNlbmRpZgorCiAjZWxzZQogCiBzdGF0aWMg aW5saW5lIGludCBjZWNfcmVnaXN0ZXJfYWRhcHRlcihzdHJ1Y3QgY2VjX2FkYXB0ZXIgKmFkYXAs Ci0tIAoyLjExLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9y ZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZl bAo=