Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
351892a8
Commit
351892a8
authored
Nov 27, 2013
by
Takashi Iwai
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'topic/hda' into for-next
parents
d2208ca0
0e24dbb7
Changes
7
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
166 additions
and
70 deletions
+166
-70
sound/pci/hda/Makefile
sound/pci/hda/Makefile
+4
-1
sound/pci/hda/hda_codec.c
sound/pci/hda/hda_codec.c
+140
-45
sound/pci/hda/hda_codec.h
sound/pci/hda/hda_codec.h
+7
-1
sound/pci/hda/hda_generic.c
sound/pci/hda/hda_generic.c
+4
-0
sound/pci/hda/hda_intel.c
sound/pci/hda/hda_intel.c
+1
-1
sound/pci/hda/hda_local.h
sound/pci/hda/hda_local.h
+1
-7
sound/pci/hda/patch_hdmi.c
sound/pci/hda/patch_hdmi.c
+9
-15
No files found.
sound/pci/hda/Makefile
View file @
351892a8
...
...
@@ -3,7 +3,6 @@ snd-hda-intel-objs := hda_intel.o
snd-hda-intel-$(CONFIG_SND_HDA_I915)
+=
hda_i915.o
snd-hda-codec-y
:=
hda_codec.o hda_jack.o hda_auto_parser.o
snd-hda-codec-$(CONFIG_SND_HDA_GENERIC)
+=
hda_generic.o
snd-hda-codec-$(CONFIG_PROC_FS)
+=
hda_proc.o
snd-hda-codec-$(CONFIG_SND_HDA_HWDEP)
+=
hda_hwdep.o
snd-hda-codec-$(CONFIG_SND_HDA_INPUT_BEEP)
+=
hda_beep.o
...
...
@@ -12,6 +11,7 @@ snd-hda-codec-$(CONFIG_SND_HDA_INPUT_BEEP) += hda_beep.o
CFLAGS_hda_codec.o
:=
-I
$(src)
CFLAGS_hda_intel.o
:=
-I
$(src)
snd-hda-codec-generic-objs
:=
hda_generic.o
snd-hda-codec-realtek-objs
:=
patch_realtek.o
snd-hda-codec-cmedia-objs
:=
patch_cmedia.o
snd-hda-codec-analog-objs
:=
patch_analog.o
...
...
@@ -28,6 +28,9 @@ snd-hda-codec-hdmi-objs := patch_hdmi.o hda_eld.o
obj-$(CONFIG_SND_HDA_INTEL)
:=
snd-hda-codec.o
# codec drivers (note: CONFIG_SND_HDA_CODEC_XXX are booleans)
ifdef
CONFIG_SND_HDA_GENERIC
obj-$(CONFIG_SND_HDA_INTEL)
+=
snd-hda-codec-generic.o
endif
ifdef
CONFIG_SND_HDA_CODEC_REALTEK
obj-$(CONFIG_SND_HDA_INTEL)
+=
snd-hda-codec-realtek.o
endif
...
...
sound/pci/hda/hda_codec.c
View file @
351892a8
This diff is collapsed.
Click to expand it.
sound/pci/hda/hda_codec.h
View file @
351892a8
...
...
@@ -673,6 +673,7 @@ struct hda_bus {
/* codec linked list */
struct
list_head
codec_list
;
unsigned
int
num_codecs
;
/* link caddr -> codec */
struct
hda_codec
*
caddr_tbl
[
HDA_MAX_CODEC_ADDRESS
+
1
];
...
...
@@ -683,6 +684,9 @@ struct hda_bus {
struct
hda_bus_unsolicited
*
unsol
;
char
workq_name
[
16
];
struct
workqueue_struct
*
workq
;
/* common workqueue for codecs */
#ifdef CONFIG_PM
struct
workqueue_struct
*
pm_wq
;
/* workqueue to parallel codec PM */
#endif
/* assigned PCMs */
DECLARE_BITMAP
(
pcm_dev_bits
,
SNDRV_PCM_DEVICES
);
...
...
@@ -834,6 +838,7 @@ struct hda_codec {
/* detected preset */
const
struct
hda_codec_preset
*
preset
;
struct
module
*
owner
;
int
(
*
parser
)(
struct
hda_codec
*
codec
);
const
char
*
vendor_name
;
/* codec vendor name */
const
char
*
chip_name
;
/* codec chip name */
const
char
*
modelname
;
/* model name for preset */
...
...
@@ -907,7 +912,7 @@ struct hda_codec {
#ifdef CONFIG_PM
unsigned
int
power_on
:
1
;
/* current (global) power-state */
unsigned
int
d3_stop_clk
:
1
;
/* support D3 operation without BCLK */
unsigned
int
pm_
down_notified
:
1
;
/* PM notified to controller */
unsigned
int
pm_
up_notified
:
1
;
/* PM notified to controller */
unsigned
int
in_pm
:
1
;
/* suspend/resume being performed */
int
power_transition
;
/* power-state in transition */
int
power_count
;
/* current (global) power refcount */
...
...
@@ -916,6 +921,7 @@ struct hda_codec {
unsigned
long
power_off_acct
;
unsigned
long
power_jiffies
;
spinlock_t
power_lock
;
struct
work_struct
pm_work
;
/* task to parallel multi-codec PM */
#endif
/* filter the requested power state per nid */
...
...
sound/pci/hda/hda_generic.c
View file @
351892a8
...
...
@@ -28,6 +28,7 @@
#include <linux/ctype.h>
#include <linux/string.h>
#include <linux/bitops.h>
#include <linux/module.h>
#include <sound/core.h>
#include <sound/jack.h>
#include "hda_codec.h"
...
...
@@ -5291,3 +5292,6 @@ int snd_hda_parse_generic_codec(struct hda_codec *codec)
return
err
;
}
EXPORT_SYMBOL_HDA
(
snd_hda_parse_generic_codec
);
MODULE_LICENSE
(
"GPL"
);
MODULE_DESCRIPTION
(
"Generic HD-audio codec parser"
);
sound/pci/hda/hda_intel.c
View file @
351892a8
...
...
@@ -3978,7 +3978,7 @@ static DEFINE_PCI_DEVICE_TABLE(azx_ids) = {
.
driver_data
=
AZX_DRIVER_PCH
|
AZX_DCAPS_INTEL_PCH_NOPM
},
/* Panther Point */
{
PCI_DEVICE
(
0x8086
,
0x1e20
),
.
driver_data
=
AZX_DRIVER_PCH
|
AZX_DCAPS_INTEL_PCH
_NOPM
},
.
driver_data
=
AZX_DRIVER_PCH
|
AZX_DCAPS_INTEL_PCH
},
/* Lynx Point */
{
PCI_DEVICE
(
0x8086
,
0x8c20
),
.
driver_data
=
AZX_DRIVER_PCH
|
AZX_DCAPS_INTEL_PCH
},
...
...
sound/pci/hda/hda_local.h
View file @
351892a8
...
...
@@ -352,14 +352,8 @@ int snd_hda_multi_out_analog_cleanup(struct hda_codec *codec,
/*
* generic codec parser
*/
#ifdef CONFIG_SND_HDA_GENERIC
int
snd_hda_parse_generic_codec
(
struct
hda_codec
*
codec
);
#else
static
inline
int
snd_hda_parse_generic_codec
(
struct
hda_codec
*
codec
)
{
return
-
ENODEV
;
}
#endif
int
snd_hda_parse_hdmi_codec
(
struct
hda_codec
*
codec
);
/*
* generic proc interface
...
...
sound/pci/hda/patch_hdmi.c
View file @
351892a8
...
...
@@ -1692,21 +1692,6 @@ static int hdmi_parse_codec(struct hda_codec *codec)
}
}
#ifdef CONFIG_PM
/* We're seeing some problems with unsolicited hot plug events on
* PantherPoint after S3, if this is not enabled */
if
(
codec
->
vendor_id
==
0x80862806
)
codec
->
bus
->
power_keep_link_on
=
1
;
/*
* G45/IbexPeak don't support EPSS: the unsolicited pin hot plug event
* can be lost and presence sense verb will become inaccurate if the
* HDA link is powered off at hot plug or hw initialization time.
*/
else
if
(
!
(
snd_hda_param_read
(
codec
,
codec
->
afg
,
AC_PAR_POWER_STATE
)
&
AC_PWRST_EPSS
))
codec
->
bus
->
power_keep_link_on
=
1
;
#endif
return
0
;
}
...
...
@@ -3213,6 +3198,15 @@ static int patch_via_hdmi(struct hda_codec *codec)
return
patch_simple_hdmi
(
codec
,
VIAHDMI_CVT_NID
,
VIAHDMI_PIN_NID
);
}
/*
* called from hda_codec.c for generic HDMI support
*/
int
snd_hda_parse_hdmi_codec
(
struct
hda_codec
*
codec
)
{
return
patch_generic_hdmi
(
codec
);
}
EXPORT_SYMBOL_HDA
(
snd_hda_parse_hdmi_codec
);
/*
* patch entries
*/
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment