Attachment #179093 for bug #216279

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

Lines 2-8 Link Here

(-)x11-drivers/xf86-video-apm/Makefile (-1 / +1 lines)
2		2
3	PORTNAME= xf86-video-apm	3	PORTNAME= xf86-video-apm
4	PORTVERSION= 1.2.5	4	PORTVERSION= 1.2.5
5	PORTREVISION= 6	5	PORTREVISION= 7
6	CATEGORIES= x11-drivers	6	CATEGORIES= x11-drivers
7		7
8	MAINTAINER= x11@FreeBSD.org	8	MAINTAINER= x11@FreeBSD.org

Lines 1-4 Link Here

(-)x11-drivers/xf86-video-apm/files/patch-src_apm.h (-1 / +13 lines)
1	--- src/apm.h.orig 2012-07-17 04:52:01 UTC	1	From 9f67408e4f078e907fbf4feb45cfdcfd0cdebcca Mon Sep 17 00:00:00 2001
		2	From: Adam Jackson <ajax@redhat.com>
		3	Date: Wed, 9 Jan 2013 22:03:29 -0500
		4	Subject: Remove #include "mibstore.h"
		5
		6	Signed-off-by: Adam Jackson <ajax@redhat.com>
		7
		8	diff --git a/src/apm.h b/src/apm.h
		9	index a3c06f8..365e5e2 100644
		10	--- src/apm.h 2012-07-17 04:52:01 UTC
2	+++ src/apm.h	11	+++ src/apm.h
3	@@ -33,9 +33,6 @@	12	@@ -33,9 +33,6 @@
4	/* All drivers initialising the SW cursor need this */	13	/* All drivers initialising the SW cursor need this */
Lines 10-12 Link Here
10	/* I2C support */	19	/* I2C support */
11	#include "xf86i2c.h"	20	#include "xf86i2c.h"
12		21
		22	--
		23	cgit v0.10.2
		24




# Remove miInitializeBackingStore; it no longer exists and
# should have been removed with the mibstore.h include
#
# Replace xf86UnMapVidMem with pci_device_unmap_range
#
# Correct one string that should be const
#
--- src/apm_driver.c.orig	2012-07-17 04:52:01 UTC
+++ src/apm_driver.c
@@ -355,7 +355,8 @@ ApmPreInit(ScrnInfoPtr pScrn, int flags)
     EntityInfoPtr	pEnt;
     vgaHWPtr		hwp;
     MessageType		from;
-    char		*mod = NULL, *req = NULL, *s;
+    char		*mod = NULL, *req = NULL;
+    const char		*s;
     ClockRangePtr	clockRanges;
     int			i;
     xf86MonPtr		MonInfo = NULL;
@@ -751,7 +752,11 @@ ApmPreInit(ScrnInfoPtr pScrn, int flags)
 	LinMap[0xFFECDB] = db;
 	LinMap[0xFFECD9] = d9;
 	/*pciWriteLong(pApm->PciTag, PCI_CMD_STAT_REG, save);*/
+#ifndef XSERVER_LIBPCIACCESS
 	xf86UnMapVidMem(pScrn->scrnIndex, (pointer)LinMap, pApm->LinMapSize);
+#else
+	pci_device_unmap_range(pApm->PciInfo, (pointer)LinMap, pApm->LinMapSize);
+#endif
 	from = X_PROBED;
     }
     else {
@@ -1134,12 +1139,19 @@ ApmUnmapMem(ScrnInfoPtr pScrn)
 	    WRXB(0xDB, pApm->db);
 	}
 	WRXB(0xC9, pApm->c9);
+#ifndef XSERVER_LIBPCIACCESS
 	xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pApm->LinMap, pApm->LinMapSize);
+#else
+	pci_device_unmap_range(pApm->PciInfo, (pointer)pApm->LinMap, pApm->LinMapSize);
+#endif
 	pApm->LinMap = NULL;
     }
     else if (pApm->FbBase)
+#ifndef XSERVER_LIBPCIACCESS
 	xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pApm->LinMap, 0x10000);
-
+#else
+	pci_device_unmap_range(pApm->PciInfo, (pointer)pApm->LinMap, 0x10000);
+#endif
     return TRUE;
 }
 
@@ -1784,7 +1796,6 @@ ApmScreenInit(SCREEN_INIT_ARGS_DECL)
     }
 #endif
 
-    miInitializeBackingStore(pScreen);
     xf86SetBackingStore(pScreen);
     xf86SetSilkenMouse(pScreen);
 

Return to bug 216279

Line 0 Link Here

(-)x11-drivers/xf86-video-apm/files/patch-src_apm__driver.c (+60 lines)
	1	# Remove miInitializeBackingStore; it no longer exists and
	2	# should have been removed with the mibstore.h include
	3	#
	4	# Replace xf86UnMapVidMem with pci_device_unmap_range
	5	#
	6	# Correct one string that should be const
	7	#
	8	--- src/apm_driver.c.orig 2012-07-17 04:52:01 UTC
	9	+++ src/apm_driver.c
	10	@@ -355,7 +355,8 @@ ApmPreInit(ScrnInfoPtr pScrn, int flags)
	11	EntityInfoPtr pEnt;
	12	vgaHWPtr hwp;
	13	MessageType from;
	14	- char mod = NULL, req = NULL, *s;
	15	+ char mod = NULL, req = NULL;
	16	+ const char *s;
	17	ClockRangePtr clockRanges;
	18	int i;
	19	xf86MonPtr MonInfo = NULL;
	20	@@ -751,7 +752,11 @@ ApmPreInit(ScrnInfoPtr pScrn, int flags)
	21	LinMap[0xFFECDB] = db;
	22	LinMap[0xFFECD9] = d9;
	23	/pciWriteLong(pApm->PciTag, PCI_CMD_STAT_REG, save);/
	24	+#ifndef XSERVER_LIBPCIACCESS
	25	xf86UnMapVidMem(pScrn->scrnIndex, (pointer)LinMap, pApm->LinMapSize);
	26	+#else
	27	+ pci_device_unmap_range(pApm->PciInfo, (pointer)LinMap, pApm->LinMapSize);
	28	+#endif
	29	from = X_PROBED;
	30	}
	31	else {
	32	@@ -1134,12 +1139,19 @@ ApmUnmapMem(ScrnInfoPtr pScrn)
	33	WRXB(0xDB, pApm->db);
	34	}
	35	WRXB(0xC9, pApm->c9);
	36	+#ifndef XSERVER_LIBPCIACCESS
	37	xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pApm->LinMap, pApm->LinMapSize);
	38	+#else
	39	+ pci_device_unmap_range(pApm->PciInfo, (pointer)pApm->LinMap, pApm->LinMapSize);
	40	+#endif
	41	pApm->LinMap = NULL;
	42	}
	43	else if (pApm->FbBase)
	44	+#ifndef XSERVER_LIBPCIACCESS
	45	xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pApm->LinMap, 0x10000);
	46	-
	47	+#else
	48	+ pci_device_unmap_range(pApm->PciInfo, (pointer)pApm->LinMap, 0x10000);
	49	+#endif
	50	return TRUE;
	51	}
	52
	53	@@ -1784,7 +1796,6 @@ ApmScreenInit(SCREEN_INIT_ARGS_DECL)
	54	}
	55	#endif
	56
	57	- miInitializeBackingStore(pScreen);
	58	xf86SetBackingStore(pScreen);
	59	xf86SetSilkenMouse(pScreen);
	60