Attachment 30599 Details for Bug 51450 – smi.diff

[patch] smi.diff

smi.diff (text/x-patch), 2.71 KB, created by Eric Anholt on 2003-05-02 11:19:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Eric Anholt

Created: 2003-05-02 11:19:45 UTC

Size: 2.71 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/ncvs/ports/x11-servers/XFree86-4-Server/Makefile,v
>retrieving revision 1.138
>diff -u -r1.138 Makefile
>--- Makefile	30 Apr 2003 00:16:00 -0000	1.138
>+++ Makefile	2 May 2003 10:04:27 -0000
>@@ -7,7 +7,7 @@
> 
> PORTNAME=	Server
> PORTVERSION=	4.3.0
>-PORTREVISION=	5
>+PORTREVISION=	6
> CATEGORIES=	x11-servers
> MASTER_SITES=	${MASTER_SITE_XFREE:S/$/:x/} \
> 		${MASTER_SITE_LOCAL:S/$/:local/}
>@@ -34,7 +34,7 @@
> .for pf in patch-savage-pci-id patch-alpha_video.c patch-Pci.h patch-radeondri \
> 	patch-r128_driver.c patch-mga_driver.c patch-xkbInit.c patch-radeon_dri.c \
> 	patch-mga_dri.c patch-nv_driver.c patch-nv_setup.c patch-int10-generic.c \
>-	patch-radeon_cursor.c patch-radeon_reg.h
>+	patch-radeon_cursor.c patch-radeon_reg.h patch-smi
> EXTRA_PATCHES+=		${FILESDIR}/${pf}
> .endfor
> SCRIPTS_ENV=		OSVERSION=${OSVERSION} \
>Index: files/patch-smi
>===================================================================
>RCS file: files/patch-smi
>diff -N files/patch-smi
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/patch-smi	2 May 2003 10:10:01 -0000
>@@ -0,0 +1,40 @@
>+--- programs/Xserver/hw/xfree86/drivers/siliconmotion/smi_driver.c.orig	Wed Feb  5 09:45:29 2003
>++++ programs/Xserver/hw/xfree86/drivers/siliconmotion/smi_driver.c	Fri May  2 03:09:24 2003
>+@@ -1410,7 +1410,7 @@
>+ 	ENTER_PROC("SMI_Save");
>+ 
>+ 	/* Save the standard VGA registers */
>+-	vgaHWSave(pScrn, vgaSavePtr, VGA_SR_MODE);
>++	vgaHWSave(pScrn, vgaSavePtr, VGA_SR_ALL);
>+ 	save->smiDACMask = VGAIN8(pSmi, VGA_DAC_MASK);
>+ 	VGAOUT8(pSmi, VGA_DAC_READ_ADDR, 0);
>+ 	for (i = 0; i < 256; i++)
>+@@ -1601,7 +1601,7 @@
>+ 		VGAOUT8_INDEX(pSmi, VGA_SEQ_INDEX, VGA_SEQ_DATA, 0xA0, restore->SRA0);
>+ 
>+ 		/* Restore the standard VGA registers */
>+-		vgaHWRestore(pScrn, vgaSavePtr, VGA_SR_MODE);
>++		vgaHWRestore(pScrn, vgaSavePtr, VGA_SR_ALL);
>+ 		if (restore->smiDACMask)
>+ 		{
>+ 			VGAOUT8(pSmi, VGA_DAC_MASK, restore->smiDACMask);
>+@@ -1672,7 +1672,7 @@
>+ 		} 
>+ 
>+ 		if (restore->modeInit)
>+-		    vgaHWRestore(pScrn, vgaSavePtr, VGA_SR_MODE);
>++		    vgaHWRestore(pScrn, vgaSavePtr, VGA_SR_ALL);
>+ 
>+ 		if (!SMI_LYNXM_SERIES(pSmi->Chipset))
>+ 		{
>+--- programs/Xserver/hw/xfree86/drivers/siliconmotion/smi_video.c.orig	Sat Jan 11 19:55:49 2003
>++++ programs/Xserver/hw/xfree86/drivers/siliconmotion/smi_video.c	Fri May  2 03:09:24 2003
>+@@ -277,7 +277,7 @@
>+     {XvSettable | XvGettable,        0,             1, XV_INTERLACED_NAME},
>+ };
>+ 
>+-static XF86AttributeRec SMI_VideoAttributes[N_ATTRS] = {
>++static XF86AttributeRec SMI_VideoAttributes[2] = {
>+     {XvSettable | XvGettable,        0,           255, XV_BRIGHTNESS_NAME},
>+     {XvSettable | XvGettable, 0x000000,      0xFFFFFF, XV_COLORKEY_NAME},
>+ };

Actions: View | Diff

Attachments on bug 51450: 30599