Attachment #30599 for bug #51450

View | Details | Raw Unified | Return to bug 51450
Collapse All | Expand All

Lines 7-13 Link Here

(-)Makefile (-2 / +2 lines)
7		7
8	PORTNAME= Server	8	PORTNAME= Server
9	PORTVERSION= 4.3.0	9	PORTVERSION= 4.3.0
10	PORTREVISION= 5	10	PORTREVISION= 6
11	CATEGORIES= x11-servers	11	CATEGORIES= x11-servers
12	MASTER_SITES= ${MASTER_SITE_XFREE:S/$/:x/} \	12	MASTER_SITES= ${MASTER_SITE_XFREE:S/$/:x/} \
13	${MASTER_SITE_LOCAL:S/$/:local/}	13	${MASTER_SITE_LOCAL:S/$/:local/}
Lines 34-40 Link Here
34	.for pf in patch-savage-pci-id patch-alpha_video.c patch-Pci.h patch-radeondri \	34	.for pf in patch-savage-pci-id patch-alpha_video.c patch-Pci.h patch-radeondri \
35	patch-r128_driver.c patch-mga_driver.c patch-xkbInit.c patch-radeon_dri.c \	35	patch-r128_driver.c patch-mga_driver.c patch-xkbInit.c patch-radeon_dri.c \
36	patch-mga_dri.c patch-nv_driver.c patch-nv_setup.c patch-int10-generic.c \	36	patch-mga_dri.c patch-nv_driver.c patch-nv_setup.c patch-int10-generic.c \
37	patch-radeon_cursor.c patch-radeon_reg.h	37	patch-radeon_cursor.c patch-radeon_reg.h patch-smi
38	EXTRA_PATCHES+= ${FILESDIR}/${pf}	38	EXTRA_PATCHES+= ${FILESDIR}/${pf}
39	.endfor	39	.endfor
40	SCRIPTS_ENV= OSVERSION=${OSVERSION} \	40	SCRIPTS_ENV= OSVERSION=${OSVERSION} \




--- 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},
 };

Return to bug 51450

Added Link Here

(-)files/patch-smi (+40 lines)
1	--- programs/Xserver/hw/xfree86/drivers/siliconmotion/smi_driver.c.orig Wed Feb 5 09:45:29 2003
2	+++ programs/Xserver/hw/xfree86/drivers/siliconmotion/smi_driver.c Fri May 2 03:09:24 2003
3	@@ -1410,7 +1410,7 @@
4	ENTER_PROC("SMI_Save");
5
6	/* Save the standard VGA registers */
7	- vgaHWSave(pScrn, vgaSavePtr, VGA_SR_MODE);
8	+ vgaHWSave(pScrn, vgaSavePtr, VGA_SR_ALL);
9	save->smiDACMask = VGAIN8(pSmi, VGA_DAC_MASK);
10	VGAOUT8(pSmi, VGA_DAC_READ_ADDR, 0);
11	for (i = 0; i < 256; i++)
12	@@ -1601,7 +1601,7 @@
13	VGAOUT8_INDEX(pSmi, VGA_SEQ_INDEX, VGA_SEQ_DATA, 0xA0, restore->SRA0);
14
15	/* Restore the standard VGA registers */
16	- vgaHWRestore(pScrn, vgaSavePtr, VGA_SR_MODE);
17	+ vgaHWRestore(pScrn, vgaSavePtr, VGA_SR_ALL);
18	if (restore->smiDACMask)
19	{
20	VGAOUT8(pSmi, VGA_DAC_MASK, restore->smiDACMask);
21	@@ -1672,7 +1672,7 @@
22	}
23
24	if (restore->modeInit)
25	- vgaHWRestore(pScrn, vgaSavePtr, VGA_SR_MODE);
26	+ vgaHWRestore(pScrn, vgaSavePtr, VGA_SR_ALL);
27
28	if (!SMI_LYNXM_SERIES(pSmi->Chipset))
29	{
30	--- programs/Xserver/hw/xfree86/drivers/siliconmotion/smi_video.c.orig Sat Jan 11 19:55:49 2003
31	+++ programs/Xserver/hw/xfree86/drivers/siliconmotion/smi_video.c Fri May 2 03:09:24 2003
32	@@ -277,7 +277,7 @@
33	{XvSettable \| XvGettable, 0, 1, XV_INTERLACED_NAME},
34	};
35
36	-static XF86AttributeRec SMI_VideoAttributes[N_ATTRS] = {
37	+static XF86AttributeRec SMI_VideoAttributes[2] = {
38	{XvSettable \| XvGettable, 0, 255, XV_BRIGHTNESS_NAME},
39	{XvSettable \| XvGettable, 0x000000, 0xFFFFFF, XV_COLORKEY_NAME},
40	};