linux-next: Tree for June 20

linux-next: Tree for June 20

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 9077 bytes --]

Hi all,

Changes since next-20080619:

The net tree lost its conflict against Linus' tree.

The bkl-removal tree lost a conflict.

----------------------------------------------------------------------------

I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git
(patches at
http://www.kernel.org/pub/linux/kernel/people/sfr/linux-next/).  If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one.  You should use "git fetch" as mentioned in the FAQ on the wiki
(see below).

You can see which trees have been included by looking in the Next/Trees
file in the source.  There are also quilt-import.log and merge.log files
in the Next directory.  Between each merge, the tree was built with
a ppc64_defconfig for powerpc and an allmodconfig for x86_64. After the
final fixups, it is also built with powerpc allnoconfig,
44x_defconfig and allyesconfig and i386, sparc and sparc64 defconfig.

Below is a summary of the state of the merge.

We are up to 92 trees (counting Linus' and 13 trees of patches pending for
Linus' tree), more are welcome (even if they are currently empty).
Thanks to those who have contributed, and to those who haven't, please do.

Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next .  If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.

Thanks to Jan Dittmer for adding the linux-next tree to his build tests
at http://l4x.org/k/ , the guys at http://test.kernel.org/ and Randy
Dunlap for doing many randconfig builds.

There is a wiki covering stuff to do with linux-next at
http://linux.f-seidel.de/linux-next/pmwiki/ .  Thanks to Frank Seidel.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

$ git checkout master
$ git reset --hard stable
Merging origin/master
Merging powerpc-merge/merge
Merging scsi-rc-fixes/master
Merging net-current/master
Merging sparc-current/master
Merging sound-current/for-linus
Merging arm-current/master
Merging pci-current/for-linus
Merging wireless-current/master
Merging kbuild-current/master
Merging quilt/driver-core.current
Merging quilt/usb.current
Merging cpufreq-current/fixes
Merging input-current/for-linus
Merging quilt/driver-core
CONFLICT (content): Merge conflict in drivers/scsi/hosts.c
Merging quilt/usb
Merging tip-core/auto-core-next
Merging cpus4096/auto-cpus4096-next
Merging ftrace/auto-ftrace-next
Merging genirq/auto-genirq-next
Merging safe-poison-pointers/auto-safe-poison-pointers-next
Merging sched/auto-sched-next
CONFLICT (content): Merge conflict in kernel/Makefile
Applying ftrace: fix rculist split fallout
Merging stackprotector/auto-stackprotector-next
Merging timers/auto-timers-next
Merging x86/auto-x86-next
CONFLICT (content): Merge conflict in arch/x86/kernel/process_32.c
CONFLICT (content): Merge conflict in arch/x86/kernel/process_64.c
Merging pci/linux-next
CONFLICT (content): Merge conflict in arch/x86/pci/irq.c
CONFLICT (content): Merge conflict in include/linux/device.h
Merging quilt/device-mapper
Merging hid/mm
Merging quilt/i2c
CONFLICT (content): Merge conflict in drivers/i2c/i2c-core.c
Merging quilt/kernel-doc
Merging avr32/avr32-arch
Merging v4l-dvb/stable
Merging s390/features
CONFLICT (content): Merge conflict in drivers/s390/block/dasd.c
CONFLICT (content): Merge conflict in drivers/s390/block/dasd_eckd.c
CONFLICT (content): Merge conflict in drivers/s390/block/dasd_fba.c
CONFLICT (content): Merge conflict in drivers/s390/char/tape_core.c
CONFLICT (content): Merge conflict in drivers/s390/cio/device_fsm.c
CONFLICT (content): Merge conflict in drivers/s390/net/claw.c
CONFLICT (content): Merge conflict in drivers/s390/net/ctcm_main.c
CONFLICT (content): Merge conflict in drivers/s390/net/lcs.c
Merging sh/master
Merging jfs/next
Merging kbuild/master
Merging quilt/ide
Merging libata/NEXT
Merging nfs/linux-next
Created commit b075f50: Revert "NFS: handle interface identifiers in incoming IPv6 addresses"
Merging xfs/master
Merging infiniband/for-next
Merging acpi/test
CONFLICT (content): Merge conflict in drivers/acpi/processor_throttling.c
CONFLICT (content): Merge conflict in drivers/acpi/sleep/main.c
Merging blackfin/for-linus
Merging nfsd/nfsd-next
CONFLICT (content): Merge conflict in net/sunrpc/auth_gss/auth_gss.c
CONFLICT (content): Merge conflict in net/sunrpc/svc.c
Merging ieee1394/for-next
Merging hwmon/testing
Merging ubi/master
Merging kvm/master
Merging dlm/next
Merging scsi/master
Applying scsi: fix fallout from the class_find_device API change
Applying scsi: fix fallout from KOBJ_NAME_LEN removal
Merging ia64/test
Merging tests/master
CONFLICT (content): Merge conflict in lib/Kconfig.debug
Merging ocfs2/linux-next
Merging selinux/for-akpm
Merging quilt/m68k
Merging powerpc/powerpc-next
Merging lblnet/master
Merging ext4/next
Merging 4xx/next
Merging async_tx/next
Merging udf/for_next
Merging security-testing/next
Merging net/master
CONFLICT (content): Merge conflict in Documentation/powerpc/booting-without-of.txt
Applying wireless: fix fallout from device_create removal
Merging sparc/master
CONFLICT (content): Merge conflict in include/asm-m68k/sbus.h
Merging galak/powerpc-next
CONFLICT (content): Merge conflict in Documentation/powerpc/booting-without-of.txt
Merging mtd/master
Merging wireless/master
Merging crypto/master
Merging vfs/vfs-2.6.25
Merging sound/master
Merging arm/devel
CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-yl-9200.c
CONFLICT (content): Merge conflict in arch/arm/mach-pxa/tosa.c
Applying Fix Kconfig entry for TC6393XB
Merging cpufreq/next
CONFLICT (content): Merge conflict in drivers/cpufreq/cpufreq.c
Merging v9fs/for-next
Merging quilt/rr
Merging cifs/master
Merging mmc/next
Merging gfs2/master
Merging input/next
Merging semaphore/semaphore
Merging semaphore-removal/semaphore-removal
CONFLICT (content): Merge conflict in drivers/net/ps3_gelic_wireless.c
CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_attr.c
CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_def.h
CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_mbx.c
CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_mid.c
CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_os.c
Merging bkl-removal/bkl-removal
Merging trivial/next
Merging ubifs/for_andrew
Merging lsm/for-next
Merging block/for-next
CONFLICT (content): Merge conflict in arch/powerpc/Kconfig
CONFLICT (content): Merge conflict in arch/x86/kernel/apic_32.c
CONFLICT (delete/modify): arch/x86/kernel/i8259_64.c deleted in HEAD and modified in block/for-next. Version block/for-next of arch/x86/kernel/i8259_64.c left in tree.
CONFLICT (content): Merge conflict in arch/x86/xen/smp.c
CONFLICT (delete/modify): include/asm-x86/hw_irq_32.h deleted in HEAD and modified in block/for-next. Version block/for-next of include/asm-x86/hw_irq_32.h left in tree.
CONFLICT (delete/modify): include/asm-x86/hw_irq_64.h deleted in HEAD and modified in block/for-next. Version block/for-next of include/asm-x86/hw_irq_64.h left in tree.
CONFLICT (delete/modify): include/asm-x86/mach-default/irq_vectors.h deleted in HEAD and modified in block/for-next. Version block/for-next of include/asm-x86/mach-default/irq_vectors.h left in tree.
CONFLICT (delete/modify): include/asm-x86/mach-voyager/irq_vectors.h deleted in HEAD and modified in block/for-next. Version block/for-next of include/asm-x86/mach-voyager/irq_vectors.h left in tree.
CONFLICT (content): Merge conflict in kernel/Makefile
Applying block: fix up rculist split fallout
Merging embedded/master
Merging firmware/master
CONFLICT (content): Merge conflict in drivers/char/ip2/ip2main.c
CONFLICT (content): Merge conflict in drivers/usb/misc/isight_firmware.c
CONFLICT (content): Merge conflict in drivers/usb/serial/Kconfig
CONFLICT (delete/modify): drivers/usb/serial/ti_fw_3410.h deleted in firmware/master and modified in HEAD. Version HEAD of drivers/usb/serial/ti_fw_3410.h left in tree.
CONFLICT (delete/modify): drivers/usb/serial/ti_fw_5052.h deleted in firmware/master and modified in HEAD. Version HEAD of drivers/usb/serial/ti_fw_5052.h left in tree.
CONFLICT (content): Merge conflict in drivers/usb/serial/ti_usb_3410_5052.c
CONFLICT (content): Merge conflict in sound/pci/Kconfig
CONFLICT (content): Merge conflict in sound/pci/maestro3.c
CONFLICT (content): Merge conflict in sound/pci/ymfpci/ymfpci_main.c
Merging pcmcia/master
CONFLICT (content): Merge conflict in drivers/char/pcmcia/cm4000_cs.c
Merging battery/master
Merging leds/for-mm
Merging backlight/for-mm
CONFLICT (content): Merge conflict in drivers/video/backlight/Kconfig
CONFLICT (content): Merge conflict in drivers/video/backlight/Makefile
Merging kgdb/kgdb-next

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: Tree for June 20: [regression] No sound on SB600

[Rafael J. Wysocki]

On Friday, 20 of June 2008, Stephen Rothwell wrote:
> Hi all,
> 
> Changes since next-20080619:
> 
> The net tree lost its conflict against Linus' tree.
> 
> The bkl-removal tree lost a conflict.

On one of my test boxes with the ATI chipset (SB600 south bridge) there's no
sound output.  Bisection shows that the following commit causes this to happen
and reverting the commit fixes the problem for me:

commit cf97e6678f1e1e7bbdb566c36771540123832a31
Author: Takashi Iwai <tiwai@suse.de>
Date:   Mon Jun 16 15:47:26 2008 +0200

    ALSA: hda - Fix wrong volumes in AD1988 auto-probe mode
    
    Don't create mixer volume elements for Headphone and Speaker if they
    use the same DAC as normal line-outs on AD1988.  Otherwise the amp
    value gets screwed up, e.g.
    	https://bugzilla.novell.com/show_bug.cgi?id=398255
    
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

Please let me know if you need any additional information.

Thanks,
Rafael

Re: linux-next: Tree for June 20: [regression] No sound on SB600

[Takashi Iwai]

At Sat, 21 Jun 2008 17:28:09 +0200,
Rafael J. Wysocki wrote:
> 
> On Friday, 20 of June 2008, Stephen Rothwell wrote:
> > Hi all,
> > 
> > Changes since next-20080619:
> > 
> > The net tree lost its conflict against Linus' tree.
> > 
> > The bkl-removal tree lost a conflict.
> 
> On one of my test boxes with the ATI chipset (SB600 south bridge) there's no
> sound output.  Bisection shows that the following commit causes this to happen
> and reverting the commit fixes the problem for me:
> 
> commit cf97e6678f1e1e7bbdb566c36771540123832a31
> Author: Takashi Iwai <tiwai@suse.de>
> Date:   Mon Jun 16 15:47:26 2008 +0200
> 
>     ALSA: hda - Fix wrong volumes in AD1988 auto-probe mode
>     
>     Don't create mixer volume elements for Headphone and Speaker if they
>     use the same DAC as normal line-outs on AD1988.  Otherwise the amp
>     value gets screwed up, e.g.
>     	https://bugzilla.novell.com/show_bug.cgi?id=398255
>     
>     Signed-off-by: Takashi Iwai <tiwai@suse.de>
> 
> Please let me know if you need any additional information.

Could you run alsa-info.sh with --no-upload option and attach the
output for both states with and without that commit?  The script is
found at
	http://www.alsa-project.org/alsa-info.sh
Also, show the relevant kernel message from snd-hda-intel (informing
the auto-parsing of pins, etc), too.


thanks,

Takashi

Re: linux-next: Tree for June 20: [regression] No sound on SB600

[Rafael J. Wysocki]

On Saturday, 21 of June 2008, Takashi Iwai wrote:
> At Sat, 21 Jun 2008 17:28:09 +0200,
> Rafael J. Wysocki wrote:
> > 
> > On Friday, 20 of June 2008, Stephen Rothwell wrote:
> > > Hi all,
> > > 
> > > Changes since next-20080619:
> > > 
> > > The net tree lost its conflict against Linus' tree.
> > > 
> > > The bkl-removal tree lost a conflict.
> > 
> > On one of my test boxes with the ATI chipset (SB600 south bridge) there's no
> > sound output.  Bisection shows that the following commit causes this to happen
> > and reverting the commit fixes the problem for me:
> > 
> > commit cf97e6678f1e1e7bbdb566c36771540123832a31
> > Author: Takashi Iwai <tiwai@suse.de>
> > Date:   Mon Jun 16 15:47:26 2008 +0200
> > 
> >     ALSA: hda - Fix wrong volumes in AD1988 auto-probe mode
> >     
> >     Don't create mixer volume elements for Headphone and Speaker if they
> >     use the same DAC as normal line-outs on AD1988.  Otherwise the amp
> >     value gets screwed up, e.g.
> >     	https://bugzilla.novell.com/show_bug.cgi?id=398255
> >     
> >     Signed-off-by: Takashi Iwai <tiwai@suse.de>
> > 
> > Please let me know if you need any additional information.
> 
> Could you run alsa-info.sh with --no-upload option and attach the
> output for both states with and without that commit?  The script is
> found at
> 	http://www.alsa-project.org/alsa-info.sh
> Also, show the relevant kernel message from snd-hda-intel (informing
> the auto-parsing of pins, etc), too.

dmesg outputs and the outputs of 'alsa-info.sh --no-upload' for the kernel with
the patch applied (1) and with the reverted (2) are at:

http://www.sisk.pl/kernel/debug/20080620/box2/dmesg-1.log
http://www.sisk.pl/kernel/debug/20080620/box2/alsa-info-1.txt

http://www.sisk.pl/kernel/debug/20080620/box2/dmesg-2.log
http://www.sisk.pl/kernel/debug/20080620/box2/alsa-info-2.txt

Thanks,
Rafael

Re: linux-next: Tree for June 20: [regression] No sound on SB600

[Takashi Iwai]

At Sat, 21 Jun 2008 21:25:41 +0200,
Rafael J. Wysocki wrote:
> 
> On Saturday, 21 of June 2008, Takashi Iwai wrote:
> > At Sat, 21 Jun 2008 17:28:09 +0200,
> > Rafael J. Wysocki wrote:
> > > 
> > > On Friday, 20 of June 2008, Stephen Rothwell wrote:
> > > > Hi all,
> > > > 
> > > > Changes since next-20080619:
> > > > 
> > > > The net tree lost its conflict against Linus' tree.
> > > > 
> > > > The bkl-removal tree lost a conflict.
> > > 
> > > On one of my test boxes with the ATI chipset (SB600 south bridge) there's no
> > > sound output.  Bisection shows that the following commit causes this to happen
> > > and reverting the commit fixes the problem for me:
> > > 
> > > commit cf97e6678f1e1e7bbdb566c36771540123832a31
> > > Author: Takashi Iwai <tiwai@suse.de>
> > > Date:   Mon Jun 16 15:47:26 2008 +0200
> > > 
> > >     ALSA: hda - Fix wrong volumes in AD1988 auto-probe mode
> > >     
> > >     Don't create mixer volume elements for Headphone and Speaker if they
> > >     use the same DAC as normal line-outs on AD1988.  Otherwise the amp
> > >     value gets screwed up, e.g.
> > >     	https://bugzilla.novell.com/show_bug.cgi?id=398255
> > >     
> > >     Signed-off-by: Takashi Iwai <tiwai@suse.de>
> > > 
> > > Please let me know if you need any additional information.
> > 
> > Could you run alsa-info.sh with --no-upload option and attach the
> > output for both states with and without that commit?  The script is
> > found at
> > 	http://www.alsa-project.org/alsa-info.sh
> > Also, show the relevant kernel message from snd-hda-intel (informing
> > the auto-parsing of pins, etc), too.
> 
> dmesg outputs and the outputs of 'alsa-info.sh --no-upload' for the kernel with
> the patch applied (1) and with the reverted (2) are at:
> 
> http://www.sisk.pl/kernel/debug/20080620/box2/dmesg-1.log
> http://www.sisk.pl/kernel/debug/20080620/box2/alsa-info-1.txt
> 
> http://www.sisk.pl/kernel/debug/20080620/box2/dmesg-2.log
> http://www.sisk.pl/kernel/debug/20080620/box2/alsa-info-2.txt

Well, this is actually no regression but an unlucky side-effect of the
fix.

In the old version, "Front" volume didn't work properly because of
confliction with a bogus "Headphone" volume.  Now, a wrong volume
element is removed but only "Front" remains while "Front" wasn't set
up properly.

In short, the below should fix the problem:

	% amixer set Front 90%


thanks,

Takashi

Re: linux-next: Tree for June 20: [regression] No sound on SB600

[Rafael J. Wysocki]

On Monday, 23 of June 2008, Takashi Iwai wrote:
> At Sat, 21 Jun 2008 21:25:41 +0200,
> Rafael J. Wysocki wrote:
> > 
> > On Saturday, 21 of June 2008, Takashi Iwai wrote:
> > > At Sat, 21 Jun 2008 17:28:09 +0200,
> > > Rafael J. Wysocki wrote:
> > > > 
> > > > On Friday, 20 of June 2008, Stephen Rothwell wrote:
> > > > > Hi all,
> > > > > 
> > > > > Changes since next-20080619:
> > > > > 
> > > > > The net tree lost its conflict against Linus' tree.
> > > > > 
> > > > > The bkl-removal tree lost a conflict.
> > > > 
> > > > On one of my test boxes with the ATI chipset (SB600 south bridge) there's no
> > > > sound output.  Bisection shows that the following commit causes this to happen
> > > > and reverting the commit fixes the problem for me:
> > > > 
> > > > commit cf97e6678f1e1e7bbdb566c36771540123832a31
> > > > Author: Takashi Iwai <tiwai@suse.de>
> > > > Date:   Mon Jun 16 15:47:26 2008 +0200
> > > > 
> > > >     ALSA: hda - Fix wrong volumes in AD1988 auto-probe mode
> > > >     
> > > >     Don't create mixer volume elements for Headphone and Speaker if they
> > > >     use the same DAC as normal line-outs on AD1988.  Otherwise the amp
> > > >     value gets screwed up, e.g.
> > > >     	https://bugzilla.novell.com/show_bug.cgi?id=398255
> > > >     
> > > >     Signed-off-by: Takashi Iwai <tiwai@suse.de>
> > > > 
> > > > Please let me know if you need any additional information.
> > > 
> > > Could you run alsa-info.sh with --no-upload option and attach the
> > > output for both states with and without that commit?  The script is
> > > found at
> > > 	http://www.alsa-project.org/alsa-info.sh
> > > Also, show the relevant kernel message from snd-hda-intel (informing
> > > the auto-parsing of pins, etc), too.
> > 
> > dmesg outputs and the outputs of 'alsa-info.sh --no-upload' for the kernel with
> > the patch applied (1) and with the reverted (2) are at:
> > 
> > http://www.sisk.pl/kernel/debug/20080620/box2/dmesg-1.log
> > http://www.sisk.pl/kernel/debug/20080620/box2/alsa-info-1.txt
> > 
> > http://www.sisk.pl/kernel/debug/20080620/box2/dmesg-2.log
> > http://www.sisk.pl/kernel/debug/20080620/box2/alsa-info-2.txt
> 
> Well, this is actually no regression but an unlucky side-effect of the
> fix.
> 
> In the old version, "Front" volume didn't work properly because of
> confliction with a bogus "Headphone" volume.  Now, a wrong volume
> element is removed but only "Front" remains while "Front" wasn't set
> up properly.
> 
> In short, the below should fix the problem:
> 
> 	% amixer set Front 90%

Well, okay, but where should I add that to make KDE mixers work, for example?

Thanks,
Rafael

Re: linux-next: Tree for June 20: [regression] No sound on SB600

[Takashi Iwai]

At Mon, 23 Jun 2008 16:32:08 +0200,
Rafael J. Wysocki wrote:
> 
> On Monday, 23 of June 2008, Takashi Iwai wrote:
> > At Sat, 21 Jun 2008 21:25:41 +0200,
> > Rafael J. Wysocki wrote:
> > > 
> > > On Saturday, 21 of June 2008, Takashi Iwai wrote:
> > > > At Sat, 21 Jun 2008 17:28:09 +0200,
> > > > Rafael J. Wysocki wrote:
> > > > > 
> > > > > On Friday, 20 of June 2008, Stephen Rothwell wrote:
> > > > > > Hi all,
> > > > > > 
> > > > > > Changes since next-20080619:
> > > > > > 
> > > > > > The net tree lost its conflict against Linus' tree.
> > > > > > 
> > > > > > The bkl-removal tree lost a conflict.
> > > > > 
> > > > > On one of my test boxes with the ATI chipset (SB600 south bridge) there's no
> > > > > sound output.  Bisection shows that the following commit causes this to happen
> > > > > and reverting the commit fixes the problem for me:
> > > > > 
> > > > > commit cf97e6678f1e1e7bbdb566c36771540123832a31
> > > > > Author: Takashi Iwai <tiwai@suse.de>
> > > > > Date:   Mon Jun 16 15:47:26 2008 +0200
> > > > > 
> > > > >     ALSA: hda - Fix wrong volumes in AD1988 auto-probe mode
> > > > >     
> > > > >     Don't create mixer volume elements for Headphone and Speaker if they
> > > > >     use the same DAC as normal line-outs on AD1988.  Otherwise the amp
> > > > >     value gets screwed up, e.g.
> > > > >     	https://bugzilla.novell.com/show_bug.cgi?id=398255
> > > > >     
> > > > >     Signed-off-by: Takashi Iwai <tiwai@suse.de>
> > > > > 
> > > > > Please let me know if you need any additional information.
> > > > 
> > > > Could you run alsa-info.sh with --no-upload option and attach the
> > > > output for both states with and without that commit?  The script is
> > > > found at
> > > > 	http://www.alsa-project.org/alsa-info.sh
> > > > Also, show the relevant kernel message from snd-hda-intel (informing
> > > > the auto-parsing of pins, etc), too.
> > > 
> > > dmesg outputs and the outputs of 'alsa-info.sh --no-upload' for the kernel with
> > > the patch applied (1) and with the reverted (2) are at:
> > > 
> > > http://www.sisk.pl/kernel/debug/20080620/box2/dmesg-1.log
> > > http://www.sisk.pl/kernel/debug/20080620/box2/alsa-info-1.txt
> > > 
> > > http://www.sisk.pl/kernel/debug/20080620/box2/dmesg-2.log
> > > http://www.sisk.pl/kernel/debug/20080620/box2/alsa-info-2.txt
> > 
> > Well, this is actually no regression but an unlucky side-effect of the
> > fix.
> > 
> > In the old version, "Front" volume didn't work properly because of
> > confliction with a bogus "Headphone" volume.  Now, a wrong volume
> > element is removed but only "Front" remains while "Front" wasn't set
> > up properly.
> > 
> > In short, the below should fix the problem:
> > 
> > 	% amixer set Front 90%
> 
> Well, okay, but where should I add that to make KDE mixers work, for example?

You must have "Master" volume control now.  This also changes Front,
etc.  Try to reassign Master as the default volume in kmix.


Takashi

Re: linux-next: Tree for June 20: [regression] No sound on SB600

[Rafael J. Wysocki]

On Monday, 23 of June 2008, Takashi Iwai wrote:
> At Mon, 23 Jun 2008 16:32:08 +0200,
> Rafael J. Wysocki wrote:
> > 
> > On Monday, 23 of June 2008, Takashi Iwai wrote:
> > > At Sat, 21 Jun 2008 21:25:41 +0200,
> > > Rafael J. Wysocki wrote:
> > > > 
> > > > On Saturday, 21 of June 2008, Takashi Iwai wrote:
> > > > > At Sat, 21 Jun 2008 17:28:09 +0200,
> > > > > Rafael J. Wysocki wrote:
> > > > > > 
> > > > > > On Friday, 20 of June 2008, Stephen Rothwell wrote:
> > > > > > > Hi all,
> > > > > > > 
> > > > > > > Changes since next-20080619:
> > > > > > > 
> > > > > > > The net tree lost its conflict against Linus' tree.
> > > > > > > 
> > > > > > > The bkl-removal tree lost a conflict.
> > > > > > 
> > > > > > On one of my test boxes with the ATI chipset (SB600 south bridge) there's no
> > > > > > sound output.  Bisection shows that the following commit causes this to happen
> > > > > > and reverting the commit fixes the problem for me:
> > > > > > 
> > > > > > commit cf97e6678f1e1e7bbdb566c36771540123832a31
> > > > > > Author: Takashi Iwai <tiwai@suse.de>
> > > > > > Date:   Mon Jun 16 15:47:26 2008 +0200
> > > > > > 
> > > > > >     ALSA: hda - Fix wrong volumes in AD1988 auto-probe mode
> > > > > >     
> > > > > >     Don't create mixer volume elements for Headphone and Speaker if they
> > > > > >     use the same DAC as normal line-outs on AD1988.  Otherwise the amp
> > > > > >     value gets screwed up, e.g.
> > > > > >     	https://bugzilla.novell.com/show_bug.cgi?id=398255
> > > > > >     
> > > > > >     Signed-off-by: Takashi Iwai <tiwai@suse.de>
> > > > > > 
> > > > > > Please let me know if you need any additional information.
> > > > > 
> > > > > Could you run alsa-info.sh with --no-upload option and attach the
> > > > > output for both states with and without that commit?  The script is
> > > > > found at
> > > > > 	http://www.alsa-project.org/alsa-info.sh
> > > > > Also, show the relevant kernel message from snd-hda-intel (informing
> > > > > the auto-parsing of pins, etc), too.
> > > > 
> > > > dmesg outputs and the outputs of 'alsa-info.sh --no-upload' for the kernel with
> > > > the patch applied (1) and with the reverted (2) are at:
> > > > 
> > > > http://www.sisk.pl/kernel/debug/20080620/box2/dmesg-1.log
> > > > http://www.sisk.pl/kernel/debug/20080620/box2/alsa-info-1.txt
> > > > 
> > > > http://www.sisk.pl/kernel/debug/20080620/box2/dmesg-2.log
> > > > http://www.sisk.pl/kernel/debug/20080620/box2/alsa-info-2.txt
> > > 
> > > Well, this is actually no regression but an unlucky side-effect of the
> > > fix.
> > > 
> > > In the old version, "Front" volume didn't work properly because of
> > > confliction with a bogus "Headphone" volume.  Now, a wrong volume
> > > element is removed but only "Front" remains while "Front" wasn't set
> > > up properly.
> > > 
> > > In short, the below should fix the problem:
> > > 
> > > 	% amixer set Front 90%
> > 
> > Well, okay, but where should I add that to make KDE mixers work, for example?
> 
> You must have "Master" volume control now.  This also changes Front,
> etc.  Try to reassign Master as the default volume in kmix.

Yes, I have the "Master" control and I had it before the patch too, but it has
no effect both after and before the patch AFAICS (will double check).

Thanks,
Rafael

Re: linux-next: Tree for June 20: [regression] No sound on SB600

[Takashi Iwai]

At Mon, 23 Jun 2008 17:05:02 +0200,
Rafael J. Wysocki wrote:
> 
> On Monday, 23 of June 2008, Takashi Iwai wrote:
> > At Mon, 23 Jun 2008 16:32:08 +0200,
> > Rafael J. Wysocki wrote:
> > > 
> > > On Monday, 23 of June 2008, Takashi Iwai wrote:
> > > > At Sat, 21 Jun 2008 21:25:41 +0200,
> > > > Rafael J. Wysocki wrote:
> > > > > 
> > > > > On Saturday, 21 of June 2008, Takashi Iwai wrote:
> > > > > > At Sat, 21 Jun 2008 17:28:09 +0200,
> > > > > > Rafael J. Wysocki wrote:
> > > > > > > 
> > > > > > > On Friday, 20 of June 2008, Stephen Rothwell wrote:
> > > > > > > > Hi all,
> > > > > > > > 
> > > > > > > > Changes since next-20080619:
> > > > > > > > 
> > > > > > > > The net tree lost its conflict against Linus' tree.
> > > > > > > > 
> > > > > > > > The bkl-removal tree lost a conflict.
> > > > > > > 
> > > > > > > On one of my test boxes with the ATI chipset (SB600 south bridge) there's no
> > > > > > > sound output.  Bisection shows that the following commit causes this to happen
> > > > > > > and reverting the commit fixes the problem for me:
> > > > > > > 
> > > > > > > commit cf97e6678f1e1e7bbdb566c36771540123832a31
> > > > > > > Author: Takashi Iwai <tiwai@suse.de>
> > > > > > > Date:   Mon Jun 16 15:47:26 2008 +0200
> > > > > > > 
> > > > > > >     ALSA: hda - Fix wrong volumes in AD1988 auto-probe mode
> > > > > > >     
> > > > > > >     Don't create mixer volume elements for Headphone and Speaker if they
> > > > > > >     use the same DAC as normal line-outs on AD1988.  Otherwise the amp
> > > > > > >     value gets screwed up, e.g.
> > > > > > >     	https://bugzilla.novell.com/show_bug.cgi?id=398255
> > > > > > >     
> > > > > > >     Signed-off-by: Takashi Iwai <tiwai@suse.de>
> > > > > > > 
> > > > > > > Please let me know if you need any additional information.
> > > > > > 
> > > > > > Could you run alsa-info.sh with --no-upload option and attach the
> > > > > > output for both states with and without that commit?  The script is
> > > > > > found at
> > > > > > 	http://www.alsa-project.org/alsa-info.sh
> > > > > > Also, show the relevant kernel message from snd-hda-intel (informing
> > > > > > the auto-parsing of pins, etc), too.
> > > > > 
> > > > > dmesg outputs and the outputs of 'alsa-info.sh --no-upload' for the kernel with
> > > > > the patch applied (1) and with the reverted (2) are at:
> > > > > 
> > > > > http://www.sisk.pl/kernel/debug/20080620/box2/dmesg-1.log
> > > > > http://www.sisk.pl/kernel/debug/20080620/box2/alsa-info-1.txt
> > > > > 
> > > > > http://www.sisk.pl/kernel/debug/20080620/box2/dmesg-2.log
> > > > > http://www.sisk.pl/kernel/debug/20080620/box2/alsa-info-2.txt
> > > > 
> > > > Well, this is actually no regression but an unlucky side-effect of the
> > > > fix.
> > > > 
> > > > In the old version, "Front" volume didn't work properly because of
> > > > confliction with a bogus "Headphone" volume.  Now, a wrong volume
> > > > element is removed but only "Front" remains while "Front" wasn't set
> > > > up properly.
> > > > 
> > > > In short, the below should fix the problem:
> > > > 
> > > > 	% amixer set Front 90%
> > > 
> > > Well, okay, but where should I add that to make KDE mixers work, for example?
> > 
> > You must have "Master" volume control now.  This also changes Front,
> > etc.  Try to reassign Master as the default volume in kmix.
> 
> Yes, I have the "Master" control and I had it before the patch too, but it has
> no effect both after and before the patch AFAICS (will double check).

Oh, yes, let me know if "Master" still doesn't work.  This should have
been fixed with the last patch, too.


thanks,

Takashi

Re: linux-next: Tree for June 20: [regression] No sound on SB600

[Rafael J. Wysocki]

On Monday, 23 of June 2008, Takashi Iwai wrote:
> At Mon, 23 Jun 2008 17:05:02 +0200,
> Rafael J. Wysocki wrote:
> > 
> > On Monday, 23 of June 2008, Takashi Iwai wrote:
> > > At Mon, 23 Jun 2008 16:32:08 +0200,
> > > Rafael J. Wysocki wrote:
> > > > 
> > > > On Monday, 23 of June 2008, Takashi Iwai wrote:
> > > > > At Sat, 21 Jun 2008 21:25:41 +0200,
> > > > > Rafael J. Wysocki wrote:
> > > > > > 
> > > > > > On Saturday, 21 of June 2008, Takashi Iwai wrote:
> > > > > > > At Sat, 21 Jun 2008 17:28:09 +0200,
> > > > > > > Rafael J. Wysocki wrote:
> > > > > > > > 
> > > > > > > > On Friday, 20 of June 2008, Stephen Rothwell wrote:
> > > > > > > > > Hi all,
> > > > > > > > > 
> > > > > > > > > Changes since next-20080619:
> > > > > > > > > 
> > > > > > > > > The net tree lost its conflict against Linus' tree.
> > > > > > > > > 
> > > > > > > > > The bkl-removal tree lost a conflict.
> > > > > > > > 
> > > > > > > > On one of my test boxes with the ATI chipset (SB600 south bridge) there's no
> > > > > > > > sound output.  Bisection shows that the following commit causes this to happen
> > > > > > > > and reverting the commit fixes the problem for me:
> > > > > > > > 
> > > > > > > > commit cf97e6678f1e1e7bbdb566c36771540123832a31
> > > > > > > > Author: Takashi Iwai <tiwai@suse.de>
> > > > > > > > Date:   Mon Jun 16 15:47:26 2008 +0200
> > > > > > > > 
> > > > > > > >     ALSA: hda - Fix wrong volumes in AD1988 auto-probe mode
> > > > > > > >     
> > > > > > > >     Don't create mixer volume elements for Headphone and Speaker if they
> > > > > > > >     use the same DAC as normal line-outs on AD1988.  Otherwise the amp
> > > > > > > >     value gets screwed up, e.g.
> > > > > > > >     	https://bugzilla.novell.com/show_bug.cgi?id=398255
> > > > > > > >     
> > > > > > > >     Signed-off-by: Takashi Iwai <tiwai@suse.de>
> > > > > > > > 
> > > > > > > > Please let me know if you need any additional information.
> > > > > > > 
> > > > > > > Could you run alsa-info.sh with --no-upload option and attach the
> > > > > > > output for both states with and without that commit?  The script is
> > > > > > > found at
> > > > > > > 	http://www.alsa-project.org/alsa-info.sh
> > > > > > > Also, show the relevant kernel message from snd-hda-intel (informing
> > > > > > > the auto-parsing of pins, etc), too.
> > > > > > 
> > > > > > dmesg outputs and the outputs of 'alsa-info.sh --no-upload' for the kernel with
> > > > > > the patch applied (1) and with the reverted (2) are at:
> > > > > > 
> > > > > > http://www.sisk.pl/kernel/debug/20080620/box2/dmesg-1.log
> > > > > > http://www.sisk.pl/kernel/debug/20080620/box2/alsa-info-1.txt
> > > > > > 
> > > > > > http://www.sisk.pl/kernel/debug/20080620/box2/dmesg-2.log
> > > > > > http://www.sisk.pl/kernel/debug/20080620/box2/alsa-info-2.txt
> > > > > 
> > > > > Well, this is actually no regression but an unlucky side-effect of the
> > > > > fix.
> > > > > 
> > > > > In the old version, "Front" volume didn't work properly because of
> > > > > confliction with a bogus "Headphone" volume.  Now, a wrong volume
> > > > > element is removed but only "Front" remains while "Front" wasn't set
> > > > > up properly.
> > > > > 
> > > > > In short, the below should fix the problem:
> > > > > 
> > > > > 	% amixer set Front 90%
> > > > 
> > > > Well, okay, but where should I add that to make KDE mixers work, for example?

Ah, there is a "Front" volume control that works instead of the "Headphone" one.
 
> > > 
> > > You must have "Master" volume control now.  This also changes Front,
> > > etc.  Try to reassign Master as the default volume in kmix.
>>
> > Yes, I have the "Master" control and I had it before the patch too, but it has
> > no effect both after and before the patch AFAICS (will double check).
> 
> Oh, yes, let me know if "Master" still doesn't work.

No, it doesn't.

> This should have been fixed with the last patch, too.

Oh well ... ;-)

Thanks,
Rafael

Re: linux-next: Tree for June 20: [regression] No sound on SB600

[Takashi Iwai]

At Tue, 24 Jun 2008 00:48:34 +0200,
Rafael J. Wysocki wrote:
> 
> On Monday, 23 of June 2008, Takashi Iwai wrote:
> > At Mon, 23 Jun 2008 17:05:02 +0200,
> > Rafael J. Wysocki wrote:
> > > 
> > > On Monday, 23 of June 2008, Takashi Iwai wrote:
> > > > At Mon, 23 Jun 2008 16:32:08 +0200,
> > > > Rafael J. Wysocki wrote:
> > > > > 
> > > > > On Monday, 23 of June 2008, Takashi Iwai wrote:
> > > > > > At Sat, 21 Jun 2008 21:25:41 +0200,
> > > > > > Rafael J. Wysocki wrote:
> > > > > > > 
> > > > > > > On Saturday, 21 of June 2008, Takashi Iwai wrote:
> > > > > > > > At Sat, 21 Jun 2008 17:28:09 +0200,
> > > > > > > > Rafael J. Wysocki wrote:
> > > > > > > > > 
> > > > > > > > > On Friday, 20 of June 2008, Stephen Rothwell wrote:
> > > > > > > > > > Hi all,
> > > > > > > > > > 
> > > > > > > > > > Changes since next-20080619:
> > > > > > > > > > 
> > > > > > > > > > The net tree lost its conflict against Linus' tree.
> > > > > > > > > > 
> > > > > > > > > > The bkl-removal tree lost a conflict.
> > > > > > > > > 
> > > > > > > > > On one of my test boxes with the ATI chipset (SB600 south bridge) there's no
> > > > > > > > > sound output.  Bisection shows that the following commit causes this to happen
> > > > > > > > > and reverting the commit fixes the problem for me:
> > > > > > > > > 
> > > > > > > > > commit cf97e6678f1e1e7bbdb566c36771540123832a31
> > > > > > > > > Author: Takashi Iwai <tiwai@suse.de>
> > > > > > > > > Date:   Mon Jun 16 15:47:26 2008 +0200
> > > > > > > > > 
> > > > > > > > >     ALSA: hda - Fix wrong volumes in AD1988 auto-probe mode
> > > > > > > > >     
> > > > > > > > >     Don't create mixer volume elements for Headphone and Speaker if they
> > > > > > > > >     use the same DAC as normal line-outs on AD1988.  Otherwise the amp
> > > > > > > > >     value gets screwed up, e.g.
> > > > > > > > >     	https://bugzilla.novell.com/show_bug.cgi?id=398255
> > > > > > > > >     
> > > > > > > > >     Signed-off-by: Takashi Iwai <tiwai@suse.de>
> > > > > > > > > 
> > > > > > > > > Please let me know if you need any additional information.
> > > > > > > > 
> > > > > > > > Could you run alsa-info.sh with --no-upload option and attach the
> > > > > > > > output for both states with and without that commit?  The script is
> > > > > > > > found at
> > > > > > > > 	http://www.alsa-project.org/alsa-info.sh
> > > > > > > > Also, show the relevant kernel message from snd-hda-intel (informing
> > > > > > > > the auto-parsing of pins, etc), too.
> > > > > > > 
> > > > > > > dmesg outputs and the outputs of 'alsa-info.sh --no-upload' for the kernel with
> > > > > > > the patch applied (1) and with the reverted (2) are at:
> > > > > > > 
> > > > > > > http://www.sisk.pl/kernel/debug/20080620/box2/dmesg-1.log
> > > > > > > http://www.sisk.pl/kernel/debug/20080620/box2/alsa-info-1.txt
> > > > > > > 
> > > > > > > http://www.sisk.pl/kernel/debug/20080620/box2/dmesg-2.log
> > > > > > > http://www.sisk.pl/kernel/debug/20080620/box2/alsa-info-2.txt
> > > > > > 
> > > > > > Well, this is actually no regression but an unlucky side-effect of the
> > > > > > fix.
> > > > > > 
> > > > > > In the old version, "Front" volume didn't work properly because of
> > > > > > confliction with a bogus "Headphone" volume.  Now, a wrong volume
> > > > > > element is removed but only "Front" remains while "Front" wasn't set
> > > > > > up properly.
> > > > > > 
> > > > > > In short, the below should fix the problem:
> > > > > > 
> > > > > > 	% amixer set Front 90%
> > > > > 
> > > > > Well, okay, but where should I add that to make KDE mixers work, for example?
> 
> Ah, there is a "Front" volume control that works instead of the "Headphone" one.

It's been there but it didn't work because of conflict with a bogus
"Headphone" volume.

> > > > 
> > > > You must have "Master" volume control now.  This also changes Front,
> > > > etc.  Try to reassign Master as the default volume in kmix.
> >>
> > > Yes, I have the "Master" control and I had it before the patch too, but it has
> > > no effect both after and before the patch AFAICS (will double check).
> > 
> > Oh, yes, let me know if "Master" still doesn't work.
> 
> No, it doesn't.

Hmm...

> > This should have been fixed with the last patch, too.
> 
> Oh well ... ;-)

Just to be sure, did you adjust Front volume properly before testing
Master volume?  Master volume is only attenuation and no gain.  Thus,
if Front is low, you won't get any high volumes even if you raise
Master to full.

To be noted, you have also other mixer elements like Surround, Center,
etc.  Together with Front, these correspond to the volumes of 7.1
output channels individually.  Your hardware has no individual
headphone volume but it's connected from the front channels.  That's
why "Front" controls the headphone volume, too.


thanks,

Takashi

Re: linux-next: Tree for June 20: [regression] No sound on SB600

[Rafael J. Wysocki]

On Tuesday, 24 of June 2008, Takashi Iwai wrote:
> At Tue, 24 Jun 2008 00:48:34 +0200,
> Rafael J. Wysocki wrote:
> > 
> > On Monday, 23 of June 2008, Takashi Iwai wrote:
> > > At Mon, 23 Jun 2008 17:05:02 +0200,
> > > Rafael J. Wysocki wrote:
> > > > 
> > > > On Monday, 23 of June 2008, Takashi Iwai wrote:
> > > > > At Mon, 23 Jun 2008 16:32:08 +0200,
> > > > > Rafael J. Wysocki wrote:
> > > > > > 
> > > > > > On Monday, 23 of June 2008, Takashi Iwai wrote:
> > > > > > > At Sat, 21 Jun 2008 21:25:41 +0200,
> > > > > > > Rafael J. Wysocki wrote:
> > > > > > > > 
> > > > > > > > On Saturday, 21 of June 2008, Takashi Iwai wrote:
> > > > > > > > > At Sat, 21 Jun 2008 17:28:09 +0200,
> > > > > > > > > Rafael J. Wysocki wrote:
> > > > > > > > > > 
> > > > > > > > > > On Friday, 20 of June 2008, Stephen Rothwell wrote:
> > > > > > > > > > > Hi all,
> > > > > > > > > > > 
> > > > > > > > > > > Changes since next-20080619:
> > > > > > > > > > > 
> > > > > > > > > > > The net tree lost its conflict against Linus' tree.
> > > > > > > > > > > 
> > > > > > > > > > > The bkl-removal tree lost a conflict.
> > > > > > > > > > 
> > > > > > > > > > On one of my test boxes with the ATI chipset (SB600 south bridge) there's no
> > > > > > > > > > sound output.  Bisection shows that the following commit causes this to happen
> > > > > > > > > > and reverting the commit fixes the problem for me:
> > > > > > > > > > 
> > > > > > > > > > commit cf97e6678f1e1e7bbdb566c36771540123832a31
> > > > > > > > > > Author: Takashi Iwai <tiwai@suse.de>
> > > > > > > > > > Date:   Mon Jun 16 15:47:26 2008 +0200
> > > > > > > > > > 
> > > > > > > > > >     ALSA: hda - Fix wrong volumes in AD1988 auto-probe mode
> > > > > > > > > >     
> > > > > > > > > >     Don't create mixer volume elements for Headphone and Speaker if they
> > > > > > > > > >     use the same DAC as normal line-outs on AD1988.  Otherwise the amp
> > > > > > > > > >     value gets screwed up, e.g.
> > > > > > > > > >     	https://bugzilla.novell.com/show_bug.cgi?id=398255
> > > > > > > > > >     
> > > > > > > > > >     Signed-off-by: Takashi Iwai <tiwai@suse.de>
> > > > > > > > > > 
> > > > > > > > > > Please let me know if you need any additional information.
> > > > > > > > > 
> > > > > > > > > Could you run alsa-info.sh with --no-upload option and attach the
> > > > > > > > > output for both states with and without that commit?  The script is
> > > > > > > > > found at
> > > > > > > > > 	http://www.alsa-project.org/alsa-info.sh
> > > > > > > > > Also, show the relevant kernel message from snd-hda-intel (informing
> > > > > > > > > the auto-parsing of pins, etc), too.
> > > > > > > > 
> > > > > > > > dmesg outputs and the outputs of 'alsa-info.sh --no-upload' for the kernel with
> > > > > > > > the patch applied (1) and with the reverted (2) are at:
> > > > > > > > 
> > > > > > > > http://www.sisk.pl/kernel/debug/20080620/box2/dmesg-1.log
> > > > > > > > http://www.sisk.pl/kernel/debug/20080620/box2/alsa-info-1.txt
> > > > > > > > 
> > > > > > > > http://www.sisk.pl/kernel/debug/20080620/box2/dmesg-2.log
> > > > > > > > http://www.sisk.pl/kernel/debug/20080620/box2/alsa-info-2.txt
> > > > > > > 
> > > > > > > Well, this is actually no regression but an unlucky side-effect of the
> > > > > > > fix.
> > > > > > > 
> > > > > > > In the old version, "Front" volume didn't work properly because of
> > > > > > > confliction with a bogus "Headphone" volume.  Now, a wrong volume
> > > > > > > element is removed but only "Front" remains while "Front" wasn't set
> > > > > > > up properly.
> > > > > > > 
> > > > > > > In short, the below should fix the problem:
> > > > > > > 
> > > > > > > 	% amixer set Front 90%
> > > > > > 
> > > > > > Well, okay, but where should I add that to make KDE mixers work, for example?
> > 
> > Ah, there is a "Front" volume control that works instead of the "Headphone" one.
> 
> It's been there but it didn't work because of conflict with a bogus
> "Headphone" volume.
> 
> > > > > 
> > > > > You must have "Master" volume control now.  This also changes Front,
> > > > > etc.  Try to reassign Master as the default volume in kmix.
> > >>
> > > > Yes, I have the "Master" control and I had it before the patch too, but it has
> > > > no effect both after and before the patch AFAICS (will double check).
> > > 
> > > Oh, yes, let me know if "Master" still doesn't work.
> > 
> > No, it doesn't.
> 
> Hmm...
> 
> > > This should have been fixed with the last patch, too.
> > 
> > Oh well ... ;-)
> 
> Just to be sure, did you adjust Front volume properly before testing
> Master volume?  Master volume is only attenuation and no gain.  Thus,
> if Front is low, you won't get any high volumes even if you raise
> Master to full.

Ah, I see.  OK, it works this way.  Sorry for the confusion.

> To be noted, you have also other mixer elements like Surround, Center,
> etc.  Together with Front, these correspond to the volumes of 7.1
> output channels individually.  Your hardware has no individual
> headphone volume but it's connected from the front channels.  That's
> why "Front" controls the headphone volume, too.

Thanks for the explanation.

Rafael