Commit 04645fc3 authored by Krzysztof Helt's avatar Krzysztof Helt Committed by Linus Torvalds
Browse files

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: default avatarKrzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 2f682fae

drivers/video/Kconfig

+1 −8
Original line number Diff line number Diff line
@@ -1598,7 +1598,7 @@ config FB_VT8623 
	  VIA VT8623 [Apollo CLE266] chipset.



config FB_TRIDENT

	tristate "Trident support"

	tristate "Trident/CyberXXX/CyberBlade support"

	depends on FB && PCI

	select FB_CFB_FILLRECT

	select FB_CFB_COPYAREA
@@ -1617,13 +1617,6 @@ config FB_TRIDENT 
	  To compile this driver as a module, choose M here: the

	  module will be called tridentfb.



config FB_TRIDENT_ACCEL

	bool "Trident Acceleration functions (EXPERIMENTAL)"

	depends on FB_TRIDENT && EXPERIMENTAL

	---help---

	This will compile the Trident frame buffer device with

	acceleration functions.



config FB_ARK

	tristate "ARK 2000PV support"

	depends on FB && PCI

drivers/video/tridentfb.c

+0 −12
Original line number Diff line number Diff line
@@ -490,7 +490,6 @@ static void tgui_copy_rect(struct tridentfb_par *par, 
/*

 * Accel functions called by the upper layers

 */

#ifdef CONFIG_FB_TRIDENT_ACCEL

static void tridentfb_fillrect(struct fb_info *info,

			       const struct fb_fillrect *fr)

{
@@ -565,11 +564,6 @@ static int tridentfb_sync(struct fb_info *info) 
		par->wait_engine(par);

	return 0;

}

#else

#define tridentfb_fillrect cfb_fillrect

#define tridentfb_copyarea cfb_copyarea

#define tridentfb_imageblit cfb_imageblit

#endif /* CONFIG_FB_TRIDENT_ACCEL */



/*

 * Hardware access functions
@@ -1333,9 +1327,7 @@ static struct fb_ops tridentfb_ops = { 
	.fb_fillrect = tridentfb_fillrect,

	.fb_copyarea = tridentfb_copyarea,

	.fb_imageblit = tridentfb_imageblit,

#ifdef CONFIG_FB_TRIDENT_ACCEL

	.fb_sync = tridentfb_sync,

#endif

};



static int __devinit trident_pci_probe(struct pci_dev *dev,
@@ -1359,10 +1351,6 @@ static int __devinit trident_pci_probe(struct pci_dev *dev, 


	chip_id = id->device;



#ifndef CONFIG_FB_TRIDENT_ACCEL

	noaccel = 1;

#endif



	/* If PCI id is 0x9660 then further detect chip type */



	if (chip_id == TGUI9660) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE