HDA: Enable chipset gcap usage
I tweaked this as promised, and ran it through the checkpatch.pl utility from kernel git tree. I have tested it on my Asus Z62F laptop as well as a few systems in my work environment without issue.
Summary: hda_intel.c use gcap register to determine number of streams supported by southbridge.
This patch quieries the southbridge for the number of streams supported by the southbridge in most chipsets, and reads these values from the chipset directly. Most systems are hardwired for 4 streams in each direction, but newer chipsets change that capability. As a fallback, the old hardcoded method is still available.
Signed off by Tobin Davis <[email protected]>
pci/hda/hda_intel.c +21 -5
@@ -1708,12 +1708,13 @@ static int __devinit azx_create(struct s {struct azx *chip;int err; +unsigned short gcap;static struct snd_device_ops ops = { .dev_free = azx_dev_free, }; *rchip =NULL ; - + err =pci_enable_device (pci);if (err <0 )return err;
@@ -1775,25 +1776,40 @@ static int __devinit azx_create(struct spci_set_master (pci);synchronize_irq (chip->irq); -switch (chip->driver_type) { -case AZX_DRIVER_ULI : + gcap =azx_readw (chip,ICH6_REG_GCAP ); +snd_printdd ("chipset global capabilities = 0x%x\n" , gcap); + +if (gcap) { +/* read number of streams from GCAP register instead of using +hardcoded value */ + + chip->playback_streams = (gcap & (0xF <<12 )) >>12 ; + chip->capture_streams = (gcap & (0xF <<8 )) >>8 ; + chip->playback_index_offset = (gcap & (0xF <<12 )) >>12 ; + chip->capture_index_offset =0 ; + }else { +/* gcap didn't give any info, switching to old method */ + +switch (chip->driver_type) { +case AZX_DRIVER_ULI : chip->playback_streams =ULI_NUM_PLAYBACK ; chip->capture_streams =ULI_NUM_CAPTURE ; chip->playback_index_offset =ULI_PLAYBACK_INDEX ; chip->capture_index_offset =ULI_CAPTURE_INDEX ;break ; -case AZX_DRIVER_ATIHDMI : +case AZX_DRIVER_ATIHDMI : chip->playback_streams =ATIHDMI_NUM_PLAYBACK ; chip->capture_streams =ATIHDMI_NUM_CAPTURE ; chip->playback_index_offset =ATIHDMI_PLAYBACK_INDEX ; chip->capture_index_offset =ATIHDMI_CAPTURE_INDEX ;break ; -default : +default : chip->playback_streams =ICH6_NUM_PLAYBACK ; chip->capture_streams =ICH6_NUM_CAPTURE ; chip->playback_index_offset =ICH6_PLAYBACK_INDEX ; chip->capture_index_offset =ICH6_CAPTURE_INDEX ;break ; + } } chip->num_streams = chip->playback_streams + chip->capture_streams; chip->azx_dev = kcalloc(chip->num_streams, sizeof(*chip->azx_dev),
_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
At Mon, 14 Jan 2008 11:44:27 -0800,
Quoted 8 lines · Tobin Davis
I tweaked this as promised, and ran it through the checkpatch.pl utility from kernel git tree. I have tested it on my Asus Z62F laptop as well as a few systems in my work environment without issue.
Summary:
hda_intel.cuse gcap register to determine number of streams supported by southbridge.
Quoted 7 lines
This patch quieries the southbridge for the number of streams supported by the southbridge in most chipsets, and reads these values from the chipset directly. Most systems are hardwired for 4 streams in each direction, but newer chipsets change that capability. As a fallback, the old hardcoded method is still available.
Signed off by Tobin Davis <[email protected]>
Thanks. I applied the patch after fixing some issues. (It didn't even compile :)
Takashi
Yea, I had fixed the GCAP oops in line 63 of the patch (1776 in hda_intel.c), but apparently sent the wrong patch version. My bad.
Thanks for the catch.
Tobin
Quoted 23 lines · Takashi Iwai
At Mon, 14 Jan 2008 11:44:27 -0800,
Quoted 8 lines · Tobin Davis
I tweaked this as promised, and ran it through the checkpatch.pl utility from kernel git tree. I have tested it on my Asus Z62F laptop as well as a few systems in my work environment without issue.
Summary:
hda_intel.cuse gcap register to determine number of streams supported by southbridge.Quoted 7 lines
This patch quieries the southbridge for the number of streams supported by the southbridge in most chipsets, and reads these values from the chipset directly. Most systems are hardwired for 4 streams in each direction, but newer chipsets change that capability. As a fallback, the old hardcoded method is still available.
Signed off by Tobin Davis <[email protected]>
Thanks. I applied the patch after fixing some issues. (It didn't even compile :)
Takashi
Signature · 5 lines
Tobin Davis Criticism comes easier than craftsmanship. -- Zeuxis