From: Ben Skeggs <bskeggs@redhat.com>
To: Lyude Paul <lyude@redhat.com>
Cc: "Dariusz Marcinkiewicz" <darekm@google.com>,
dri-devel <dri-devel@lists.freedesktop.org>,
linux-media@vger.kernel.org, hverkuil-cisco@xs4all.nl,
"Harry Wentland" <harry.wentland@amd.com>,
"Leo Li" <sunpeng.li@amd.com>,
"Alex Deucher" <alexander.deucher@amd.com>,
"Christian König" <christian.koenig@amd.com>,
"David (ChunMing) Zhou" <David1.Zhou@amd.com>,
"David Airlie" <airlied@linux.ie>,
"Daniel Vetter" <daniel@ffwll.ch>,
"Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>,
"Maxime Ripard" <mripard@kernel.org>,
"Sean Paul" <sean@poorly.run>,
"Jani Nikula" <jani.nikula@linux.intel.com>,
"Joonas Lahtinen" <joonas.lahtinen@linux.intel.com>,
"Rodrigo Vivi" <rodrigo.vivi@intel.com>,
"Jerry (Fangzhi) Zuo" <Jerry.Zuo@amd.com>,
"Anthony Koo" <Anthony.Koo@amd.com>,
"Thomas Lim" <Thomas.Lim@amd.com>,
"David Francis" <David.Francis@amd.com>,
"Ville Syrjälä" <ville.syrjala@linux.intel.com>,
"Chris Wilson" <chris@chris-wilson.co.uk>,
"Imre Deak" <imre.deak@intel.com>,
"Manasi Navare" <manasi.d.navare@intel.com>,
"Dhinakaran Pandiyan" <dhinakaran.pandiyan@intel.com>,
amd-gfx@lists.freedesktop.org,
LKML <linux-kernel@vger.kernel.org>,
intel-gfx@lists.freedesktop.org,
nouveau <nouveau@lists.freedesktop.org>
Subject: Re: [PATCH v7 1/9] drm_dp_cec: add connector info support.
Date: Mon, 26 Aug 2019 19:05:27 +1000 [thread overview]
Message-ID: <CABDvA=mK=4zK5Yn0Ro5oy0Pwa-JKBEq3fWpFJkHmBviexd7VWg@mail.gmail.com> (raw)
In-Reply-To: <bc3de8802b695fabb9522333de3a7071b02b47cb.camel@redhat.com>
On Fri, Aug 16, 2019 at 4:10 AM Lyude Paul <lyude@redhat.com> wrote:
>
> Reviewed-by: Lyude Paul <lyude@redhat.com>
Reviewed-by: Ben Skeggs <bskeggs@redhat.com>
>
> On Wed, 2019-08-14 at 12:44 +0200, 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@google.com>
> > Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
> > Tested-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
> > ---
> > .../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 <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 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)
> > {
> > }
> >
>
next prev parent reply other threads:[~2019-08-26 9:05 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-14 10:44 [PATCH v7 0/9] drm: cec: convert DRM drivers to the new notifier API Dariusz Marcinkiewicz
2019-08-14 10:44 ` [PATCH v7 1/9] drm_dp_cec: add connector info support Dariusz Marcinkiewicz
2019-08-15 18:10 ` Lyude Paul
2019-08-26 9:05 ` Ben Skeggs [this message]
2019-08-22 8:08 ` Hans Verkuil
2019-08-26 9:00 ` Hans Verkuil
2019-08-28 15:05 ` Ville Syrjälä
2019-08-14 10:45 ` [PATCH v7 2/9] drm/i915/intel_hdmi: use cec_notifier_conn_(un)register Dariusz Marcinkiewicz
2019-08-22 8:03 ` Hans Verkuil
2019-08-26 8:59 ` Hans Verkuil
2019-08-26 12:08 ` Ville Syrjälä
2019-08-14 10:45 ` [PATCH v7 3/9] dw-hdmi-cec: use cec_notifier_cec_adap_(un)register Dariusz Marcinkiewicz
2019-08-19 14:35 ` Neil Armstrong
2019-08-20 7:48 ` Neil Armstrong
2019-08-14 10:45 ` [PATCH v7 4/9] tda9950: " Dariusz Marcinkiewicz
2019-08-14 10:45 ` [PATCH v7 5/9] drm: tda998x: use cec_notifier_conn_(un)register Dariusz Marcinkiewicz
2019-08-19 9:30 ` Hans Verkuil
2019-08-19 11:22 ` [PATCH v7.1 " Dariusz Marcinkiewicz
2019-08-28 7:15 ` [PATCH v7.2 " Dariusz Marcinkiewicz
2019-08-25 13:12 ` [PATCH v7 " Hans Verkuil
2019-08-28 7:18 ` Dariusz Marcinkiewicz
2019-08-14 10:45 ` [PATCH v7 6/9] drm: sti: " Dariusz Marcinkiewicz
2019-08-19 9:34 ` Hans Verkuil
2019-08-22 8:11 ` Hans Verkuil
2019-09-02 13:11 ` Benjamin Gaignard
2019-08-14 10:45 ` [PATCH v7 7/9] drm: tegra: " Dariusz Marcinkiewicz
2019-08-19 9:33 ` Hans Verkuil
2019-08-28 8:09 ` Hans Verkuil
2019-08-28 9:38 ` Thierry Reding
2019-08-28 10:06 ` Hans Verkuil
2019-08-28 11:54 ` Thierry Reding
2019-10-04 8:48 ` Hans Verkuil
2019-10-14 7:51 ` Hans Verkuil
2019-08-28 9:36 ` Thierry Reding
2019-10-14 12:17 ` Thierry Reding
2019-08-14 10:45 ` [PATCH v7 8/9] drm: dw-hdmi: " Dariusz Marcinkiewicz
2019-08-19 9:32 ` Hans Verkuil
2019-08-19 14:05 ` Hans Verkuil
2019-08-19 14:38 ` Neil Armstrong
2019-08-19 14:41 ` Hans Verkuil
2019-08-19 14:47 ` Neil Armstrong
2019-08-20 7:48 ` Neil Armstrong
2019-08-14 10:45 ` [PATCH v7 9/9] drm: exynos: exynos_hdmi: " Dariusz Marcinkiewicz
2019-08-19 9:32 ` Hans Verkuil
2019-08-28 8:39 ` Sylwester Nawrocki
2019-08-28 12:34 ` [PATCH v7.1 " Dariusz Marcinkiewicz
2019-08-28 12:38 ` [PATCH v7 " Dariusz Marcinkiewicz
2019-08-19 9:38 ` [PATCH v7 0/9] drm: cec: convert DRM drivers to the new notifier API Hans Verkuil
2019-08-19 11:28 ` Dariusz Marcinkiewicz
2019-08-19 12:00 ` Hans Verkuil
2019-08-19 14:48 ` Neil Armstrong
2019-08-19 14:55 ` Hans Verkuil
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CABDvA=mK=4zK5Yn0Ro5oy0Pwa-JKBEq3fWpFJkHmBviexd7VWg@mail.gmail.com' \
--to=bskeggs@redhat.com \
--cc=Anthony.Koo@amd.com \
--cc=David.Francis@amd.com \
--cc=David1.Zhou@amd.com \
--cc=Jerry.Zuo@amd.com \
--cc=Thomas.Lim@amd.com \
--cc=airlied@linux.ie \
--cc=alexander.deucher@amd.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=chris@chris-wilson.co.uk \
--cc=christian.koenig@amd.com \
--cc=daniel@ffwll.ch \
--cc=darekm@google.com \
--cc=dhinakaran.pandiyan@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=harry.wentland@amd.com \
--cc=hverkuil-cisco@xs4all.nl \
--cc=imre.deak@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@linux.intel.com \
--cc=joonas.lahtinen@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=lyude@redhat.com \
--cc=maarten.lankhorst@linux.intel.com \
--cc=manasi.d.navare@intel.com \
--cc=mripard@kernel.org \
--cc=nouveau@lists.freedesktop.org \
--cc=rodrigo.vivi@intel.com \
--cc=sean@poorly.run \
--cc=sunpeng.li@amd.com \
--cc=ville.syrjala@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).