Re: [Intel-gfx] [PATCH v5 1/5] drm/i915: setup bridge for HDMI LPE audio driver
On Thu, 26 Jan 2017 11:23:41 +0100, Jani Nikula wrote: > > On Thu, 26 Jan 2017, Takashi Iwai wrote: > > On Thu, 26 Jan 2017 10:21:47 +0100, > > Daniel Vetter wrote: > >> > >> On Tue, Jan 24, 2017 at 03:25:14PM +0200, Jani Nikula wrote: > >> > On Wed, 25 Jan 2017, Jerome Anand wrote: > >> > > Enable support for HDMI LPE audio mode on Baytrail and > >> > > Cherrytrail when HDaudio controller is not detected > >> > > > >> > > Setup minimum required resources during i915_driver_load: > >> > > 1. Create a platform device to share MMIO/IRQ resources > >> > > 2. Make the platform device child of i915 device for runtime PM. > >> > > 3. Create IRQ chip to forward HDMI LPE audio irqs. > >> > > > >> > > HDMI LPE audio driver (a standalone sound driver) probes the > >> > > LPE audio device and creates a new sound card. > >> > > > >> > > Signed-off-by: Pierre-Louis Bossart > >> > > > >> > > Signed-off-by: Jerome Anand > >> > > >> > Acked-by: Jani Nikula > >> > > >> > > --- > >> > > Documentation/gpu/i915.rst | 9 + > >> > > drivers/gpu/drm/i915/Makefile | 3 + > >> > > drivers/gpu/drm/i915/i915_drv.c| 4 +- > >> > > drivers/gpu/drm/i915/i915_drv.h| 11 ++ > >> > > drivers/gpu/drm/i915/i915_irq.c| 16 ++ > >> > > drivers/gpu/drm/i915/i915_reg.h| 3 + > >> > > drivers/gpu/drm/i915/intel_audio.c | 25 +++ > >> > > drivers/gpu/drm/i915/intel_drv.h | 2 + > >> > > drivers/gpu/drm/i915/intel_lpe_audio.c | 321 > >> > > + > >> > > include/drm/intel_lpe_audio.h | 46 + > >> > > 10 files changed, 438 insertions(+), 2 deletions(-) > >> > > create mode 100644 drivers/gpu/drm/i915/intel_lpe_audio.c > >> > > create mode 100644 include/drm/intel_lpe_audio.h > >> > > > >> > > diff --git a/Documentation/gpu/i915.rst b/Documentation/gpu/i915.rst > >> > > index 104296d..bd9b767 100644 > >> > > --- a/Documentation/gpu/i915.rst > >> > > +++ b/Documentation/gpu/i915.rst > >> > > @@ -225,6 +225,15 @@ Display PLLs > >> > > .. kernel-doc:: drivers/gpu/drm/i915/intel_dpll_mgr.h > >> > > :internal: > >> > > > >> > > +intel hdmi lpe audio support > >> > > + > >> > > + > >> > > +.. kernel-doc:: drivers/gpu/drm/i915/intel_lpe_audio.c > >> > > + :doc: LPE Audio integration for HDMI or DP playback > >> > > + > >> > > +.. kernel-doc:: drivers/gpu/drm/i915/intel_lpe_audio.c > >> > > + :internal: > >> > > + > >> > >> Please apply a follow-up patch to move this next to the chapter about hda > >> audio, because that makes imo more sense than just semi-randomly adding it > >> at the end of the chapter. And it would avoid a silly conflict with stuff > >> in drm-intel.git, which indeed should be here. > > > > OK, how about the one below? > > > > > > thanks, > > > > Takashi > > > > -- 8< -- > > From: Takashi Iwai > > Subject: [PATCH] Documentation/gpu: Move LPE audio section after HD-audio > > > > As Daniel suggested, it makes more sense and reduces the conflicts. > > > > Also, while we're at it, tidy up the section title from all lower > > letters. > > > > Signed-off-by: Takashi Iwai > > --- > > Documentation/gpu/i915.rst | 18 +- > > 1 file changed, 9 insertions(+), 9 deletions(-) > > > > diff --git a/Documentation/gpu/i915.rst b/Documentation/gpu/i915.rst > > index a671eee78945..9574080113dc 100644 > > --- a/Documentation/gpu/i915.rst > > +++ b/Documentation/gpu/i915.rst > > @@ -144,6 +144,15 @@ High Definition Audio > > .. kernel-doc:: include/drm/i915_component.h > > :internal: > > > > +Intel HDMI LPE Audio Support > > + > > + > > +.. kernel-doc:: drivers/gpu/drm/i915/intel_lpe_audio.c > > + :doc: LPE Audio integration for HDMI or DP playback >^^ > > While at it, please fix the double space (it was in the original > already). OK, fixed. thanks, Takashi ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH v5 1/5] drm/i915: setup bridge for HDMI LPE audio driver
On Thu, 26 Jan 2017, Takashi Iwai wrote: > On Thu, 26 Jan 2017 10:21:47 +0100, > Daniel Vetter wrote: >> >> On Tue, Jan 24, 2017 at 03:25:14PM +0200, Jani Nikula wrote: >> > On Wed, 25 Jan 2017, Jerome Anand wrote: >> > > Enable support for HDMI LPE audio mode on Baytrail and >> > > Cherrytrail when HDaudio controller is not detected >> > > >> > > Setup minimum required resources during i915_driver_load: >> > > 1. Create a platform device to share MMIO/IRQ resources >> > > 2. Make the platform device child of i915 device for runtime PM. >> > > 3. Create IRQ chip to forward HDMI LPE audio irqs. >> > > >> > > HDMI LPE audio driver (a standalone sound driver) probes the >> > > LPE audio device and creates a new sound card. >> > > >> > > Signed-off-by: Pierre-Louis Bossart >> > > >> > > Signed-off-by: Jerome Anand >> > >> > Acked-by: Jani Nikula >> > >> > > --- >> > > Documentation/gpu/i915.rst | 9 + >> > > drivers/gpu/drm/i915/Makefile | 3 + >> > > drivers/gpu/drm/i915/i915_drv.c| 4 +- >> > > drivers/gpu/drm/i915/i915_drv.h| 11 ++ >> > > drivers/gpu/drm/i915/i915_irq.c| 16 ++ >> > > drivers/gpu/drm/i915/i915_reg.h| 3 + >> > > drivers/gpu/drm/i915/intel_audio.c | 25 +++ >> > > drivers/gpu/drm/i915/intel_drv.h | 2 + >> > > drivers/gpu/drm/i915/intel_lpe_audio.c | 321 >> > > + >> > > include/drm/intel_lpe_audio.h | 46 + >> > > 10 files changed, 438 insertions(+), 2 deletions(-) >> > > create mode 100644 drivers/gpu/drm/i915/intel_lpe_audio.c >> > > create mode 100644 include/drm/intel_lpe_audio.h >> > > >> > > diff --git a/Documentation/gpu/i915.rst b/Documentation/gpu/i915.rst >> > > index 104296d..bd9b767 100644 >> > > --- a/Documentation/gpu/i915.rst >> > > +++ b/Documentation/gpu/i915.rst >> > > @@ -225,6 +225,15 @@ Display PLLs >> > > .. kernel-doc:: drivers/gpu/drm/i915/intel_dpll_mgr.h >> > > :internal: >> > > >> > > +intel hdmi lpe audio support >> > > + >> > > + >> > > +.. kernel-doc:: drivers/gpu/drm/i915/intel_lpe_audio.c >> > > + :doc: LPE Audio integration for HDMI or DP playback >> > > + >> > > +.. kernel-doc:: drivers/gpu/drm/i915/intel_lpe_audio.c >> > > + :internal: >> > > + >> >> Please apply a follow-up patch to move this next to the chapter about hda >> audio, because that makes imo more sense than just semi-randomly adding it >> at the end of the chapter. And it would avoid a silly conflict with stuff >> in drm-intel.git, which indeed should be here. > > OK, how about the one below? > > > thanks, > > Takashi > > -- 8< -- > From: Takashi Iwai > Subject: [PATCH] Documentation/gpu: Move LPE audio section after HD-audio > > As Daniel suggested, it makes more sense and reduces the conflicts. > > Also, while we're at it, tidy up the section title from all lower > letters. > > Signed-off-by: Takashi Iwai > --- > Documentation/gpu/i915.rst | 18 +- > 1 file changed, 9 insertions(+), 9 deletions(-) > > diff --git a/Documentation/gpu/i915.rst b/Documentation/gpu/i915.rst > index a671eee78945..9574080113dc 100644 > --- a/Documentation/gpu/i915.rst > +++ b/Documentation/gpu/i915.rst > @@ -144,6 +144,15 @@ High Definition Audio > .. kernel-doc:: include/drm/i915_component.h > :internal: > > +Intel HDMI LPE Audio Support > + > + > +.. kernel-doc:: drivers/gpu/drm/i915/intel_lpe_audio.c > + :doc: LPE Audio integration for HDMI or DP playback ^^ While at it, please fix the double space (it was in the original already). And sorry & thanks for the extra trouble after I already acked this. BR, Jani. > + > +.. kernel-doc:: drivers/gpu/drm/i915/intel_lpe_audio.c > + :internal: > + > Panel Self Refresh PSR (PSR/SRD) > > > @@ -213,15 +222,6 @@ Video BIOS Table (VBT) > .. kernel-doc:: drivers/gpu/drm/i915/intel_vbt_defs.h > :internal: > > -intel hdmi lpe audio support > - > - > -.. kernel-doc:: drivers/gpu/drm/i915/intel_lpe_audio.c > - :doc: LPE Audio integration for HDMI or DP playback > - > -.. kernel-doc:: drivers/gpu/drm/i915/intel_lpe_audio.c > - :internal: > - > Memory Management and Command Submission > -- Jani Nikula, Intel Open Source Technology Center ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH v5 1/5] drm/i915: setup bridge for HDMI LPE audio driver
On Thu, 26 Jan 2017 10:21:47 +0100, Daniel Vetter wrote: > > On Tue, Jan 24, 2017 at 03:25:14PM +0200, Jani Nikula wrote: > > On Wed, 25 Jan 2017, Jerome Anand wrote: > > > Enable support for HDMI LPE audio mode on Baytrail and > > > Cherrytrail when HDaudio controller is not detected > > > > > > Setup minimum required resources during i915_driver_load: > > > 1. Create a platform device to share MMIO/IRQ resources > > > 2. Make the platform device child of i915 device for runtime PM. > > > 3. Create IRQ chip to forward HDMI LPE audio irqs. > > > > > > HDMI LPE audio driver (a standalone sound driver) probes the > > > LPE audio device and creates a new sound card. > > > > > > Signed-off-by: Pierre-Louis Bossart > > > Signed-off-by: Jerome Anand > > > > Acked-by: Jani Nikula > > > > > --- > > > Documentation/gpu/i915.rst | 9 + > > > drivers/gpu/drm/i915/Makefile | 3 + > > > drivers/gpu/drm/i915/i915_drv.c| 4 +- > > > drivers/gpu/drm/i915/i915_drv.h| 11 ++ > > > drivers/gpu/drm/i915/i915_irq.c| 16 ++ > > > drivers/gpu/drm/i915/i915_reg.h| 3 + > > > drivers/gpu/drm/i915/intel_audio.c | 25 +++ > > > drivers/gpu/drm/i915/intel_drv.h | 2 + > > > drivers/gpu/drm/i915/intel_lpe_audio.c | 321 > > > + > > > include/drm/intel_lpe_audio.h | 46 + > > > 10 files changed, 438 insertions(+), 2 deletions(-) > > > create mode 100644 drivers/gpu/drm/i915/intel_lpe_audio.c > > > create mode 100644 include/drm/intel_lpe_audio.h > > > > > > diff --git a/Documentation/gpu/i915.rst b/Documentation/gpu/i915.rst > > > index 104296d..bd9b767 100644 > > > --- a/Documentation/gpu/i915.rst > > > +++ b/Documentation/gpu/i915.rst > > > @@ -225,6 +225,15 @@ Display PLLs > > > .. kernel-doc:: drivers/gpu/drm/i915/intel_dpll_mgr.h > > > :internal: > > > > > > +intel hdmi lpe audio support > > > + > > > + > > > +.. kernel-doc:: drivers/gpu/drm/i915/intel_lpe_audio.c > > > + :doc: LPE Audio integration for HDMI or DP playback > > > + > > > +.. kernel-doc:: drivers/gpu/drm/i915/intel_lpe_audio.c > > > + :internal: > > > + > > Please apply a follow-up patch to move this next to the chapter about hda > audio, because that makes imo more sense than just semi-randomly adding it > at the end of the chapter. And it would avoid a silly conflict with stuff > in drm-intel.git, which indeed should be here. OK, how about the one below? thanks, Takashi -- 8< -- From: Takashi Iwai Subject: [PATCH] Documentation/gpu: Move LPE audio section after HD-audio As Daniel suggested, it makes more sense and reduces the conflicts. Also, while we're at it, tidy up the section title from all lower letters. Signed-off-by: Takashi Iwai --- Documentation/gpu/i915.rst | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Documentation/gpu/i915.rst b/Documentation/gpu/i915.rst index a671eee78945..9574080113dc 100644 --- a/Documentation/gpu/i915.rst +++ b/Documentation/gpu/i915.rst @@ -144,6 +144,15 @@ High Definition Audio .. kernel-doc:: include/drm/i915_component.h :internal: +Intel HDMI LPE Audio Support + + +.. kernel-doc:: drivers/gpu/drm/i915/intel_lpe_audio.c + :doc: LPE Audio integration for HDMI or DP playback + +.. kernel-doc:: drivers/gpu/drm/i915/intel_lpe_audio.c + :internal: + Panel Self Refresh PSR (PSR/SRD) @@ -213,15 +222,6 @@ Video BIOS Table (VBT) .. kernel-doc:: drivers/gpu/drm/i915/intel_vbt_defs.h :internal: -intel hdmi lpe audio support - - -.. kernel-doc:: drivers/gpu/drm/i915/intel_lpe_audio.c - :doc: LPE Audio integration for HDMI or DP playback - -.. kernel-doc:: drivers/gpu/drm/i915/intel_lpe_audio.c - :internal: - Memory Management and Command Submission -- 2.11.0 ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH v5 1/5] drm/i915: setup bridge for HDMI LPE audio driver
On Tue, Jan 24, 2017 at 03:25:14PM +0200, Jani Nikula wrote:
> On Wed, 25 Jan 2017, Jerome Anand wrote:
> > Enable support for HDMI LPE audio mode on Baytrail and
> > Cherrytrail when HDaudio controller is not detected
> >
> > Setup minimum required resources during i915_driver_load:
> > 1. Create a platform device to share MMIO/IRQ resources
> > 2. Make the platform device child of i915 device for runtime PM.
> > 3. Create IRQ chip to forward HDMI LPE audio irqs.
> >
> > HDMI LPE audio driver (a standalone sound driver) probes the
> > LPE audio device and creates a new sound card.
> >
> > Signed-off-by: Pierre-Louis Bossart
> > Signed-off-by: Jerome Anand
>
> Acked-by: Jani Nikula
>
> > ---
> > Documentation/gpu/i915.rst | 9 +
> > drivers/gpu/drm/i915/Makefile | 3 +
> > drivers/gpu/drm/i915/i915_drv.c| 4 +-
> > drivers/gpu/drm/i915/i915_drv.h| 11 ++
> > drivers/gpu/drm/i915/i915_irq.c| 16 ++
> > drivers/gpu/drm/i915/i915_reg.h| 3 +
> > drivers/gpu/drm/i915/intel_audio.c | 25 +++
> > drivers/gpu/drm/i915/intel_drv.h | 2 +
> > drivers/gpu/drm/i915/intel_lpe_audio.c | 321
> > +
> > include/drm/intel_lpe_audio.h | 46 +
> > 10 files changed, 438 insertions(+), 2 deletions(-)
> > create mode 100644 drivers/gpu/drm/i915/intel_lpe_audio.c
> > create mode 100644 include/drm/intel_lpe_audio.h
> >
> > diff --git a/Documentation/gpu/i915.rst b/Documentation/gpu/i915.rst
> > index 104296d..bd9b767 100644
> > --- a/Documentation/gpu/i915.rst
> > +++ b/Documentation/gpu/i915.rst
> > @@ -225,6 +225,15 @@ Display PLLs
> > .. kernel-doc:: drivers/gpu/drm/i915/intel_dpll_mgr.h
> > :internal:
> >
> > +intel hdmi lpe audio support
> > +
> > +
> > +.. kernel-doc:: drivers/gpu/drm/i915/intel_lpe_audio.c
> > + :doc: LPE Audio integration for HDMI or DP playback
> > +
> > +.. kernel-doc:: drivers/gpu/drm/i915/intel_lpe_audio.c
> > + :internal:
> > +
Please apply a follow-up patch to move this next to the chapter about hda
audio, because that makes imo more sense than just semi-randomly adding it
at the end of the chapter. And it would avoid a silly conflict with stuff
in drm-intel.git, which indeed should be here.
Thanks, Daniel
> > Memory Management and Command Submission
> >
> >
> > diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
> > index 74ca2e8..c62ab45 100644
> > --- a/drivers/gpu/drm/i915/Makefile
> > +++ b/drivers/gpu/drm/i915/Makefile
> > @@ -129,6 +129,9 @@ i915-y += intel_gvt.o
> > include $(src)/gvt/Makefile
> > endif
> >
> > +# LPE Audio for VLV and CHT
> > +i915-y += intel_lpe_audio.o
> > +
> > obj-$(CONFIG_DRM_I915) += i915.o
> >
> > CFLAGS_i915_trace_points.o := -I$(src)
> > diff --git a/drivers/gpu/drm/i915/i915_drv.c
> > b/drivers/gpu/drm/i915/i915_drv.c
> > index ca168b2..2e0574c 100644
> > --- a/drivers/gpu/drm/i915/i915_drv.c
> > +++ b/drivers/gpu/drm/i915/i915_drv.c
> > @@ -1140,7 +1140,7 @@ static void i915_driver_register(struct
> > drm_i915_private *dev_priv)
> > if (IS_GEN5(dev_priv))
> > intel_gpu_ips_init(dev_priv);
> >
> > - i915_audio_component_init(dev_priv);
> > + intel_audio_init(dev_priv);
> >
> > /*
> > * Some ports require correctly set-up hpd registers for detection to
> > @@ -1158,7 +1158,7 @@ static void i915_driver_register(struct
> > drm_i915_private *dev_priv)
> > */
> > static void i915_driver_unregister(struct drm_i915_private *dev_priv)
> > {
> > - i915_audio_component_cleanup(dev_priv);
> > + intel_audio_deinit(dev_priv);
> >
> > intel_gpu_ips_teardown();
> > acpi_video_unregister();
> > diff --git a/drivers/gpu/drm/i915/i915_drv.h
> > b/drivers/gpu/drm/i915/i915_drv.h
> > index 2446280..8b68f900 100644
> > --- a/drivers/gpu/drm/i915/i915_drv.h
> > +++ b/drivers/gpu/drm/i915/i915_drv.h
> > @@ -2454,6 +2454,12 @@ struct drm_i915_private {
> > /* Used to save the pipe-to-encoder mapping for audio */
> > struct intel_encoder *av_enc_map[I915_MAX_PIPES];
> >
> > + /* necessary resource sharing with HDMI LPE audio driver. */
> > + struct {
> > + struct platform_device *platdev;
> > + int irq;
> > + } lpe_audio;
> > +
> > /*
> > * NOTE: This is the dri1/ums dungeon, don't add stuff here. Your patch
> > * will be rejected. Instead look for a better place.
> > @@ -3592,6 +3598,11 @@ extern int i915_restore_state(struct
> > drm_i915_private *dev_priv);
> > void i915_setup_sysfs(struct drm_i915_private *dev_priv);
> > void i915_teardown_sysfs(struct drm_i915_private *dev_priv);
> >
> > +/* intel_lpe_audio.c */
> > +int intel_lpe_audio_init(struct drm_i915_private *dev_priv);
> > +void intel_lpe_audio_teardown(struct drm_i915_private *dev_priv);
> > +void intel_lpe_audio_irq_handler(struct drm_i915_private *dev_priv);
> >
Re: [Intel-gfx] [PATCH v5 1/5] drm/i915: setup bridge for HDMI LPE audio driver
On Wed, 25 Jan 2017, Jerome Anand wrote:
> Enable support for HDMI LPE audio mode on Baytrail and
> Cherrytrail when HDaudio controller is not detected
>
> Setup minimum required resources during i915_driver_load:
> 1. Create a platform device to share MMIO/IRQ resources
> 2. Make the platform device child of i915 device for runtime PM.
> 3. Create IRQ chip to forward HDMI LPE audio irqs.
>
> HDMI LPE audio driver (a standalone sound driver) probes the
> LPE audio device and creates a new sound card.
>
> Signed-off-by: Pierre-Louis Bossart
> Signed-off-by: Jerome Anand
Acked-by: Jani Nikula
> ---
> Documentation/gpu/i915.rst | 9 +
> drivers/gpu/drm/i915/Makefile | 3 +
> drivers/gpu/drm/i915/i915_drv.c| 4 +-
> drivers/gpu/drm/i915/i915_drv.h| 11 ++
> drivers/gpu/drm/i915/i915_irq.c| 16 ++
> drivers/gpu/drm/i915/i915_reg.h| 3 +
> drivers/gpu/drm/i915/intel_audio.c | 25 +++
> drivers/gpu/drm/i915/intel_drv.h | 2 +
> drivers/gpu/drm/i915/intel_lpe_audio.c | 321
> +
> include/drm/intel_lpe_audio.h | 46 +
> 10 files changed, 438 insertions(+), 2 deletions(-)
> create mode 100644 drivers/gpu/drm/i915/intel_lpe_audio.c
> create mode 100644 include/drm/intel_lpe_audio.h
>
> diff --git a/Documentation/gpu/i915.rst b/Documentation/gpu/i915.rst
> index 104296d..bd9b767 100644
> --- a/Documentation/gpu/i915.rst
> +++ b/Documentation/gpu/i915.rst
> @@ -225,6 +225,15 @@ Display PLLs
> .. kernel-doc:: drivers/gpu/drm/i915/intel_dpll_mgr.h
> :internal:
>
> +intel hdmi lpe audio support
> +
> +
> +.. kernel-doc:: drivers/gpu/drm/i915/intel_lpe_audio.c
> + :doc: LPE Audio integration for HDMI or DP playback
> +
> +.. kernel-doc:: drivers/gpu/drm/i915/intel_lpe_audio.c
> + :internal:
> +
> Memory Management and Command Submission
>
>
> diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
> index 74ca2e8..c62ab45 100644
> --- a/drivers/gpu/drm/i915/Makefile
> +++ b/drivers/gpu/drm/i915/Makefile
> @@ -129,6 +129,9 @@ i915-y += intel_gvt.o
> include $(src)/gvt/Makefile
> endif
>
> +# LPE Audio for VLV and CHT
> +i915-y += intel_lpe_audio.o
> +
> obj-$(CONFIG_DRM_I915) += i915.o
>
> CFLAGS_i915_trace_points.o := -I$(src)
> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> index ca168b2..2e0574c 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -1140,7 +1140,7 @@ static void i915_driver_register(struct
> drm_i915_private *dev_priv)
> if (IS_GEN5(dev_priv))
> intel_gpu_ips_init(dev_priv);
>
> - i915_audio_component_init(dev_priv);
> + intel_audio_init(dev_priv);
>
> /*
>* Some ports require correctly set-up hpd registers for detection to
> @@ -1158,7 +1158,7 @@ static void i915_driver_register(struct
> drm_i915_private *dev_priv)
> */
> static void i915_driver_unregister(struct drm_i915_private *dev_priv)
> {
> - i915_audio_component_cleanup(dev_priv);
> + intel_audio_deinit(dev_priv);
>
> intel_gpu_ips_teardown();
> acpi_video_unregister();
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index 2446280..8b68f900 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -2454,6 +2454,12 @@ struct drm_i915_private {
> /* Used to save the pipe-to-encoder mapping for audio */
> struct intel_encoder *av_enc_map[I915_MAX_PIPES];
>
> + /* necessary resource sharing with HDMI LPE audio driver. */
> + struct {
> + struct platform_device *platdev;
> + int irq;
> + } lpe_audio;
> +
> /*
>* NOTE: This is the dri1/ums dungeon, don't add stuff here. Your patch
>* will be rejected. Instead look for a better place.
> @@ -3592,6 +3598,11 @@ extern int i915_restore_state(struct drm_i915_private
> *dev_priv);
> void i915_setup_sysfs(struct drm_i915_private *dev_priv);
> void i915_teardown_sysfs(struct drm_i915_private *dev_priv);
>
> +/* intel_lpe_audio.c */
> +int intel_lpe_audio_init(struct drm_i915_private *dev_priv);
> +void intel_lpe_audio_teardown(struct drm_i915_private *dev_priv);
> +void intel_lpe_audio_irq_handler(struct drm_i915_private *dev_priv);
> +
> /* intel_i2c.c */
> extern int intel_setup_gmbus(struct drm_i915_private *dev_priv);
> extern void intel_teardown_gmbus(struct drm_i915_private *dev_priv);
> diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
> index 6fefc34..47d6131 100644
> --- a/drivers/gpu/drm/i915/i915_irq.c
> +++ b/drivers/gpu/drm/i915/i915_irq.c
> @@ -1926,6 +1926,10 @@ static irqreturn_t valleyview_irq_handler(int irq,
> void *arg)
>* signalled in iir */
> valleyview_pipestat_irq_ack(dev_priv, iir, pipe_stats)
