Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 544393fe authored by Thomas Winischhofer's avatar Thomas Winischhofer Committed by Linus Torvalds
Browse files

[PATCH] sisfb update 



This lifts sisfb from version 1.7.17 to version 1.8.9. Changes include:

- Added support for XGI V3XT, V5, V8, Z7 chipsets, including POSTing of
  all of these chipsets.

- Added support for latest SiS chipsets (761).

- Added support for SiS76x memory "hybrid" mode.

- Added support for new LCD resolutions (eg 1280x854, 856x480).

- Fixed support for 320x240 STN panels (for embedded devices).

- Fixed many HDTV modes (525p, 750p, 1080i).

- Fixed PCI config register reading/writing to use proper kernel
  functions for this purpose.

- Fixed PCI ROM handling to use the kernel's proper functions.

- Removed lots of "typedef"s.

- Removed lots of code which was for X.org/XFree86 only.

- Fixed coding style in many places.

- Removed lots of 2.4 cruft.

- Reduced stack size by unifying two previously separate structs into
  one.

- Added new hooks for memory allocation (for DRM).  Now the driver can
  truly handle multiple cards, including memory management.

- Fixed numerous minor bugs.

Signed-off-by: default avatarThomas Winischhofer <thomas@winischhofer.net>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 5c06e2aa

drivers/video/Kconfig

+8 −6
Original line number Diff line number Diff line
@@ -1079,15 +1079,16 @@ config FB_SAVAGE_ACCEL 
          choose N here.



config FB_SIS

	tristate "SiS acceleration"

	tristate "SiS/XGI display support"

	depends on FB && PCI

	select FB_CFB_FILLRECT

	select FB_CFB_COPYAREA

	select FB_CFB_IMAGEBLIT

	select FB_SOFT_CURSOR

	help

	  This is the frame buffer device driver for the SiS 300, 315 and

	  330 series VGA chipsets. Specs available at <http://www.sis.com>

	  This is the frame buffer device driver for the SiS 300, 315, 330

	  and 340 series as well as XGI V3XT, V5, V8, Z7 graphics chipsets.

	  Specs available at <http://www.sis.com> and <http://www.xgitech.com>.



	  To compile this driver as a module, choose M here; the module

	  will be called sisfb.
@@ -1099,11 +1100,12 @@ config FB_SIS_300 
	  Say Y here to support use of the SiS 300/305, 540, 630 and 730.



config FB_SIS_315

	bool "SiS 315/330 series support"

	bool "SiS 315/330/340 series and XGI support"

	depends on FB_SIS

	help

	  Say Y here to support use of the SiS 315 and 330 series

	  (315/H/PRO, 55x, 650, 651, 740, 330, 661, 741, 760).

	  Say Y here to support use of the SiS 315, 330 and 340 series

	  (315/H/PRO, 55x, 650, 651, 740, 330, 661, 741, 760, 761) as well

	  as XGI V3XT, V5, V8 and Z7.



config FB_NEOMAGIC

	tristate "NeoMagic display support"

drivers/video/sis/300vtbl.h

+235 −1128

File changed.

Preview size limit exceeded, changes collapsed.

drivers/video/sis/310vtbl.h

+355 −1770

File changed.

Preview size limit exceeded, changes collapsed.

drivers/video/sis/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -4,4 +4,4 @@ 


obj-$(CONFIG_FB_SIS) += sisfb.o



sisfb-objs := sis_main.o sis_accel.o init.o init301.o
 
sisfb-objs := sis_main.o sis_accel.o init.o init301.o initextlfb.o

drivers/video/sis/init.c

+2288 −3361

File changed.

Preview size limit exceeded, changes collapsed.