aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorKrzysztof Helt <krzysztof.h1@wp.pl>2009-03-31 18:25:48 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-04-01 11:59:34 -0400
commit04645fc337eef283887d3b1204017f1860ed2ff7 (patch)
tree9c7b6021440a3384360c54f20e93cd87b8f1c4d2 /drivers/video
parent2f682fae611df642acfb99b5f2fd665f001cd253 (diff)
tridentfb: delete acceleration Kconfig option
Remove Kconfig option for tridentfb acceleration. The acceleration can be switched off with modules "noaccel" parameter. The acceleration for Trident chips was fixed in the 2.6.27 kernel. Also, add CyberXXX and CyberBlade names to Kconfig option's name. It should make easier to find the tridentfb choice for cyblafb driver's users. The cyblafb driver has been replaced by the tridentfb driver. Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/Kconfig9
-rw-r--r--drivers/video/tridentfb.c12
2 files changed, 1 insertions, 20 deletions
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index db7a4f42edad..ffe2f2796e29 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -1598,7 +1598,7 @@ config FB_VT8623
1598 VIA VT8623 [Apollo CLE266] chipset. 1598 VIA VT8623 [Apollo CLE266] chipset.
1599 1599
1600config FB_TRIDENT 1600config FB_TRIDENT
1601 tristate "Trident support" 1601 tristate "Trident/CyberXXX/CyberBlade support"
1602 depends on FB && PCI 1602 depends on FB && PCI
1603 select FB_CFB_FILLRECT 1603 select FB_CFB_FILLRECT
1604 select FB_CFB_COPYAREA 1604 select FB_CFB_COPYAREA
@@ -1617,13 +1617,6 @@ config FB_TRIDENT
1617 To compile this driver as a module, choose M here: the 1617 To compile this driver as a module, choose M here: the
1618 module will be called tridentfb. 1618 module will be called tridentfb.
1619 1619
1620config FB_TRIDENT_ACCEL
1621 bool "Trident Acceleration functions (EXPERIMENTAL)"
1622 depends on FB_TRIDENT && EXPERIMENTAL
1623 ---help---
1624 This will compile the Trident frame buffer device with
1625 acceleration functions.
1626
1627config FB_ARK 1620config FB_ARK
1628 tristate "ARK 2000PV support" 1621 tristate "ARK 2000PV support"
1629 depends on FB && PCI 1622 depends on FB && PCI
diff --git a/drivers/video/tridentfb.c b/drivers/video/tridentfb.c
index bc692a15e2ad..03a9c35e9f55 100644
--- a/drivers/video/tridentfb.c
+++ b/drivers/video/tridentfb.c
@@ -490,7 +490,6 @@ static void tgui_copy_rect(struct tridentfb_par *par,
490/* 490/*
491 * Accel functions called by the upper layers 491 * Accel functions called by the upper layers
492 */ 492 */
493#ifdef CONFIG_FB_TRIDENT_ACCEL
494static void tridentfb_fillrect(struct fb_info *info, 493static void tridentfb_fillrect(struct fb_info *info,
495 const struct fb_fillrect *fr) 494 const struct fb_fillrect *fr)
496{ 495{
@@ -565,11 +564,6 @@ static int tridentfb_sync(struct fb_info *info)
565 par->wait_engine(par); 564 par->wait_engine(par);
566 return 0; 565 return 0;
567} 566}
568#else
569#define tridentfb_fillrect cfb_fillrect
570#define tridentfb_copyarea cfb_copyarea
571#define tridentfb_imageblit cfb_imageblit
572#endif /* CONFIG_FB_TRIDENT_ACCEL */
573 567
574/* 568/*
575 * Hardware access functions 569 * Hardware access functions
@@ -1333,9 +1327,7 @@ static struct fb_ops tridentfb_ops = {
1333 .fb_fillrect = tridentfb_fillrect, 1327 .fb_fillrect = tridentfb_fillrect,
1334 .fb_copyarea = tridentfb_copyarea, 1328 .fb_copyarea = tridentfb_copyarea,
1335 .fb_imageblit = tridentfb_imageblit, 1329 .fb_imageblit = tridentfb_imageblit,
1336#ifdef CONFIG_FB_TRIDENT_ACCEL
1337 .fb_sync = tridentfb_sync, 1330 .fb_sync = tridentfb_sync,
1338#endif
1339}; 1331};
1340 1332
1341static int __devinit trident_pci_probe(struct pci_dev *dev, 1333static int __devinit trident_pci_probe(struct pci_dev *dev,
@@ -1359,10 +1351,6 @@ static int __devinit trident_pci_probe(struct pci_dev *dev,
1359 1351
1360 chip_id = id->device; 1352 chip_id = id->device;
1361 1353
1362#ifndef CONFIG_FB_TRIDENT_ACCEL
1363 noaccel = 1;
1364#endif
1365
1366 /* If PCI id is 0x9660 then further detect chip type */ 1354 /* If PCI id is 0x9660 then further detect chip type */
1367 1355
1368 if (chip_id == TGUI9660) { 1356 if (chip_id == TGUI9660) {