sdongles/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

intel_hda: Add AMD RavenRidge vendor:device ids.

Browse Source 
Also, set memory space bit in PCI Command register at initialization.
This enables sound at least on my laptop.

git-svn-id: svn://kolibrios.org@7737 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Ivan Baravy 2020-03-13 01:41:46 +00:00
parent 7b1eb2c733
commit 00f82ec9ff
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/audio/intel_hda/intel_hda.asm
View File

@ -137,6 +137,7 @@ CTRL_ATI_RV710 equ 0xaa40
CTRL_ATI_RV740 equ 0xaa48 CTRL_ATI_RV740 equ 0xaa48
; AMD ; AMD
CTRL_AMD_HUDSON equ 0x780d CTRL_AMD_HUDSON equ 0x780d
CTRL_AMD_RAVEN_RIDGE equ 0x15e3
; VIA ; VIA
CTRL_VIA_VT82XX equ 0x3288 CTRL_VIA_VT82XX equ 0x3288
CTRL_VIA_VT61XX equ 0x9140 CTRL_VIA_VT61XX equ 0x9140
@ -1131,9 +1132,11 @@ align 4
proc init_controller proc init_controller
invoke PciRead32, [ctrl.bus], [ctrl.devfn], dword 4 invoke PciRead32, [ctrl.bus], [ctrl.devfn], dword 4
test eax, 0x4 ; Test Master bit movi ebx, 0x6
jnz @f and ebx, eax
or eax, 0x4 ; Set Master bit cmp ebx, 0x6 ; Test Master and Memory bits
jz @f
or eax, 0x6 ; Set Master and Memory bits
invoke PciWrite32, [ctrl.bus], [ctrl.devfn], dword 4, eax invoke PciWrite32, [ctrl.bus], [ctrl.devfn], dword 4, eax
invoke PciRead32, [ctrl.bus], [ctrl.devfn], dword 4 invoke PciRead32, [ctrl.bus], [ctrl.devfn], dword 4
@@: @@:
@ -2816,6 +2819,7 @@ devices:
dd (CTRL_ATI_RV770 shl 16)+VID_ATI,msg_ATI_RV770, AZX_DRIVER_ATIHDMI dd (CTRL_ATI_RV770 shl 16)+VID_ATI,msg_ATI_RV770, AZX_DRIVER_ATIHDMI
; AMD ; AMD
dd (CTRL_AMD_HUDSON shl 16)+VID_AMD,msg_AMD_HUDSON, AZX_DRIVER_GENERIC dd (CTRL_AMD_HUDSON shl 16)+VID_AMD,msg_AMD_HUDSON, AZX_DRIVER_GENERIC
dd (CTRL_AMD_RAVEN_RIDGE shl 16)+VID_AMD,msg_AMD_RAVEN_RIDGE, AZX_DRIVER_GENERIC
; VIA ; VIA
dd (CTRL_VIA_VT82XX shl 16)+VID_VIA,msg_VIA_VT82XX, AZX_DRIVER_VIA dd (CTRL_VIA_VT82XX shl 16)+VID_VIA,msg_VIA_VT82XX, AZX_DRIVER_VIA
dd (CTRL_VIA_VT61XX shl 16)+VID_VIA,msg_VIA_VT61XX, AZX_DRIVER_GENERIC dd (CTRL_VIA_VT61XX shl 16)+VID_VIA,msg_VIA_VT61XX, AZX_DRIVER_GENERIC
@ -2912,6 +2916,7 @@ msg_ATI_RV770 db 'RV770', 13,10,0
msg_AMD db 'AMD ',0 msg_AMD db 'AMD ',0
msg_AMD_HUDSON db 'Hudson', 13,10,0 msg_AMD_HUDSON db 'Hudson', 13,10,0
msg_AMD_RAVEN_RIDGE db 'RavenRidge', 13,10,0
msg_VIA db 'VIA ',0 msg_VIA db 'VIA ',0
msg_VIA_VT82XX db 'VT8251/8237A', 13,10,0 msg_VIA_VT82XX db 'VT8251/8237A', 13,10,0

2
drivers/audio/sound.asm
View File

@ -143,6 +143,7 @@ CTRL_ATI_RV710 = 0xaa40
CTRL_ATI_RV740 = 0xaa48 CTRL_ATI_RV740 = 0xaa48
CTRL_AMD_HUDSON = 0x780d CTRL_AMD_HUDSON = 0x780d
CTRL_AMD_RAVEN_RIDGE = 0x15e3
CTRL_VIA_VT82XX = 0x3288 CTRL_VIA_VT82XX = 0x3288
CTRL_VIA_VT61XX = 0x9140 CTRL_VIA_VT61XX = 0x9140
@ -393,6 +394,7 @@ devices dd (CTRL_ICH shl 16)+VID_INTEL, intelac97
dd (CTRL_ATI_RV770 shl 16)+VID_ATI, intelhda dd (CTRL_ATI_RV770 shl 16)+VID_ATI, intelhda
; AMD ; AMD
dd (CTRL_AMD_HUDSON shl 16)+VID_AMD, intelhda dd (CTRL_AMD_HUDSON shl 16)+VID_AMD, intelhda
dd (CTRL_AMD_RAVEN_RIDGE shl 16)+VID_AMD, intelhda
; VIA ; VIA
dd (CTRL_VIA_VT82XX shl 16)+VID_VIA, intelhda dd (CTRL_VIA_VT82XX shl 16)+VID_VIA, intelhda
dd (CTRL_VIA_VT61XX shl 16)+VID_VIA, intelhda dd (CTRL_VIA_VT61XX shl 16)+VID_VIA, intelhda