aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/saa7134
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-03-10 14:46:50 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-21 11:53:06 -0500
commit9050d942b7dc55cd8e6d9b2c1ce260656021f0fb (patch)
tree6906a570d9519b7368c626704413a317dda3c7e5 /drivers/media/video/saa7134
parentf705e6e4940c4e803240b77c6c63fb2d47a97b59 (diff)
V4L/DVB (3439): Added no_overlay option and quirks to saa7134
Some chipsets have several problems when pci to pci transfers are activated on overlay mode. the option no_overlay allows disabling such feature of the driver, in favor of keeping the system stable. The default is to use pcipci_fail flag defined on drivers/pci/quirks.c. It also allows the user to override it by forcing disable overlay or forcing enable. Forcing enable may generate PCI transfer corruption, including disk mass corruption, so should be used with care. Added a text description to this option and make messages looks the same at both bttv and saa7134 drivers. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/saa7134')
-rw-r--r--drivers/media/video/saa7134/saa7134-core.c21
1 files changed, 21 insertions, 0 deletions
diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c
index e7c30665739e..f5f2cf5d1507 100644
--- a/drivers/media/video/saa7134/saa7134-core.c
+++ b/drivers/media/video/saa7134/saa7134-core.c
@@ -66,6 +66,11 @@ static unsigned int latency = UNSET;
66module_param(latency, int, 0444); 66module_param(latency, int, 0444);
67MODULE_PARM_DESC(latency,"pci latency timer"); 67MODULE_PARM_DESC(latency,"pci latency timer");
68 68
69static int no_overlay=-1;
70module_param(no_overlay, int, 0444);
71MODULE_PARM_DESC(no_overlay,"allow override overlay default (0 disables, 1 enables)"
72 " [some VIA/SIS chipsets are known to have problem with overlay]");
73
69static unsigned int video_nr[] = {[0 ... (SAA7134_MAXBOARDS - 1)] = UNSET }; 74static unsigned int video_nr[] = {[0 ... (SAA7134_MAXBOARDS - 1)] = UNSET };
70static unsigned int vbi_nr[] = {[0 ... (SAA7134_MAXBOARDS - 1)] = UNSET }; 75static unsigned int vbi_nr[] = {[0 ... (SAA7134_MAXBOARDS - 1)] = UNSET };
71static unsigned int radio_nr[] = {[0 ... (SAA7134_MAXBOARDS - 1)] = UNSET }; 76static unsigned int radio_nr[] = {[0 ... (SAA7134_MAXBOARDS - 1)] = UNSET };
@@ -835,6 +840,22 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev,
835 latency = 0x0A; 840 latency = 0x0A;
836 } 841 }
837#endif 842#endif
843 if (pci_pci_problems & PCIPCI_FAIL) {
844 printk(KERN_INFO "%s: quirk: this driver and your "
845 "chipset may not work together"
846 " in overlay mode.\n",dev->name);
847 if (!no_overlay) {
848 printk(KERN_INFO "%s: quirk: overlay "
849 "mode will be disabled.\n",
850 dev->name);
851 no_overlay = 1;
852 } else {
853 printk(KERN_INFO "%s: quirk: overlay "
854 "mode will be forced. Use this"
855 " option at your own risk.\n",
856 dev->name);
857 }
858 }
838 } 859 }
839 if (UNSET != latency) { 860 if (UNSET != latency) {
840 printk(KERN_INFO "%s: setting pci latency timer to %d\n", 861 printk(KERN_INFO "%s: setting pci latency timer to %d\n",