From patchwork Thu Jan 26 09:55:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Takashi Iwai X-Patchwork-Id: 9538725 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4CEDC601D7 for ; Thu, 26 Jan 2017 09:55:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 411E0269DA for ; Thu, 26 Jan 2017 09:55:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 35FE028178; Thu, 26 Jan 2017 09:55:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C5F25269DA for ; Thu, 26 Jan 2017 09:55:06 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5E2CC6EB13; Thu, 26 Jan 2017 09:55:06 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0FA8B6EB13 for ; Thu, 26 Jan 2017 09:55:05 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 4CB46AC0D; Thu, 26 Jan 2017 09:55:01 +0000 (UTC) Date: Thu, 26 Jan 2017 10:55:00 +0100 Message-ID: From: Takashi Iwai To: Daniel Vetter In-Reply-To: <20170126092147.pfxhj6l3hxceskuv@phenom.ffwll.local> References: <20170124225753.9045-1-jerome.anand@intel.com> <20170124225753.9045-2-jerome.anand@intel.com> <87a8ag7fph.fsf@intel.com> <20170126092147.pfxhj6l3hxceskuv@phenom.ffwll.local> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/25.1 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Cc: alsa-devel@alsa-project.org, intel-gfx@lists.freedesktop.org, broonie@kernel.org, rakesh.a.ughreja@intel.com Subject: Re: [Intel-gfx] [PATCH v5 1/5] drm/i915: setup bridge for HDMI LPE audio driver X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP 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 ========================================