[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: X Strike Force X.Org X11 SVN commit: r271 - in trunk/debian: . patches



>    - 010_s3_trio64_dx_and_gx_support.diff upstream but altered. We may
> need
>          to resurrect this at some point.

010_s3_trio64_dx_and_gx_support.diff has one hunk, not present
upstream. rediffed patch attached.

$Id: 010_s3_trio64_dx_and_gx_support.diff 1044 2004-02-16 17:40:33Z branden $

This patch by Santiago Garcia Mantinan and Javier Moran Rua

Adds S3 Trio64V2/DX and Trio64V2/GX support to the s3 driver.

Not submitted upstream.

Index: xc/programs/Xserver/hw/xfree86/drivers/s3/s3_driver.c
===================================================================
--- xc.orig/programs/Xserver/hw/xfree86/drivers/s3/s3_driver.c	2005-06-26 06:51:29.000000000 +0800
+++ xc/programs/Xserver/hw/xfree86/drivers/s3/s3_driver.c	2005-06-26 07:01:19.000000000 +0800
@@ -675,6 +675,18 @@
 #if 0
 		pS3->CursorInit = S3_CursorInit;	/* FIXME broken */
 #endif
+		if (pS3->Chipset == PCI_CHIP_TRIO64V2_DXGX)
+		switch(pScrn->bitsPerPixel) {
+		case 8:
+		case 16:
+			pS3->MaxClock = 170000;
+			break;
+		case 24:
+		case 32:
+			pS3->MaxClock = 135000;
+			break;
+		}
+		else
 		switch(pScrn->bitsPerPixel) {
 		case 8:
 			pS3->MaxClock = 135000;

Reply to: