From owner-freebsd-multimedia@FreeBSD.ORG Wed Dec 31 16:10:02 2008 Return-Path: Delivered-To: freebsd-multimedia@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D2A01106564A for ; Wed, 31 Dec 2008 16:10:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id BF1E68FC13 for ; Wed, 31 Dec 2008 16:10:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id mBVGA23L041887 for ; Wed, 31 Dec 2008 16:10:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id mBVGA26f041886; Wed, 31 Dec 2008 16:10:02 GMT (envelope-from gnats) Date: Wed, 31 Dec 2008 16:10:02 GMT Message-Id: <200812311610.mBVGA26f041886@freefall.freebsd.org> To: freebsd-multimedia@FreeBSD.org From: WATANABE Kazuhiro Cc: Subject: Re: kern/72995: [sound] Intel ICH2 (82801BA) - sound nearly inaudible X-BeenThere: freebsd-multimedia@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: WATANABE Kazuhiro List-Id: Multimedia discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 31 Dec 2008 16:10:03 -0000 The following reply was made to PR kern/72995; it has been noted by GNATS. From: WATANABE Kazuhiro To: "Russell J. Wood" , tom@uffner.com, bug-followup@FreeBSD.org Cc: Subject: Re: kern/72995: [sound] Intel ICH2 (82801BA) - sound nearly inaudible Date: Thu, 01 Jan 2009 00:45:52 +0900 Hello. At Sat, 27 Dec 2008 18:50:07 GMT, Russell J. Wood wrote: > I have just switched to an Intel D845WN motherboard and am experiencing > the same issue. > > Sound is very low even when the volume on my speakers are maxed. > > Regards, (1) Would you try the patch attached below? I don't know whether this patch is correct or not... (2) After applied the patch, can you hear any difference between the following commands? # sysctl dev.pcm.0.eapd=0 # sysctl dev.pcm.0.eapd=1 --- sys/dev/sound/pcm/ac97.c.releng70 2007-10-30 03:47:47.000000000 +0900 +++ sys/dev/sound/pcm/ac97.c 2008-12-31 17:26:45.000000000 +0900 @@ -133,7 +133,7 @@ { 0x41445303, 0x00, 0, "AD1819", 0 }, { 0x41445340, 0x00, 0, "AD1881", 0 }, { 0x41445348, 0x00, 0, "AD1881A", 0 }, - { 0x41445360, 0x00, 0, "AD1885", 0 }, + { 0x41445360, 0x00, 0, "AD1885", ad1885_patch }, { 0x41445361, 0x00, 0, "AD1886", ad1886_patch }, { 0x41445362, 0x00, 0, "AD1887", 0 }, { 0x41445363, 0x00, 0, "AD1886A", 0 }, @@ -141,8 +141,8 @@ { 0x41445370, 0x00, 0, "AD1980", ad198x_patch }, { 0x41445372, 0x00, 0, "AD1981A", 0 }, { 0x41445374, 0x00, 0, "AD1981B", ad1981b_patch }, - { 0x41445375, 0x00, 0, "AD1985", ad198x_patch }, - { 0x41445378, 0x00, 0, "AD1986", ad198x_patch }, + { 0x41445375, 0x00, 0, "AD1985", ad1985_patch }, + { 0x41445378, 0x00, 0, "AD1986", ad1986_patch }, { 0x414b4d00, 0x00, 1, "AK4540", 0 }, { 0x414b4d01, 0x00, 1, "AK4542", 0 }, { 0x414b4d02, 0x00, 1, "AK4543", 0 }, --- sys/dev/sound/pcm/ac97_patch.c.releng70 2007-10-30 03:47:27.000000000 +0900 +++ sys/dev/sound/pcm/ac97_patch.c 2008-12-31 18:01:41.000000000 +0900 @@ -30,6 +30,23 @@ SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/ac97_patch.c,v 1.10.2.1 2007/10/29 18:47:27 ariff Exp $"); +void ad1885_patch(struct ac97_info* codec) +{ +#define AC97_AD_JACK_SPDIF 0x72 + /* + * JS0 and EAPD shares the same pin (no.47). + * To use the EAPD function, we should disable jack sense(?). + */ + switch (ac97_getsubvendor(codec)) { + /* case 0xXXXXXXXX: */ + /* break; */ + default: + ac97_wrcd(codec, AC97_AD_JACK_SPDIF, + ac97_rdcd(codec, AC97_AD_JACK_SPDIF) | 0x1110); + break; + } +} + void ad1886_patch(struct ac97_info* codec) { #define AC97_AD_JACK_SPDIF 0x72 @@ -44,6 +61,9 @@ void ad198x_patch(struct ac97_info* codec) { + /* + * Swap the aim of the LINE_OUT and SURR_OUT/HP_OUT pins. + */ switch (ac97_getsubvendor(codec)) { case 0x11931043: /* Not for ASUS A9T (probably else too). */ break; @@ -69,6 +89,68 @@ } } +void ad1985_patch(struct ac97_info* codec) +{ + /* + * Swap the aim of the LINE_OUT and SURR_OUT/HP_OUT pins. + * Disable outputs of the LINE_OUT and CENTER_OUT/LFE_OUT pins. + * Select the CENTER_OUT/LFE_OUT pins as the MIC inputs. + * Enable the stereo microphone mode. + * + * Set the voltage of the VREFOUT pin. + */ + switch (ac97_getsubvendor(codec)) { + case 0x80f31043: /* ASUS P4P800 Deluxe (SE) */ + ac97_wrcd(codec, 0x76, ac97_rdcd(codec, 0x76) | 0x0420); + ac97_wrcd(codec, 0x76, ac97_rdcd(codec, 0x76) | 0x1800); + ac97_wrcd(codec, 0x74, ac97_rdcd(codec, 0x74) | 0x0200); + ac97_wrcd(codec, 0x76, ac97_rdcd(codec, 0x76) | 0x0040); + + /* + * 0x0 = 2.25V (default) + * 0x1 = High-Z + * 0x2 = 3.7V + * 0x3 = 0V + */ + ac97_wrcd(codec, 0x76, (ac97_rdcd(codec, 0x76) & ~0xc) + | 0x0 << 2); + break; + default: + break; + } +} + +void ad1986_patch(struct ac97_info* codec) +{ + /* + * Disable outputs of the SURR_OUT and CENTER_OUT/LFE_OUT pins. + * Select the SURR_OUT pins as the LINE_IN inputs. + * Select the CENTER_OUT/LFE_OUT pins as the MIC inputs. + * Enable the stereo microphone mode. + * + * Set the voltage of the C/LFE VREF_OUT pin. + */ + switch (ac97_getsubvendor(codec)) { + case 0x818f1043: /* ASUS P5SD2-X (SE) */ + ac97_wrcd(codec, 0x76, ac97_rdcd(codec, 0x76) | 0x1800); + ac97_wrcd(codec, 0x76, ac97_rdcd(codec, 0x76) | 0x0004); + ac97_wrcd(codec, 0x74, ac97_rdcd(codec, 0x74) | 0x0200); + ac97_wrcd(codec, 0x76, ac97_rdcd(codec, 0x76) | 0x0040); + + /* + * 0x0 = High-Z (default) + * 0x1 = 2.25V + * 0x2 = 0V + * 0x4 = 3.70V + */ + ac97_wrcd(codec, 0x70, (ac97_rdcd(codec, 0x70) & ~0x1c) + | 0x1 << 2); + break; + default: + break; + } +} + void cmi9739_patch(struct ac97_info* codec) { /* --- sys/dev/sound/pcm/ac97_patch.h.releng70 2007-04-19 22:54:22.000000000 +0900 +++ sys/dev/sound/pcm/ac97_patch.h 2008-12-31 17:44:18.000000000 +0900 @@ -28,8 +28,11 @@ typedef void (*ac97_patch)(struct ac97_info*); +void ad1885_patch(struct ac97_info*); void ad1886_patch(struct ac97_info*); void ad198x_patch(struct ac97_info*); void ad1981b_patch(struct ac97_info*); +void ad1985_patch(struct ac97_info*); +void ad1986_patch(struct ac97_info*); void cmi9739_patch(struct ac97_info*); void alc655_patch(struct ac97_info*); --- WATANABE Kazuhiro (CQG00620@nifty.ne.jp)