Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
cloud-kernel
提交
633544a8
cloud-kernel
项目概览
openanolis
/
cloud-kernel
接近 2 年 前同步成功
通知
170
Star
36
Fork
7
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
10
列表
看板
标记
里程碑
合并请求
2
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
cloud-kernel
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
10
Issue
10
列表
看板
标记
里程碑
合并请求
2
合并请求
2
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
633544a8
编写于
1月 23, 2012
作者:
T
Takashi Iwai
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'fix/hda' into topic/hda
The fix for buffer-alignment is required for further works.
上级
eefad7fd
29c5fbbc
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
5 addition
and
4 deletion
+5
-4
sound/pci/hda/hda_intel.c
sound/pci/hda/hda_intel.c
+4
-2
sound/pci/hda/patch_conexant.c
sound/pci/hda/patch_conexant.c
+1
-1
sound/pci/hda/patch_realtek.c
sound/pci/hda/patch_realtek.c
+0
-1
未找到文件。
sound/pci/hda/hda_intel.c
浏览文件 @
633544a8
...
@@ -469,6 +469,7 @@ struct azx {
...
@@ -469,6 +469,7 @@ struct azx {
unsigned
int
irq_pending_warned
:
1
;
unsigned
int
irq_pending_warned
:
1
;
unsigned
int
probing
:
1
;
/* codec probing phase */
unsigned
int
probing
:
1
;
/* codec probing phase */
unsigned
int
snoop
:
1
;
unsigned
int
snoop
:
1
;
unsigned
int
align_buffer_size
:
1
;
/* for debugging */
/* for debugging */
unsigned
int
last_cmd
[
AZX_MAX_CODECS
];
unsigned
int
last_cmd
[
AZX_MAX_CODECS
];
...
@@ -1690,7 +1691,7 @@ static int azx_pcm_open(struct snd_pcm_substream *substream)
...
@@ -1690,7 +1691,7 @@ static int azx_pcm_open(struct snd_pcm_substream *substream)
runtime
->
hw
.
rates
=
hinfo
->
rates
;
runtime
->
hw
.
rates
=
hinfo
->
rates
;
snd_pcm_limit_hw_rates
(
runtime
);
snd_pcm_limit_hw_rates
(
runtime
);
snd_pcm_hw_constraint_integer
(
runtime
,
SNDRV_PCM_HW_PARAM_PERIODS
);
snd_pcm_hw_constraint_integer
(
runtime
,
SNDRV_PCM_HW_PARAM_PERIODS
);
if
(
align_buffer_size
)
if
(
chip
->
align_buffer_size
)
/* constrain buffer sizes to be multiple of 128
/* constrain buffer sizes to be multiple of 128
bytes. This is more efficient in terms of memory
bytes. This is more efficient in terms of memory
access but isn't required by the HDA spec and
access but isn't required by the HDA spec and
...
@@ -2773,8 +2774,9 @@ static int __devinit azx_create(struct snd_card *card, struct pci_dev *pci,
...
@@ -2773,8 +2774,9 @@ static int __devinit azx_create(struct snd_card *card, struct pci_dev *pci,
}
}
/* disable buffer size rounding to 128-byte multiples if supported */
/* disable buffer size rounding to 128-byte multiples if supported */
chip
->
align_buffer_size
=
align_buffer_size
;
if
(
chip
->
driver_caps
&
AZX_DCAPS_BUFSIZE
)
if
(
chip
->
driver_caps
&
AZX_DCAPS_BUFSIZE
)
align_buffer_size
=
0
;
chip
->
align_buffer_size
=
0
;
/* allow 64bit DMA address if supported by H/W */
/* allow 64bit DMA address if supported by H/W */
if
((
gcap
&
ICH6_GCAP_64OK
)
&&
!
pci_set_dma_mask
(
pci
,
DMA_BIT_MASK
(
64
)))
if
((
gcap
&
ICH6_GCAP_64OK
)
&&
!
pci_set_dma_mask
(
pci
,
DMA_BIT_MASK
(
64
)))
...
...
sound/pci/hda/patch_conexant.c
浏览文件 @
633544a8
...
@@ -3027,7 +3027,7 @@ static const struct snd_pci_quirk cxt5066_cfg_tbl[] = {
...
@@ -3027,7 +3027,7 @@ static const struct snd_pci_quirk cxt5066_cfg_tbl[] = {
SND_PCI_QUIRK
(
0x17aa
,
0x20f2
,
"Lenovo T400s"
,
CXT5066_THINKPAD
),
SND_PCI_QUIRK
(
0x17aa
,
0x20f2
,
"Lenovo T400s"
,
CXT5066_THINKPAD
),
SND_PCI_QUIRK
(
0x17aa
,
0x21c5
,
"Thinkpad Edge 13"
,
CXT5066_THINKPAD
),
SND_PCI_QUIRK
(
0x17aa
,
0x21c5
,
"Thinkpad Edge 13"
,
CXT5066_THINKPAD
),
SND_PCI_QUIRK
(
0x17aa
,
0x21c6
,
"Thinkpad Edge 13"
,
CXT5066_ASUS
),
SND_PCI_QUIRK
(
0x17aa
,
0x21c6
,
"Thinkpad Edge 13"
,
CXT5066_ASUS
),
SND_PCI_QUIRK
(
0x17aa
,
0x215e
,
"Lenovo Thinkpad"
,
CXT5066_THINKPAD
),
SND_PCI_QUIRK
(
0x17aa
,
0x215e
,
"Lenovo T510"
,
CXT5066_AUTO
),
SND_PCI_QUIRK
(
0x17aa
,
0x21cf
,
"Lenovo T520 & W520"
,
CXT5066_AUTO
),
SND_PCI_QUIRK
(
0x17aa
,
0x21cf
,
"Lenovo T520 & W520"
,
CXT5066_AUTO
),
SND_PCI_QUIRK
(
0x17aa
,
0x21da
,
"Lenovo X220"
,
CXT5066_THINKPAD
),
SND_PCI_QUIRK
(
0x17aa
,
0x21da
,
"Lenovo X220"
,
CXT5066_THINKPAD
),
SND_PCI_QUIRK
(
0x17aa
,
0x21db
,
"Lenovo X220-tablet"
,
CXT5066_THINKPAD
),
SND_PCI_QUIRK
(
0x17aa
,
0x21db
,
"Lenovo X220-tablet"
,
CXT5066_THINKPAD
),
...
...
sound/pci/hda/patch_realtek.c
浏览文件 @
633544a8
...
@@ -640,7 +640,6 @@ static void alc_exec_unsol_event(struct hda_codec *codec, int action)
...
@@ -640,7 +640,6 @@ static void alc_exec_unsol_event(struct hda_codec *codec, int action)
/* unsolicited event for HP jack sensing */
/* unsolicited event for HP jack sensing */
static
void
alc_sku_unsol_event
(
struct
hda_codec
*
codec
,
unsigned
int
res
)
static
void
alc_sku_unsol_event
(
struct
hda_codec
*
codec
,
unsigned
int
res
)
{
{
struct
alc_spec
*
spec
=
codec
->
spec
;
if
(
codec
->
vendor_id
==
0x10ec0880
)
if
(
codec
->
vendor_id
==
0x10ec0880
)
res
>>=
28
;
res
>>=
28
;
else
else
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录