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=-8.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT 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 8FB55C43613 for ; Mon, 24 Jun 2019 16:03:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 724FC20449 for ; Mon, 24 Jun 2019 16:03:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731499AbfFXQDp (ORCPT ); Mon, 24 Jun 2019 12:03:45 -0400 Received: from lb1-smtp-cloud7.xs4all.net ([194.109.24.24]:35507 "EHLO lb1-smtp-cloud7.xs4all.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729496AbfFXQDm (ORCPT ); Mon, 24 Jun 2019 12:03:42 -0400 Received: from tschai.fritz.box ([46.9.252.75]) by smtp-cloud7.xs4all.net with ESMTPA id fRRKhHRxHF85OfRRVhZacp; Mon, 24 Jun 2019 18:03:41 +0200 From: Hans Verkuil To: linux-media@vger.kernel.org Cc: Dariusz Marcinkiewicz , dri-devel@lists.freedesktop.org, Cheng-yi Chiang , Hans Verkuil Subject: [PATCHv8 13/13] drm/vc4/vc4_hdmi: fill in connector info Date: Mon, 24 Jun 2019 18:03:30 +0200 Message-Id: <20190624160330.38048-14-hverkuil-cisco@xs4all.nl> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190624160330.38048-1-hverkuil-cisco@xs4all.nl> References: <20190624160330.38048-1-hverkuil-cisco@xs4all.nl> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CMAE-Envelope: MS4wfOIEYMngRDIwgK74lnlvOXIt+9xy5ZfdkyY50fEwdUfHLW3a6HQUX9qOjaoewFZqmrrw97CMmILYvYcruHFXffRTdMS8h1EKdAXjyCM+KJiPP3i3kA/l qbLIqY3uC0qPtLV/o7kL0awPNFc9OKys1ntf6O23b4W7fj04WjYHw2DGvGepT6Wik/vmWq4BwiW315yaB2gGUOKXRc8N0MHw9k57P8wa91Rnj6J8J37y2RfB SONLuSvtwaGLT4XJDRjRQQmP0X9/oh3fYjonz8QEg5cTYANXwxJc9mU2sj2fXQYYNde+ac6na/uTLAwU7nBVKiVT2g5DREcVczC7BpIllgQ= Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org From: Dariusz Marcinkiewicz Fill in the connector info, allowing userspace to associate the CEC device with the drm connector. Signed-off-by: Dariusz Marcinkiewicz Signed-off-by: Hans Verkuil --- drivers/gpu/drm/vc4/vc4_hdmi.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c index 99fc8569e0f5..a998bb35b375 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -1279,6 +1279,9 @@ static const struct cec_adap_ops vc4_hdmi_cec_adap_ops = { static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) { +#ifdef CONFIG_DRM_VC4_HDMI_CEC + struct cec_connector_info conn_info; +#endif struct platform_device *pdev = to_platform_device(dev); struct drm_device *drm = dev_get_drvdata(master); struct vc4_dev *vc4 = drm->dev_private; @@ -1397,13 +1400,15 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) #ifdef CONFIG_DRM_VC4_HDMI_CEC hdmi->cec_adap = cec_allocate_adapter(&vc4_hdmi_cec_adap_ops, vc4, "vc4", - CEC_CAP_TRANSMIT | - CEC_CAP_LOG_ADDRS | - CEC_CAP_PASSTHROUGH | - CEC_CAP_RC, 1); + CEC_CAP_DEFAULTS | + CEC_CAP_CONNECTOR_INFO, 1); ret = PTR_ERR_OR_ZERO(hdmi->cec_adap); if (ret < 0) goto err_destroy_conn; + + cec_fill_conn_info_from_drm(&conn_info, hdmi->connector); + cec_s_conn_info(hdmi->cec_adap, &conn_info); + HDMI_WRITE(VC4_HDMI_CPU_MASK_SET, 0xffffffff); value = HDMI_READ(VC4_HDMI_CEC_CNTRL_1); value &= ~VC4_HDMI_CEC_DIV_CLK_CNT_MASK; -- 2.20.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Hans Verkuil Subject: [PATCHv8 13/13] drm/vc4/vc4_hdmi: fill in connector info Date: Mon, 24 Jun 2019 18:03:30 +0200 Message-ID: <20190624160330.38048-14-hverkuil-cisco@xs4all.nl> References: <20190624160330.38048-1-hverkuil-cisco@xs4all.nl> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from lb1-smtp-cloud7.xs4all.net (lb1-smtp-cloud7.xs4all.net [194.109.24.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 53E9289CD3 for ; Mon, 24 Jun 2019 16:10:47 +0000 (UTC) In-Reply-To: <20190624160330.38048-1-hverkuil-cisco@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: Hans Verkuil , Dariusz Marcinkiewicz , dri-devel@lists.freedesktop.org, Cheng-yi Chiang List-Id: dri-devel@lists.freedesktop.org RnJvbTogRGFyaXVzeiBNYXJjaW5raWV3aWN6IDxkYXJla21AZ29vZ2xlLmNvbT4KCkZpbGwgaW4g dGhlIGNvbm5lY3RvciBpbmZvLCBhbGxvd2luZyB1c2Vyc3BhY2UgdG8gYXNzb2NpYXRlCnRoZSBD RUMgZGV2aWNlIHdpdGggdGhlIGRybSBjb25uZWN0b3IuCgpTaWduZWQtb2ZmLWJ5OiBEYXJpdXN6 IE1hcmNpbmtpZXdpY3ogPGRhcmVrbUBnb29nbGUuY29tPgpTaWduZWQtb2ZmLWJ5OiBIYW5zIFZl cmt1aWwgPGh2ZXJrdWlsLWNpc2NvQHhzNGFsbC5ubD4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vdmM0 L3ZjNF9oZG1pLmMgfCAxMyArKysrKysrKystLS0tCiAxIGZpbGUgY2hhbmdlZCwgOSBpbnNlcnRp b25zKCspLCA0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS92YzQv dmM0X2hkbWkuYyBiL2RyaXZlcnMvZ3B1L2RybS92YzQvdmM0X2hkbWkuYwppbmRleCA5OWZjODU2 OWUwZjUuLmE5OThiYjM1YjM3NSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3ZjNC92YzRf aGRtaS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS92YzQvdmM0X2hkbWkuYwpAQCAtMTI3OSw2ICsx Mjc5LDkgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBjZWNfYWRhcF9vcHMgdmM0X2hkbWlfY2VjX2Fk YXBfb3BzID0gewogCiBzdGF0aWMgaW50IHZjNF9oZG1pX2JpbmQoc3RydWN0IGRldmljZSAqZGV2 LCBzdHJ1Y3QgZGV2aWNlICptYXN0ZXIsIHZvaWQgKmRhdGEpCiB7CisjaWZkZWYgQ09ORklHX0RS TV9WQzRfSERNSV9DRUMKKwlzdHJ1Y3QgY2VjX2Nvbm5lY3Rvcl9pbmZvIGNvbm5faW5mbzsKKyNl bmRpZgogCXN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYgPSB0b19wbGF0Zm9ybV9kZXZpY2Uo ZGV2KTsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZHJtID0gZGV2X2dldF9kcnZkYXRhKG1hc3Rlcik7 CiAJc3RydWN0IHZjNF9kZXYgKnZjNCA9IGRybS0+ZGV2X3ByaXZhdGU7CkBAIC0xMzk3LDEzICsx NDAwLDE1IEBAIHN0YXRpYyBpbnQgdmM0X2hkbWlfYmluZChzdHJ1Y3QgZGV2aWNlICpkZXYsIHN0 cnVjdCBkZXZpY2UgKm1hc3Rlciwgdm9pZCAqZGF0YSkKICNpZmRlZiBDT05GSUdfRFJNX1ZDNF9I RE1JX0NFQwogCWhkbWktPmNlY19hZGFwID0gY2VjX2FsbG9jYXRlX2FkYXB0ZXIoJnZjNF9oZG1p X2NlY19hZGFwX29wcywKIAkJCQkJICAgICAgdmM0LCAidmM0IiwKLQkJCQkJICAgICAgQ0VDX0NB UF9UUkFOU01JVCB8Ci0JCQkJCSAgICAgIENFQ19DQVBfTE9HX0FERFJTIHwKLQkJCQkJICAgICAg Q0VDX0NBUF9QQVNTVEhST1VHSCB8Ci0JCQkJCSAgICAgIENFQ19DQVBfUkMsIDEpOworCQkJCQkg ICAgICBDRUNfQ0FQX0RFRkFVTFRTIHwKKwkJCQkJICAgICAgQ0VDX0NBUF9DT05ORUNUT1JfSU5G TywgMSk7CiAJcmV0ID0gUFRSX0VSUl9PUl9aRVJPKGhkbWktPmNlY19hZGFwKTsKIAlpZiAocmV0 IDwgMCkKIAkJZ290byBlcnJfZGVzdHJveV9jb25uOworCisJY2VjX2ZpbGxfY29ubl9pbmZvX2Zy b21fZHJtKCZjb25uX2luZm8sIGhkbWktPmNvbm5lY3Rvcik7CisJY2VjX3NfY29ubl9pbmZvKGhk bWktPmNlY19hZGFwLCAmY29ubl9pbmZvKTsKKwogCUhETUlfV1JJVEUoVkM0X0hETUlfQ1BVX01B U0tfU0VULCAweGZmZmZmZmZmKTsKIAl2YWx1ZSA9IEhETUlfUkVBRChWQzRfSERNSV9DRUNfQ05U UkxfMSk7CiAJdmFsdWUgJj0gflZDNF9IRE1JX0NFQ19ESVZfQ0xLX0NOVF9NQVNLOwotLSAKMi4y MC4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmkt ZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6 Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWw=