| Message ID | 1548917996-28081-3-git-send-email-ramalingam.c@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915: Implement HDCP2.2 | expand |
On Thu, Jan 31, 2019 at 12:29:18PM +0530, Ramalingam C wrote: > From: Daniel Vetter <daniel.vetter@ffwll.ch> > > Since we need multiple components for I915 for different purposes > (Audio & Mei_hdcp), we adopt the subcomponents methodology introduced > by the previous patch (mentioned below). > > Author: Daniel Vetter <daniel.vetter@ffwll.ch> > Date: Mon Jan 28 17:08:20 2019 +0530 > > components: multiple components for a device > > Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> > Signed-off-by: Ramalingam C <ramalingam.c@intel.com> > cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > cc: Russell King <rmk+kernel@arm.linux.org.uk> > cc: Rafael J. Wysocki <rafael@kernel.org> > cc: Jaroslav Kysela <perex@perex.cz> > cc: Takashi Iwai <tiwai@suse.com> > cc: Rodrigo Vivi <rodrigo.vivi@intel.com> > cc: Jani Nikula <jani.nikula@linux.intel.com> Takashi, can you pls take a look and ack for merging through drm-intel? We can also do a topic branch in case this conflicts with something on the audio side. Thanks, Daniel > --- > drivers/gpu/drm/i915/intel_audio.c | 4 +++- > include/drm/i915_component.h | 4 ++++ > include/sound/hda_component.h | 5 +++-- > sound/hda/hdac_component.c | 4 ++-- > sound/hda/hdac_i915.c | 6 ++++-- > 5 files changed, 16 insertions(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c > index de26cd0a5497..5104c6bbd66f 100644 > --- a/drivers/gpu/drm/i915/intel_audio.c > +++ b/drivers/gpu/drm/i915/intel_audio.c > @@ -984,7 +984,9 @@ void i915_audio_component_init(struct drm_i915_private *dev_priv) > { > int ret; > > - ret = component_add(dev_priv->drm.dev, &i915_audio_component_bind_ops); > + ret = component_add_typed(dev_priv->drm.dev, > + &i915_audio_component_bind_ops, > + I915_COMPONENT_AUDIO); > if (ret < 0) { > DRM_ERROR("failed to add audio component (%d)\n", ret); > /* continue with reduced functionality */ > diff --git a/include/drm/i915_component.h b/include/drm/i915_component.h > index fca22d463e1b..72fbb037f9b3 100644 > --- a/include/drm/i915_component.h > +++ b/include/drm/i915_component.h > @@ -26,6 +26,10 @@ > > #include "drm_audio_component.h" > > +enum i915_component_type { > + I915_COMPONENT_AUDIO = 1, > +}; > + > /* MAX_PORT is the number of port > * It must be sync with I915_MAX_PORTS defined i915_drv.h > */ > diff --git a/include/sound/hda_component.h b/include/sound/hda_component.h > index 2ec31b358950..d4804c72d959 100644 > --- a/include/sound/hda_component.h > +++ b/include/sound/hda_component.h > @@ -20,7 +20,7 @@ int snd_hdac_acomp_get_eld(struct hdac_device *codec, hda_nid_t nid, int dev_id, > bool *audio_enabled, char *buffer, int max_bytes); > int snd_hdac_acomp_init(struct hdac_bus *bus, > const struct drm_audio_component_audio_ops *aops, > - int (*match_master)(struct device *, void *), > + int (*match_master)(struct device *, int, void *), > size_t extra_size); > int snd_hdac_acomp_exit(struct hdac_bus *bus); > int snd_hdac_acomp_register_notifier(struct hdac_bus *bus, > @@ -47,7 +47,8 @@ static inline int snd_hdac_acomp_get_eld(struct hdac_device *codec, hda_nid_t ni > } > static inline int snd_hdac_acomp_init(struct hdac_bus *bus, > const struct drm_audio_component_audio_ops *aops, > - int (*match_master)(struct device *, void *), > + int (*match_master)(struct device *, > + int, void *), > size_t extra_size) > { > return -ENODEV; > diff --git a/sound/hda/hdac_component.c b/sound/hda/hdac_component.c > index a6d37b9d6413..5c95933e739a 100644 > --- a/sound/hda/hdac_component.c > +++ b/sound/hda/hdac_component.c > @@ -269,7 +269,7 @@ EXPORT_SYMBOL_GPL(snd_hdac_acomp_register_notifier); > */ > int snd_hdac_acomp_init(struct hdac_bus *bus, > const struct drm_audio_component_audio_ops *aops, > - int (*match_master)(struct device *, void *), > + int (*match_master)(struct device *, int, void *), > size_t extra_size) > { > struct component_match *match = NULL; > @@ -288,7 +288,7 @@ int snd_hdac_acomp_init(struct hdac_bus *bus, > bus->audio_component = acomp; > devres_add(dev, acomp); > > - component_match_add(dev, &match, match_master, bus); > + component_match_add_typed(dev, &match, match_master, bus); > ret = component_master_add_with_match(dev, &hdac_component_master_ops, > match); > if (ret < 0) > diff --git a/sound/hda/hdac_i915.c b/sound/hda/hdac_i915.c > index 617ff1aa818f..7aee090e3d27 100644 > --- a/sound/hda/hdac_i915.c > +++ b/sound/hda/hdac_i915.c > @@ -82,9 +82,11 @@ void snd_hdac_i915_set_bclk(struct hdac_bus *bus) > } > EXPORT_SYMBOL_GPL(snd_hdac_i915_set_bclk); > > -static int i915_component_master_match(struct device *dev, void *data) > +static int i915_component_master_match(struct device *dev, int subcomponent, > + void *data) > { > - return !strcmp(dev->driver->name, "i915"); > + return !strcmp(dev->driver->name, "i915") && > + subcomponent == I915_COMPONENT_AUDIO; > } > > /* check whether intel graphics is present */ > -- > 2.7.4 >
On Mon, 04 Feb 2019 16:00:18 +0100, Daniel Vetter wrote: > > On Thu, Jan 31, 2019 at 12:29:18PM +0530, Ramalingam C wrote: > > From: Daniel Vetter <daniel.vetter@ffwll.ch> > > > > Since we need multiple components for I915 for different purposes > > (Audio & Mei_hdcp), we adopt the subcomponents methodology introduced > > by the previous patch (mentioned below). > > > > Author: Daniel Vetter <daniel.vetter@ffwll.ch> > > Date: Mon Jan 28 17:08:20 2019 +0530 > > > > components: multiple components for a device > > > > Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> > > Signed-off-by: Ramalingam C <ramalingam.c@intel.com> > > cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > > cc: Russell King <rmk+kernel@arm.linux.org.uk> > > cc: Rafael J. Wysocki <rafael@kernel.org> > > cc: Jaroslav Kysela <perex@perex.cz> > > cc: Takashi Iwai <tiwai@suse.com> > > cc: Rodrigo Vivi <rodrigo.vivi@intel.com> > > cc: Jani Nikula <jani.nikula@linux.intel.com> > > Takashi, can you pls take a look and ack for merging through drm-intel? We > can also do a topic branch in case this conflicts with something on the > audio side. I'm fine with the change as long as others agree with this API extension. Reviewed-by: Takashi Iwai <tiwai@suse.de> thanks, Takashi
diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c index de26cd0a5497..5104c6bbd66f 100644 --- a/drivers/gpu/drm/i915/intel_audio.c +++ b/drivers/gpu/drm/i915/intel_audio.c @@ -984,7 +984,9 @@ void i915_audio_component_init(struct drm_i915_private *dev_priv) { int ret; - ret = component_add(dev_priv->drm.dev, &i915_audio_component_bind_ops); + ret = component_add_typed(dev_priv->drm.dev, + &i915_audio_component_bind_ops, + I915_COMPONENT_AUDIO); if (ret < 0) { DRM_ERROR("failed to add audio component (%d)\n", ret); /* continue with reduced functionality */ diff --git a/include/drm/i915_component.h b/include/drm/i915_component.h index fca22d463e1b..72fbb037f9b3 100644 --- a/include/drm/i915_component.h +++ b/include/drm/i915_component.h @@ -26,6 +26,10 @@ #include "drm_audio_component.h" +enum i915_component_type { + I915_COMPONENT_AUDIO = 1, +}; + /* MAX_PORT is the number of port * It must be sync with I915_MAX_PORTS defined i915_drv.h */ diff --git a/include/sound/hda_component.h b/include/sound/hda_component.h index 2ec31b358950..d4804c72d959 100644 --- a/include/sound/hda_component.h +++ b/include/sound/hda_component.h @@ -20,7 +20,7 @@ int snd_hdac_acomp_get_eld(struct hdac_device *codec, hda_nid_t nid, int dev_id, bool *audio_enabled, char *buffer, int max_bytes); int snd_hdac_acomp_init(struct hdac_bus *bus, const struct drm_audio_component_audio_ops *aops, - int (*match_master)(struct device *, void *), + int (*match_master)(struct device *, int, void *), size_t extra_size); int snd_hdac_acomp_exit(struct hdac_bus *bus); int snd_hdac_acomp_register_notifier(struct hdac_bus *bus, @@ -47,7 +47,8 @@ static inline int snd_hdac_acomp_get_eld(struct hdac_device *codec, hda_nid_t ni } static inline int snd_hdac_acomp_init(struct hdac_bus *bus, const struct drm_audio_component_audio_ops *aops, - int (*match_master)(struct device *, void *), + int (*match_master)(struct device *, + int, void *), size_t extra_size) { return -ENODEV; diff --git a/sound/hda/hdac_component.c b/sound/hda/hdac_component.c index a6d37b9d6413..5c95933e739a 100644 --- a/sound/hda/hdac_component.c +++ b/sound/hda/hdac_component.c @@ -269,7 +269,7 @@ EXPORT_SYMBOL_GPL(snd_hdac_acomp_register_notifier); */ int snd_hdac_acomp_init(struct hdac_bus *bus, const struct drm_audio_component_audio_ops *aops, - int (*match_master)(struct device *, void *), + int (*match_master)(struct device *, int, void *), size_t extra_size) { struct component_match *match = NULL; @@ -288,7 +288,7 @@ int snd_hdac_acomp_init(struct hdac_bus *bus, bus->audio_component = acomp; devres_add(dev, acomp); - component_match_add(dev, &match, match_master, bus); + component_match_add_typed(dev, &match, match_master, bus); ret = component_master_add_with_match(dev, &hdac_component_master_ops, match); if (ret < 0) diff --git a/sound/hda/hdac_i915.c b/sound/hda/hdac_i915.c index 617ff1aa818f..7aee090e3d27 100644 --- a/sound/hda/hdac_i915.c +++ b/sound/hda/hdac_i915.c @@ -82,9 +82,11 @@ void snd_hdac_i915_set_bclk(struct hdac_bus *bus) } EXPORT_SYMBOL_GPL(snd_hdac_i915_set_bclk); -static int i915_component_master_match(struct device *dev, void *data) +static int i915_component_master_match(struct device *dev, int subcomponent, + void *data) { - return !strcmp(dev->driver->name, "i915"); + return !strcmp(dev->driver->name, "i915") && + subcomponent == I915_COMPONENT_AUDIO; } /* check whether intel graphics is present */