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

Commit 52e7c922 authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds
Browse files

[PATCH] remove the broken FB_S3TRIO driver 



The FB_S3TRIO driver:
- has been marked as BROKEN for more than two years and
- is still marked as BROKEN.

Drivers that had been marked as BROKEN for such a long time seem to be
unlikely to be revived in the forseeable future.

But if anyone wants to ever revive this driver, the code is still
present in the older kernel releases.

Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Cc: James Simmons <jsimmons@infradead.org>
Acked-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 2fdbe5cf

drivers/video/Kconfig

+0 −6
Original line number Diff line number Diff line
@@ -1109,12 +1109,6 @@ config FB_ATY_BACKLIGHT 
	help

	  Say Y here if you want to control the backlight of your display.



config FB_S3TRIO

	bool "S3 Trio display support"

	depends on (FB = y) && PPC && BROKEN

	help

	  If you have a S3 Trio say Y. Say N for S3 Virge.



config FB_S3

	tristate "S3 Trio/Virge support"

	depends on FB && PCI

drivers/video/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ obj-$(CONFIG_FB_PLATINUM) += platinumfb.o 
obj-$(CONFIG_FB_VALKYRIE)         += valkyriefb.o

obj-$(CONFIG_FB_CT65550)          += chipsfb.o

obj-$(CONFIG_FB_IMSTT)            += imsttfb.o

obj-$(CONFIG_FB_S3TRIO)           += S3triofb.o

obj-$(CONFIG_FB_FM2)              += fm2fb.o

obj-$(CONFIG_FB_CYBLA)            += cyblafb.o

obj-$(CONFIG_FB_TRIDENT)          += tridentfb.o

drivers/video/S3triofb.c

deleted100644 → 0
+0 −790

File deleted.

Preview size limit exceeded, changes collapsed.

include/video/s3blit.h

deleted100644 → 0
+0 −79
Original line number Diff line number Diff line 
#ifndef _VIDEO_S3BLIT_H

#define _VIDEO_S3BLIT_H



/* s3 commands */

#define S3_BITBLT       0xc011

#define S3_TWOPOINTLINE 0x2811

#define S3_FILLEDRECT   0x40b1



#define S3_FIFO_EMPTY 0x0400

#define S3_HDW_BUSY   0x0200



/* Enhanced register mapping (MMIO mode) */



#define S3_READ_SEL      0xbee8 /* offset f */

#define S3_MULT_MISC     0xbee8 /* offset e */

#define S3_ERR_TERM      0x92e8

#define S3_FRGD_COLOR    0xa6e8

#define S3_BKGD_COLOR    0xa2e8

#define S3_PIXEL_CNTL    0xbee8 /* offset a */

#define S3_FRGD_MIX      0xbae8

#define S3_BKGD_MIX      0xb6e8

#define S3_CUR_Y         0x82e8

#define S3_CUR_X         0x86e8

#define S3_DESTY_AXSTP   0x8ae8

#define S3_DESTX_DIASTP  0x8ee8

#define S3_MIN_AXIS_PCNT 0xbee8 /* offset 0 */

#define S3_MAJ_AXIS_PCNT 0x96e8

#define S3_CMD           0x9ae8

#define S3_GP_STAT       0x9ae8

#define S3_ADVFUNC_CNTL  0x4ae8

#define S3_WRT_MASK      0xaae8

#define S3_RD_MASK       0xaee8



/* Enhanced register mapping (Packed MMIO mode, write only) */

#define S3_ALT_CURXY     0x8100

#define S3_ALT_CURXY2    0x8104

#define S3_ALT_STEP      0x8108

#define S3_ALT_STEP2     0x810c

#define S3_ALT_ERR       0x8110

#define S3_ALT_CMD       0x8118

#define S3_ALT_MIX       0x8134

#define S3_ALT_PCNT      0x8148

#define S3_ALT_PAT       0x8168



/* Drawing modes */

#define S3_NOTCUR          0x0000

#define S3_LOGICALZERO     0x0001

#define S3_LOGICALONE      0x0002

#define S3_LEAVEASIS       0x0003

#define S3_NOTNEW          0x0004

#define S3_CURXORNEW       0x0005

#define S3_NOT_CURXORNEW   0x0006

#define S3_NEW             0x0007

#define S3_NOTCURORNOTNEW  0x0008

#define S3_CURORNOTNEW     0x0009

#define S3_NOTCURORNEW     0x000a

#define S3_CURORNEW        0x000b

#define S3_CURANDNEW       0x000c

#define S3_NOTCURANDNEW    0x000d

#define S3_CURANDNOTNEW    0x000e

#define S3_NOTCURANDNOTNEW 0x000f



#define S3_CRTC_ADR    0x03d4

#define S3_CRTC_DATA   0x03d5



#define S3_REG_LOCK2 0x39

#define S3_HGC_MODE  0x45



#define S3_HWGC_ORGX_H 0x46

#define S3_HWGC_ORGX_L 0x47

#define S3_HWGC_ORGY_H 0x48

#define S3_HWGC_ORGY_L 0x49

#define S3_HWGC_DX     0x4e

#define S3_HWGC_DY     0x4f





#define S3_LAW_CTL 0x58



#endif /* _VIDEO_S3BLIT_H */