From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Deucher, Alexander" Subject: Re: [PATCH v7 1/9] drm_dp_cec: add connector info support. Date: Thu, 22 Aug 2019 12:40:47 +0000 Message-ID: References: <20190814104520.6001-1-darekm@google.com> <20190814104520.6001-2-darekm@google.com>, <38cda4f5-3299-2bd4-65f5-9a0f948902c6@xs4all.nl> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0353654276==" Return-path: In-Reply-To: <38cda4f5-3299-2bd4-65f5-9a0f948902c6-qWit8jRvyhVmR6Xm/wNWPw@public.gmane.org> Content-Language: en-US List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "amd-gfx" To: Hans Verkuil , Dariusz Marcinkiewicz , "dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org" , "linux-media-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" Cc: Maxime Ripard , Thomas Lim , David Airlie , "nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org" , "Francis, David" , "linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" , "amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org" , "Koenig, Christian" , Manasi Navare , "Li, Sun peng (Leo)" , "Zuo, Jerry" , Dhinakaran Pandiyan , Rodrigo Vivi , Sean Paul , "Koo, Anthony" , "intel-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org" , =?iso-8859-1?Q?Ville_Syrj=E4l=E4?= , Ben Skeggs List-Id: nouveau.vger.kernel.org --===============0353654276== Content-Language: en-US Content-Type: multipart/alternative; boundary="_000_BN6PR12MB1809F2FD206B4E969ECBE24DF7A50BN6PR12MB1809namp_" --_000_BN6PR12MB1809F2FD206B4E969ECBE24DF7A50BN6PR12MB1809namp_ Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Acked-by: Alex Deucher ________________________________ From: Hans Verkuil Sent: Thursday, August 22, 2019 4:08 AM To: Dariusz Marcinkiewicz ; dri-devel-PD4FTy7X32lNgt0PjOBp9/rsn8yoX9R0@public.gmane.org= org ; linux-media-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: David Airlie ; nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org ; Dhinakaran Pandiyan ; Koo, Anthony ; Francis, David ; amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org ; Zuo, Jer= ry ; Ben Skeggs ; Li, Sun peng (Leo)= ; intel-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org ; Maxime Ripard ; Rodrigo Vivi ; Sean Paul ; Thomas Lim = ; linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org ; Manasi Navar= e ; Deucher, Alexander ; Koenig, Christian ; Ville Syrj=E4l=E4 Subject: Re: [PATCH v7 1/9] drm_dp_cec: add connector info support. Alex, Ville/Rodrigo, Ben, Can you (hopefully) Ack this patch so that I can merge it? 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 =3D &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_s= truct *work) > */ > void drm_dp_cec_set_edid(struct drm_dp_aux *aux, const struct edid *edid= ) > { > - u32 cec_caps =3D CEC_CAP_DEFAULTS | CEC_CAP_NEEDS_HPD; > + struct drm_connector *connector =3D aux->cec.connector; > + u32 cec_caps =3D CEC_CAP_DEFAULTS | CEC_CAP_NEEDS_HPD | > + CEC_CAP_CONNECTOR_INFO; > + struct cec_connector_info conn_info; > unsigned int num_las =3D 1; > u8 cap; > > @@ -344,13 +349,17 @@ void drm_dp_cec_set_edid(struct drm_dp_aux *aux, co= nst struct edid *edid) > > /* Create a new adapter */ > aux->cec.adap =3D 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 =3D 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 =3D 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 *n= ame, > - 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 =3D name; > - aux->cec.parent =3D parent; > + aux->cec.connector =3D 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/i9= 15/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 =3D intel_attached_dp(connector); > - struct drm_device *dev =3D connector->dev; > int ret; > > ret =3D intel_connector_register(connector); > @@ -5512,8 +5511,7 @@ intel_dp_connector_register(struct drm_connector *c= onnector) > intel_dp->aux.dev =3D connector->kdev; > ret =3D 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/dr= m/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, en= um 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 *n= ame, > - 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) > { > } > > --_000_BN6PR12MB1809F2FD206B4E969ECBE24DF7A50BN6PR12MB1809namp_ Content-Type: text/html; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable
Acked-by: Alex Deucher <alexander.deucher-5C7GfCeVMHo@public.gmane.org>
From: Hans Verkuil <hver= kuil-cisco-qWit8jRvyhVmR6Xm/wNWPw@public.gmane.org>
Sent: Thursday, August 22, 2019 4:08 AM
To: Dariusz Marcinkiewicz <darekm-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>; dri-devel@lists= .freedesktop.org <dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org>; linux-media@vger.= kernel.org <linux-media-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>
Cc: David Airlie <airlied-cv59FeDIM0c@public.gmane.org>; nouveau-PD4FTy7X32lNgt0PjOBp93gSJqDPrsil@public.gmane.org= .org <nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org>; Dhinakaran Pandiyan <dhinaka= ran.pandiyan-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>; Koo, Anthony <Anthony.Koo-5C7GfCeVMHo@public.gmane.org>; Franc= is, David <David.Francis-5C7GfCeVMHo@public.gmane.org>; amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org <amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org>; Zuo, Jerry <Jerry.Zuo-5C7GfCeVMHo@public.gmane.org>= ;; Ben Skeggs <bskeggs-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>; Li, Sun peng (Leo) <Sunpeng.Li= @amd.com>; intel-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org <intel-gfx-PD4FTy7X32nrcLQh/DF6ew@public.gmane.org= op.org>; Maxime Ripard <mripard-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>; Rodrigo Vivi <rodr= igo.vivi-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>; Sean Paul <sean-p7yTbzM4H96eqtR555YLDQ@public.gmane.org>; Thomas Lim <Thomas.Lim-5C7GfCeVMHo@public.gmane.org>; = linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org <linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>; Manasi N= avare <manasi.d.navare-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>; Deucher, Alexander <Alexander.D= eucher-5C7GfCeVMHo@public.gmane.org>; Koenig, Christian <Christian.Koenig-5C7GfCeVMHo@public.gmane.org>; Ville Syrj=E4l=E4 <ville.syrjala-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
Subject: Re: [PATCH v7 1/9] drm_dp_cec: add connector info support.<= /font>
 
Alex, Ville/Rodrigo, Ben,

Can you (hopefully) Ack this patch so that I can merge it?

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 <darekm-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>
> Signed-off-by: Hans Verkuil <hverkuil-cisco-qWit8jRvyhVmR6Xm/wNWPw@public.gmane.org>
> Tested-by: Hans Verkuil <hverkuil-cisco-qWit8jRvyhVmR6Xm/wNWPw@public.gmane.org>
> ---
>  .../display/amdgpu_dm/amdgpu_dm_mst_types.c   |  = 2 +-
>  drivers/gpu/drm/drm_dp_cec.c      =             | 25 = 3;+++++++++++-------
>  drivers/gpu/drm/i915/display/intel_dp.c    &= nbsp;  |  4 +--
>  drivers/gpu/drm/nouveau/nouveau_connector.c   |  = 3 +--
>  include/drm/drm_dp_helper.h      &= nbsp;            | 1= 7 ++++++-------
>  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(&aco= nnector->dm_dp_aux.aux);
>        drm_dp_cec_register_connecto= r(&aconnector->dm_dp_aux.aux,
> -           &nb= sp;            =            aconnector->= ;base.name, dm->adev->dev);
> +           = ;            &n= bsp;           &aconn= ector->base);
>        aconnector->mst_mgr.cbs = =3D &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 <linux/kernel.h>
>  #include <linux/module.h>
>  #include <linux/slab.h>
> +#include <drm/drm_connector.h>
>  #include <drm/drm_dp_helper.h>
> +#include <drm/drmP.h>
>  #include <media/cec.h>
> 
>  /*
> @@ -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 ed= id *edid)
>  {
> -     u32 cec_caps =3D CEC_CAP_DEFAULTS | CEC_CAP_= NEEDS_HPD;
> +     struct drm_connector *connector =3D aux-= >cec.connector;
> +     u32 cec_caps =3D CEC_CAP_DEFAULTS | CEC_= CAP_NEEDS_HPD |
> +           = ;         CEC_CAP_CONNECTOR_INFO; > +     struct cec_connector_info conn_info;
>        unsigned int num_las =3D 1;<= br> >        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 =3D cec_all= ocate_adapter(&drm_dp_cec_adap_ops,
> -           &nb= sp;            =             &nb= sp;     aux, aux->cec.name, cec_caps,
> +           = ;            &n= bsp;            = ;      aux, connector->name, cec_caps,
>            = ;            &n= bsp;            = ;        num_las);
>        if (IS_ERR(aux->cec.adap)= ) {
>            = ;    aux->cec.adap =3D NULL;
>            = ;    goto unlock;
>        }
> -     if (cec_register_adapter(aux->cec.adap, a= ux->cec.parent)) {
> +
> +     cec_fill_conn_info_from_drm(&conn_in= fo, connector);
> +     cec_s_conn_info(aux->cec.adap, &c= onn_info);
> +
> +     if (cec_register_adapter(aux->cec.ada= p, connector->dev->dev)) {
>            = ;    cec_delete_adapter(aux->cec.adap);
>            = ;    aux->cec.adap =3D NULL;
>        } else {
> @@ -406,22 +415,20 @@ EXPORT_SYMBOL(drm_dp_cec_unset_edid);
>  /**
>   * drm_dp_cec_register_connector() - register a new connect= or
>   * @aux: DisplayPort AUX channel
> - * @name: name of the CEC device
> - * @parent: parent device
> + * @connector: drm connector
>   *
>   * A new connector was registered with associated CEC adapt= er name and
>   * CEC adapter parent device. After registering the name an= d parent
>   * drm_dp_cec_set_edid() is called to check if the connecto= r 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,
> -           &nb= sp;            =         struct device *parent)
> +void drm_dp_cec_register_connector(struct drm_dp_aux *aux,
> +           = ;            &n= bsp;        struct drm_connector *connec= tor)
>  {
>        WARN_ON(aux->cec.adap); >        if (WARN_ON(!aux->transfe= r))
>            = ;    return;
> -     aux->cec.name =3D name;
> -     aux->cec.parent =3D parent;
> +     aux->cec.connector =3D connector;
>        INIT_DELAYED_WORK(&aux-&= gt;cec.unregister_work,
>            = ;            &n= bsp; 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 = =3D intel_attached_dp(connector);
> -     struct drm_device *dev =3D connector->dev= ;
>        int ret;
> 
>        ret =3D intel_connector_regi= ster(connector);
> @@ -5512,8 +5511,7 @@ intel_dp_connector_register(struct drm_conne= ctor *connector)
>        intel_dp->aux.dev =3D con= nector->kdev;
>        ret =3D drm_dp_aux_register(= &intel_dp->aux);
>        if (!ret)
> -           &nb= sp; drm_dp_cec_register_connector(&intel_dp->aux,
> -           &nb= sp;            =             &nb= sp;      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_Disp= layPort:
>        case DRM_MODE_CONNECTOR_eDP:=
> -           &nb= sp; drm_dp_cec_register_connector(&nv_connector->aux,
> -           &nb= sp;            =             &nb= sp;      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-A= UX
>   * @lock: mutex protecting this struct
>   * @adap: the CEC adapter for CEC-Tunneling-over-AUX suppor= t.
> - * @name: name of the CEC adapter
> - * @parent: parent device of the CEC adapter
> + * @connector: the connector this CEC adapter is associated with<= br> >   * @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 unregist= er_work;
>  };
> 
> @@ -1451,8 +1450,8 @@ drm_dp_has_quirk(const struct drm_dp_desc *d= esc, 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,
> -           &nb= sp;            =         struct device *parent);
> +void drm_dp_cec_register_connector(struct drm_dp_aux *aux,
> +           = ;            &n= bsp;        struct drm_connector *connec= tor);
>  void drm_dp_cec_unregister_connector(struct drm_dp_aux *aux); >  void drm_dp_cec_set_edid(struct drm_dp_aux *aux, const struct ed= id *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 *a= ux,
> -           &nb= sp;            =             &nb= sp;         const char *name,
> -           &nb= sp;            =             &nb= sp;         struct device *parent)<= br> > +static inline void
> +drm_dp_cec_register_connector(struct drm_dp_aux *aux,
> +           = ;            &n= bsp;   struct drm_connector *connector)
>  {
>  }
> 
>

--_000_BN6PR12MB1809F2FD206B4E969ECBE24DF7A50BN6PR12MB1809namp_-- --===============0353654276== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KYW1kLWdmeCBt YWlsaW5nIGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4 --===============0353654276==--