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

Commit ad5c980f authored by Ian Romanick's avatar Ian Romanick Committed by Linus Torvalds
Browse files

Add support SiS based XGI chips to SiS DRM. 



This adds support for some of the XGI Volari family that are based on the
SiS.

Signed-off-by: default avatarDave Airlie <airlied@linux.ie>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 48d8d7ee

drivers/char/drm/drm_pciids.h

+2 −0
Original line number Diff line number Diff line
@@ -219,6 +219,8 @@ 
	{0x1039, 0x6300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \

	{0x1039, 0x6330, PCI_ANY_ID, PCI_ANY_ID, 0, 0, SIS_CHIP_315}, \

	{0x1039, 0x7300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \

	{0x18CA, 0x0040, PCI_ANY_ID, PCI_ANY_ID, 0, 0, SIS_CHIP_315}, \

	{0x18CA, 0x0042, PCI_ANY_ID, PCI_ANY_ID, 0, 0, SIS_CHIP_315}, \

	{0, 0, 0}



#define tdfx_PCI_IDS \

drivers/char/drm/sis_drv.h

+4 −4
Original line number Diff line number Diff line
@@ -33,11 +33,11 @@ 


#define DRIVER_AUTHOR		"SIS, Tungsten Graphics"

#define DRIVER_NAME		"sis"

#define DRIVER_DESC		"SIS 300/630/540"

#define DRIVER_DATE		"20060704"

#define DRIVER_DESC		"SIS 300/630/540 and XGI V3XE/V5/V8"

#define DRIVER_DATE		"20070626"

#define DRIVER_MAJOR		1

#define DRIVER_MINOR		2

#define DRIVER_PATCHLEVEL	1

#define DRIVER_MINOR		3

#define DRIVER_PATCHLEVEL	0



enum sis_family {

	SIS_OTHER = 0,