On Thu, 26 Jan 2017, Takashi Iwai <tiwai@xxxxxxx> 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 <jerome.anand@xxxxxxxxx> 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 <pierre-louis.bossart@xxxxxxxxxxxxxxx>
>> > > Signed-off-by: Jerome Anand <jerome.anand@xxxxxxxxx>
>> >
>> > Acked-by: Jani Nikula <jani.nikula@xxxxxxxxx>
>> >
>> > > ---
>> > > 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 <tiwai@xxxxxxx>
> 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 <tiwai@xxxxxxx>
> ---
> 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@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
