diff options
| author | Mike Isely <isely@pobox.com> | 2006-03-12 22:29:43 -0600 |
|---|---|---|
| committer | Mike Isely <isely@pobox.com> | 2006-03-12 22:29:43 -0600 |
| commit | bb379778f6c9c6aa4dc340c342d5e81a0b9026dd (patch) | |
| tree | 3049a3bbf0ba48fd24b62aaff07ab2925dcb3743 /linux/drivers/media/video/saa7134/saa7134-core.c | |
| parent | f9533819a70608d97d03abd7766ffc3f1e3ea655 (diff) | |
| parent | 3d611f80a1b8888b9001e1738f24194c694a8bf4 (diff) | |
| download | mediapointer-dvb-s2-bb379778f6c9c6aa4dc340c342d5e81a0b9026dd.tar.gz mediapointer-dvb-s2-bb379778f6c9c6aa4dc340c342d5e81a0b9026dd.tar.bz2 | |
Merge from master
From: Mike Isely <isely@pobox.com>
Signed-off-by: Mike Isely <isely@pobox.com>
Diffstat (limited to 'linux/drivers/media/video/saa7134/saa7134-core.c')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-core.c | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-core.c b/linux/drivers/media/video/saa7134/saa7134-core.c index e23c6a42d..bd3c52e08 100644 --- a/linux/drivers/media/video/saa7134/saa7134-core.c +++ b/linux/drivers/media/video/saa7134/saa7134-core.c @@ -70,6 +70,11 @@ static unsigned int latency = UNSET; module_param(latency, int, 0444); MODULE_PARM_DESC(latency,"pci latency timer"); +static int no_overlay=-1; +module_param(no_overlay, int, 0444); +MODULE_PARM_DESC(no_overlay,"allow override overlay default (0 disables, 1 enables)" + " [some VIA/SIS chipsets are known to have problem with overlay]"); + static unsigned int video_nr[] = {[0 ... (SAA7134_MAXBOARDS - 1)] = UNSET }; static unsigned int vbi_nr[] = {[0 ... (SAA7134_MAXBOARDS - 1)] = UNSET }; static unsigned int radio_nr[] = {[0 ... (SAA7134_MAXBOARDS - 1)] = UNSET }; @@ -906,6 +911,22 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev, latency = 0x0A; } #endif + if (pci_pci_problems & PCIPCI_FAIL) { + printk(KERN_INFO "%s: quirk: this driver and your " + "chipset may not work together" + " in overlay mode.\n",dev->name); + if (!no_overlay) { + printk(KERN_INFO "%s: quirk: overlay " + "mode will be disabled.\n", + dev->name); + no_overlay = 1; + } else { + printk(KERN_INFO "%s: quirk: overlay " + "mode will be forced. Use this" + " option at your own risk.\n", + dev->name); + } + } } if (UNSET != latency) { printk(KERN_INFO "%s: setting pci latency timer to %d\n", |