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.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=unavailable 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 EB62DC3A5A5 for ; Mon, 26 Aug 2019 09:00:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C0CE5206BA for ; Mon, 26 Aug 2019 09:00:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730539AbfHZJAQ (ORCPT ); Mon, 26 Aug 2019 05:00:16 -0400 Received: from lb1-smtp-cloud9.xs4all.net ([194.109.24.22]:46535 "EHLO lb1-smtp-cloud9.xs4all.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729802AbfHZJAP (ORCPT ); Mon, 26 Aug 2019 05:00:15 -0400 Received: from [IPv6:2001:983:e9a7:1:3421:ddcd:2260:77e4] ([IPv6:2001:983:e9a7:1:3421:ddcd:2260:77e4]) by smtp-cloud9.xs4all.net with ESMTPA id 2ArCiuofrzaKO2ArDiEEqR; Mon, 26 Aug 2019 11:00:12 +0200 Subject: Re: [PATCH v7 1/9] drm_dp_cec: add connector info support. From: Hans Verkuil To: Dariusz Marcinkiewicz , dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org Cc: Maxime Ripard , Thomas Lim , David Airlie , nouveau@lists.freedesktop.org, David Francis , linux-kernel@vger.kernel.org, amd-gfx@lists.freedesktop.org, =?UTF-8?Q?Christian_K=c3=b6nig?= , Manasi Navare , Leo Li , "Jerry (Fangzhi) Zuo" , Dhinakaran Pandiyan , Rodrigo Vivi , Alex Deucher , Sean Paul , Anthony Koo , intel-gfx@lists.freedesktop.org, Ben Skeggs , Daniel Vetter References: <20190814104520.6001-1-darekm@google.com> <20190814104520.6001-2-darekm@google.com> <38cda4f5-3299-2bd4-65f5-9a0f948902c6@xs4all.nl> Message-ID: <9762df98-af9c-101e-ebbd-1f1bc40d8be9@xs4all.nl> Date: Mon, 26 Aug 2019 11:00:10 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: <38cda4f5-3299-2bd4-65f5-9a0f948902c6@xs4all.nl> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-CMAE-Envelope: MS4wfAzBdsNLgei65c7on5zLQ5dchv/l6vv+3RZYY+XmvmYyXsyM613t0EkGVJjilx705KohNRcaViIo9Pnao1TAZ8YAi0LbUFDHA921qjZwYHqHpFJ1xPBM VvZVXCANDmHfoQXee47MIrqBnDtlgduScufV0F4mw1u0C8qb9tPhfkolLBcMaMJfw8I30YaMQdNYo+ce3F9aqmvpqOWakYS8nVa+Ptw3WuyAfVSf59/4jI65 KBUTz3pMw12Qc61d4FYcg2Xe7K69/tim/NhuQazd6wllYopNPtspmaOkGdiG8cE0xswxcYXXKWoCRfFn0Gg/BVHn9zcTnJu4je4LxnDIILdr/EhhrlhHhdWl L5Thu54l/8POCEa/ug7bvMqpUOgVSPzkt9r7mNUrydGTARxxwcdMs5y3XJOiiEySf9gcPSfIbJZNspYf9qNfEVTUbQdUiCsUpV/hM9TrmrCokHhdScjmWQax F6jzy59NwzPRgpzNkHuZruPXbGtUX90ywD1P150jz/CaexalZTgMVVmDMRcFWtclmRmd0qjpQwSkRBHy3sCPMZvdo7GQHGN4z/IB7Ql1Bt4eAZKbP/oyLmYF KZct2B3J62DaMhXdSlSpjlva2b3cTt7Xdx+p+oYQR3oj1K+A4xpKGC1Vhn738PbcQQK2nDHoxniSxLKNW66o5kpE4PghwHZMKZrtvp0LFOGz0RHbnStGxmGT JiCbh+PqhoVHYepCQQ9bJFhccr6MpxPmA2Y5r4PfrAd6qZZMHmmsh9Xixpx5V9LvFRX0AbWd9mg7uH0AwfFrv6CMR034gvn2vcez0p9z7vfWl5xuNCjZQwub bTbP6BwDesnY7IP9SGzMVOscfrmbHn0kSKU+kqy0zsvkpOVd5bmP38I9nmhbIX4BKx6/GSGpOifE6eS0rSbJPTe7H/bTNrpy0x7McHB9dhcu6kUiEda0AXLP Mdkb6DPJOdEVl7m0pLvq1Bik8XjFakTT4Kt9FoNZsdpL8FKi8+Xe6WcXtnNPJQNgRjzJ1c8fQ7eVEySsJuP7xGD0VYk= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 8/22/19 10:08 AM, Hans Verkuil wrote: > Alex, Ville/Rodrigo, Ben, > > Can you (hopefully) Ack this patch so that I can merge it? Ping! Regards, Hans > > Thank you! > > Hans > > On 8/14/19 12:44 PM, Dariusz Marcinkiewicz wrote: >> Pass the connector info to the CEC adapter. This makes it possible >> to associate the CEC adapter with the corresponding drm connector. >> >> Signed-off-by: Dariusz Marcinkiewicz >> Signed-off-by: Hans Verkuil >> Tested-by: Hans Verkuil >> --- >> .../display/amdgpu_dm/amdgpu_dm_mst_types.c | 2 +- >> drivers/gpu/drm/drm_dp_cec.c | 25 ++++++++++++------- >> drivers/gpu/drm/i915/display/intel_dp.c | 4 +-- >> drivers/gpu/drm/nouveau/nouveau_connector.c | 3 +-- >> include/drm/drm_dp_helper.h | 17 ++++++------- >> 5 files changed, 27 insertions(+), 24 deletions(-) >> >> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c >> index 16218a202b591..5ec14efd4d8cb 100644 >> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c >> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c >> @@ -416,7 +416,7 @@ void amdgpu_dm_initialize_dp_connector(struct amdgpu_display_manager *dm, >> >> drm_dp_aux_register(&aconnector->dm_dp_aux.aux); >> drm_dp_cec_register_connector(&aconnector->dm_dp_aux.aux, >> - aconnector->base.name, dm->adev->dev); >> + &aconnector->base); >> aconnector->mst_mgr.cbs = &dm_mst_cbs; >> drm_dp_mst_topology_mgr_init( >> &aconnector->mst_mgr, >> diff --git a/drivers/gpu/drm/drm_dp_cec.c b/drivers/gpu/drm/drm_dp_cec.c >> index b15cee85b702b..b457c16c3a8bb 100644 >> --- a/drivers/gpu/drm/drm_dp_cec.c >> +++ b/drivers/gpu/drm/drm_dp_cec.c >> @@ -8,7 +8,9 @@ >> #include >> #include >> #include >> +#include >> #include >> +#include >> #include >> >> /* >> @@ -295,7 +297,10 @@ static void drm_dp_cec_unregister_work(struct work_struct *work) >> */ >> void drm_dp_cec_set_edid(struct drm_dp_aux *aux, const struct edid *edid) >> { >> - u32 cec_caps = CEC_CAP_DEFAULTS | CEC_CAP_NEEDS_HPD; >> + struct drm_connector *connector = aux->cec.connector; >> + u32 cec_caps = CEC_CAP_DEFAULTS | CEC_CAP_NEEDS_HPD | >> + CEC_CAP_CONNECTOR_INFO; >> + struct cec_connector_info conn_info; >> unsigned int num_las = 1; >> u8 cap; >> >> @@ -344,13 +349,17 @@ void drm_dp_cec_set_edid(struct drm_dp_aux *aux, const struct edid *edid) >> >> /* Create a new adapter */ >> aux->cec.adap = cec_allocate_adapter(&drm_dp_cec_adap_ops, >> - aux, aux->cec.name, cec_caps, >> + aux, connector->name, cec_caps, >> num_las); >> if (IS_ERR(aux->cec.adap)) { >> aux->cec.adap = NULL; >> goto unlock; >> } >> - if (cec_register_adapter(aux->cec.adap, aux->cec.parent)) { >> + >> + cec_fill_conn_info_from_drm(&conn_info, connector); >> + cec_s_conn_info(aux->cec.adap, &conn_info); >> + >> + if (cec_register_adapter(aux->cec.adap, connector->dev->dev)) { >> cec_delete_adapter(aux->cec.adap); >> aux->cec.adap = NULL; >> } else { >> @@ -406,22 +415,20 @@ EXPORT_SYMBOL(drm_dp_cec_unset_edid); >> /** >> * drm_dp_cec_register_connector() - register a new connector >> * @aux: DisplayPort AUX channel >> - * @name: name of the CEC device >> - * @parent: parent device >> + * @connector: drm connector >> * >> * A new connector was registered with associated CEC adapter name and >> * CEC adapter parent device. After registering the name and parent >> * drm_dp_cec_set_edid() is called to check if the connector supports >> * CEC and to register a CEC adapter if that is the case. >> */ >> -void drm_dp_cec_register_connector(struct drm_dp_aux *aux, const char *name, >> - struct device *parent) >> +void drm_dp_cec_register_connector(struct drm_dp_aux *aux, >> + struct drm_connector *connector) >> { >> WARN_ON(aux->cec.adap); >> if (WARN_ON(!aux->transfer)) >> return; >> - aux->cec.name = name; >> - aux->cec.parent = parent; >> + aux->cec.connector = connector; >> INIT_DELAYED_WORK(&aux->cec.unregister_work, >> drm_dp_cec_unregister_work); >> } >> diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c >> index 1092499115760..de2486fe7bf2d 100644 >> --- a/drivers/gpu/drm/i915/display/intel_dp.c >> +++ b/drivers/gpu/drm/i915/display/intel_dp.c >> @@ -5497,7 +5497,6 @@ static int >> intel_dp_connector_register(struct drm_connector *connector) >> { >> struct intel_dp *intel_dp = intel_attached_dp(connector); >> - struct drm_device *dev = connector->dev; >> int ret; >> >> ret = intel_connector_register(connector); >> @@ -5512,8 +5511,7 @@ intel_dp_connector_register(struct drm_connector *connector) >> intel_dp->aux.dev = connector->kdev; >> ret = drm_dp_aux_register(&intel_dp->aux); >> if (!ret) >> - drm_dp_cec_register_connector(&intel_dp->aux, >> - connector->name, dev->dev); >> + drm_dp_cec_register_connector(&intel_dp->aux, connector); >> return ret; >> } >> >> diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c >> index 330d7d29a6e34..8aa703347eb54 100644 >> --- a/drivers/gpu/drm/nouveau/nouveau_connector.c >> +++ b/drivers/gpu/drm/nouveau/nouveau_connector.c >> @@ -1416,8 +1416,7 @@ nouveau_connector_create(struct drm_device *dev, >> switch (type) { >> case DRM_MODE_CONNECTOR_DisplayPort: >> case DRM_MODE_CONNECTOR_eDP: >> - drm_dp_cec_register_connector(&nv_connector->aux, >> - connector->name, dev->dev); >> + drm_dp_cec_register_connector(&nv_connector->aux, connector); >> break; >> } >> >> diff --git a/include/drm/drm_dp_helper.h b/include/drm/drm_dp_helper.h >> index 8364502f92cfe..7972b925a952b 100644 >> --- a/include/drm/drm_dp_helper.h >> +++ b/include/drm/drm_dp_helper.h >> @@ -1230,20 +1230,19 @@ struct drm_dp_aux_msg { >> >> struct cec_adapter; >> struct edid; >> +struct drm_connector; >> >> /** >> * struct drm_dp_aux_cec - DisplayPort CEC-Tunneling-over-AUX >> * @lock: mutex protecting this struct >> * @adap: the CEC adapter for CEC-Tunneling-over-AUX support. >> - * @name: name of the CEC adapter >> - * @parent: parent device of the CEC adapter >> + * @connector: the connector this CEC adapter is associated with >> * @unregister_work: unregister the CEC adapter >> */ >> struct drm_dp_aux_cec { >> struct mutex lock; >> struct cec_adapter *adap; >> - const char *name; >> - struct device *parent; >> + struct drm_connector *connector; >> struct delayed_work unregister_work; >> }; >> >> @@ -1451,8 +1450,8 @@ drm_dp_has_quirk(const struct drm_dp_desc *desc, enum drm_dp_quirk quirk) >> >> #ifdef CONFIG_DRM_DP_CEC >> void drm_dp_cec_irq(struct drm_dp_aux *aux); >> -void drm_dp_cec_register_connector(struct drm_dp_aux *aux, const char *name, >> - struct device *parent); >> +void drm_dp_cec_register_connector(struct drm_dp_aux *aux, >> + struct drm_connector *connector); >> void drm_dp_cec_unregister_connector(struct drm_dp_aux *aux); >> void drm_dp_cec_set_edid(struct drm_dp_aux *aux, const struct edid *edid); >> void drm_dp_cec_unset_edid(struct drm_dp_aux *aux); >> @@ -1461,9 +1460,9 @@ static inline void drm_dp_cec_irq(struct drm_dp_aux *aux) >> { >> } >> >> -static inline void drm_dp_cec_register_connector(struct drm_dp_aux *aux, >> - const char *name, >> - struct device *parent) >> +static inline void >> +drm_dp_cec_register_connector(struct drm_dp_aux *aux, >> + struct drm_connector *connector) >> { >> } >> >> > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel >