rpms/kernel/F-9 linux-2.6.27.7-alsa-driver-fixups.patch,1.1,1.2

[Chuck Ebbert]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7987

Modified Files:
	linux-2.6.27.7-alsa-driver-fixups.patch 
Log Message:
fix alsa build on ppc

linux-2.6.27.7-alsa-driver-fixups.patch:

Index: linux-2.6.27.7-alsa-driver-fixups.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/linux-2.6.27.7-alsa-driver-fixups.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6.27.7-alsa-driver-fixups.patch	3 Dec 2008 09:14:00 -0000	1.1
+++ linux-2.6.27.7-alsa-driver-fixups.patch	3 Dec 2008 13:32:03 -0000	1.2
@@ -240,3 +240,143 @@
  void __devinit olpc_prequirks(struct snd_card *card,
  		struct snd_ac97_template *ac97);
  int __devinit olpc_quirks(struct snd_card *card, struct snd_ac97 *ac97);
+From: Takashi Iwai <tiwai at suse.de>
+Date: Mon, 20 Oct 2008 06:05:10 +0000 (+0200)
+Subject: ps3: Add passthru support for non-audio streams
+X-Git-Tag: v2.6.28-rc1~20^2~1^3~1
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=64931a4be03dbc49bd50d10d211592cf98b523bb
+
+ps3: Add passthru support for non-audio streams
+
+Add support for the channel status bit setting so that non-PCM
+data stream can be sent (i.e. pass-through) via SPDIF/HDMI.
+
+Signed-off-by: Masakazu Mokuno <mokuno at sm.sony.co.jp>
+Acked-by: Geert Uytterhoeven <Geert.Uytterhoeven at sonycom.com>
+Signed-off-by: Takashi Iwai <tiwai at suse.de>
+---
+
+diff --git a/arch/powerpc/include/asm/ps3av.h b/arch/powerpc/include/asm/ps3av.h
+index d30bde2..5aa22cf 100644
+--- a/arch/powerpc/include/asm/ps3av.h
++++ b/arch/powerpc/include/asm/ps3av.h
+@@ -678,6 +678,8 @@ struct ps3av_pkt_avb_param {
+ 	u8 buf[PS3AV_PKT_AVB_PARAM_MAX_BUF_SIZE];
+ };
+ 
++/* channel status */
++extern u8 ps3av_mode_cs_info[];
+ 
+ /** command status **/
+ #define PS3AV_STATUS_SUCCESS			0x0000	/* success */
+diff --git a/drivers/ps3/ps3av_cmd.c b/drivers/ps3/ps3av_cmd.c
+index 7f880c2..11eb503 100644
+--- a/drivers/ps3/ps3av_cmd.c
++++ b/drivers/ps3/ps3av_cmd.c
+@@ -660,9 +660,10 @@ u32 ps3av_cmd_set_av_audio_param(void *p, u32 port,
+ }
+ 
+ /* default cs val */
+-static const u8 ps3av_mode_cs_info[] = {
++u8 ps3av_mode_cs_info[] = {
+ 	0x00, 0x09, 0x00, 0x02, 0x01, 0x00, 0x00, 0x00
+ };
++EXPORT_SYMBOL_GPL(ps3av_mode_cs_info);
+ 
+ #define CS_44	0x00
+ #define CS_48	0x02
+@@ -677,7 +678,7 @@ void ps3av_cmd_set_audio_mode(struct ps3av_pkt_audio_mode *audio, u32 avport,
+ 			      u32 ch, u32 fs, u32 word_bits, u32 format,
+ 			      u32 source)
+ {
+-	int spdif_through, spdif_bitstream;
++	int spdif_through;
+ 	int i;
+ 
+ 	if (!(ch | fs | format | word_bits | source)) {
+@@ -687,7 +688,6 @@ void ps3av_cmd_set_audio_mode(struct ps3av_pkt_audio_mode *audio, u32 avport,
+ 		format = PS3AV_CMD_AUDIO_FORMAT_PCM;
+ 		source = PS3AV_CMD_AUDIO_SOURCE_SERIAL;
+ 	}
+-	spdif_through = spdif_bitstream = 0;	/* XXX not supported */
+ 
+ 	/* audio mode */
+ 	memset(audio, 0, sizeof(*audio));
+@@ -777,16 +777,17 @@ void ps3av_cmd_set_audio_mode(struct ps3av_pkt_audio_mode *audio, u32 avport,
+ 		break;
+ 	}
+ 
++	/* non-audio bit */
++	spdif_through = audio->audio_cs_info[0] & 0x02;
++
+ 	/* pass through setting */
+ 	if (spdif_through &&
+ 	    (avport == PS3AV_CMD_AVPORT_SPDIF_0 ||
+-	     avport == PS3AV_CMD_AVPORT_SPDIF_1)) {
++	     avport == PS3AV_CMD_AVPORT_SPDIF_1 ||
++	     avport == PS3AV_CMD_AVPORT_HDMI_0 ||
++	     avport == PS3AV_CMD_AVPORT_HDMI_1)) {
+ 		audio->audio_word_bits = PS3AV_CMD_AUDIO_WORD_BITS_16;
+-		audio->audio_source = PS3AV_CMD_AUDIO_SOURCE_SPDIF;
+-		if (spdif_bitstream) {
+-			audio->audio_format = PS3AV_CMD_AUDIO_FORMAT_BITSTREAM;
+-			audio->audio_cs_info[0] |= CS_BIT;
+-		}
++		audio->audio_format = PS3AV_CMD_AUDIO_FORMAT_BITSTREAM;
+ 	}
+ }
+ 
+From: Masakazu Mokuno <mokuno at sm.sony.co.jp>
+Date: Mon, 20 Oct 2008 06:03:33 +0000 (+0200)
+Subject: ps3: Add ps3av_audio_mute_analog()
+X-Git-Tag: v2.6.28-rc1~20^2~1^3~2
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=756ba83ee370fbf62643777e7ba4a4f05932f6fb
+
+ps3: Add ps3av_audio_mute_analog()
+
+Add support for muting the analog output so that it does not
+play noises while non-PCM data is played.
+
+Signed-off-by: Masakazu Mokuno <mokuno at sm.sony.co.jp>
+Signed-off-by: Takashi Iwai <tiwai at suse.de>
+---
+
+diff --git a/arch/powerpc/include/asm/ps3av.h b/arch/powerpc/include/asm/ps3av.h
+index fda9871..d30bde2 100644
+--- a/arch/powerpc/include/asm/ps3av.h
++++ b/arch/powerpc/include/asm/ps3av.h
+@@ -735,6 +735,7 @@ extern int ps3av_get_mode(void);
+ extern int ps3av_video_mode2res(u32, u32 *, u32 *);
+ extern int ps3av_video_mute(int);
+ extern int ps3av_audio_mute(int);
++extern int ps3av_audio_mute_analog(int);
+ extern int ps3av_dev_open(void);
+ extern int ps3av_dev_close(void);
+ extern void ps3av_register_flip_ctl(void (*flip_ctl)(int on, void *data),
+diff --git a/drivers/ps3/ps3av.c b/drivers/ps3/ps3av.c
+index 6f2f90e..06848b2 100644
+--- a/drivers/ps3/ps3av.c
++++ b/drivers/ps3/ps3av.c
+@@ -915,6 +915,22 @@ int ps3av_video_mute(int mute)
+ 
+ EXPORT_SYMBOL_GPL(ps3av_video_mute);
+ 
++/* mute analog output only */
++int ps3av_audio_mute_analog(int mute)
++{
++	int i, res;
++
++	for (i = 0; i < ps3av->av_hw_conf.num_of_avmulti; i++) {
++		res = ps3av_cmd_av_audio_mute(1,
++			&ps3av->av_port[i + ps3av->av_hw_conf.num_of_hdmi],
++			mute);
++		if (res < 0)
++			return -1;
++	}
++	return 0;
++}
++EXPORT_SYMBOL_GPL(ps3av_audio_mute_analog);
++
+ int ps3av_audio_mute(int mute)
+ {
+ 	return ps3av_set_audio_mute(mute ? PS3AV_CMD_MUTE_ON