Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 347de1f8 authored by Imre Deak's avatar Imre Deak Committed by Daniel Vetter
Browse files

ALSA: hda: export struct hda_intel 



This struct will be needed by the component code added in an upcoming
patch, so export it into a new hda_intel.h file. At the same time also
merge hda_i915.h into this new header, there is no reason to keep two
separate intel specific header file.

Suggested-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
Reviewed-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 58fddc28

sound/pci/hda/hda_i915.c

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
#include <sound/core.h>

#include <drm/i915_powerwell.h>

#include "hda_priv.h"

#include "hda_i915.h"

#include "hda_intel.h"



/* Intel HSW/BDW display HDA controller Extended Mode registers.

 * EM4 (M value) and EM5 (N Value) are used to convert CDClk (Core Display

sound/pci/hda/hda_intel.c

+1 −26
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ 
#include "hda_codec.h"

#include "hda_controller.h"

#include "hda_priv.h"

#include "hda_i915.h"

#include "hda_intel.h"



/* position fix mode */

enum {
@@ -354,31 +354,6 @@ static char *driver_short_names[] = { 
	[AZX_DRIVER_GENERIC] = "HD-Audio Generic",

};



struct hda_intel {

	struct azx chip;



	/* for pending irqs */

	struct work_struct irq_pending_work;



	/* sync probing */

	struct completion probe_wait;

	struct work_struct probe_work;



	/* card list (for power_save trigger) */

	struct list_head list;



	/* extra flags */

	unsigned int irq_pending_warned:1;



	/* VGA-switcheroo setup */

	unsigned int use_vga_switcheroo:1;

	unsigned int vga_switcheroo_registered:1;

	unsigned int init_failed:1; /* delayed init failed */



	/* secondary power domain for hdmi audio under vga device */

	struct dev_pm_domain hdmi_pm_domain;

};



#ifdef CONFIG_X86

static void __mark_pages_wc(struct azx *chip, struct snd_dma_buffer *dmab, bool on)

{

sound/pci/hda/hda_i915.h→sound/pci/hda/hda_intel.h

+29 −2
Original line number Diff line number Diff line
@@ -13,8 +13,35 @@ 
 *  this program; if not, write to the Free Software Foundation, Inc., 59

 *  Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

#ifndef __SOUND_HDA_I915_H

#define __SOUND_HDA_I915_H

#ifndef __SOUND_HDA_INTEL_H

#define __SOUND_HDA_INTEL_H



#include "hda_priv.h"



struct hda_intel {

	struct azx chip;



	/* for pending irqs */

	struct work_struct irq_pending_work;



	/* sync probing */

	struct completion probe_wait;

	struct work_struct probe_work;



	/* card list (for power_save trigger) */

	struct list_head list;



	/* extra flags */

	unsigned int irq_pending_warned:1;



	/* VGA-switcheroo setup */

	unsigned int use_vga_switcheroo:1;

	unsigned int vga_switcheroo_registered:1;

	unsigned int init_failed:1; /* delayed init failed */



	/* secondary power domain for hdmi audio under vga device */

	struct dev_pm_domain hdmi_pm_domain;

};



#ifdef CONFIG_SND_HDA_I915

int hda_display_power(bool enable);