Attachment #179103 for bug #216288

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

Lines 1-8 Link Here

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

Lines 1-2 Link Here

(-)x11-drivers/xf86-video-rendition/distinfo (-2 / +3 lines)
1	SHA256 (xorg/driver/xf86-video-rendition-4.2.5.tar.bz2) = 39b5569338237de6e17b2a2c6be73ac6c405ee596079c41a7028cfd6e54134cb	1	TIMESTAMP = 1480082861
2	SIZE (xorg/driver/xf86-video-rendition-4.2.5.tar.bz2) = 356351	2	SHA256 (xorg/driver/xf86-video-rendition-4.2.6.tar.bz2) = 660ecf21f65a4d6002c1b603d62c314f8e9624d208db5b346850b0df9dc2f9a8
		3	SIZE (xorg/driver/xf86-video-rendition-4.2.6.tar.bz2) = 362408




# Correct a string that should be const
#
--- src/rendition.c.orig	2014-09-30 14:21:44 UTC
+++ src/rendition.c
@@ -480,7 +480,7 @@ renditionPreInit(ScrnInfoPtr pScreenInfo
     MessageType       From;
     int               videoRam, Rounding, nModes = 0;
     renditionPtr      pRendition;
-    char             *in_string;
+    const char       *in_string;
     vgaHWPtr          pvgaHW;
     
 #ifdef DEBUG
 	= xf86ReturnOptValBool(pRendition->Options, OPTION_FBWC, WriteCombine);
+#ifdef XSERVER_LIBPCIACCESS
+    mapOption = PCI_DEV_MAP_FLAG_WRITABLE;
+    if (WriteCombine)
+	mapOption |= PCI_DEV_MAP_FLAG_WRITE_COMBINE;
+
+    err = pci_device_map_range(pRendition->PciInfo,
+			       pRendition->PciInfo->regions[0].base_addr,
+			       pRendition->PciInfo->regions[0].size,
+			       mapOption, (void *)&pRendition->board.vmem_base);
+
+    return (err == 0);
+#else
     if (WriteCombine) {
 	xf86DrvMsg(pScreenInfo->scrnIndex, X_CONFIG,
 		   ("Requesting Write-Combined memory access\n"));
@@ -1382,12 +1393,6 @@ renditionMapMem(ScrnInfoPtr pScreenInfo)
 	mapOption = VIDMEM_MMIO;
     }
 
-#ifdef XSERVER_LIBPCIACCESS
-    err = pci_device_map_region(pRendition->PciInfo, 0, TRUE);
-    pRendition->board.vmem_base = pRendition->PciInfo->regions[0].memory;
-
-    return (err == 0);
-#else
     pRendition->board.vmem_base=
         xf86MapPciMem(pScreenInfo->scrnIndex, mapOption,
 		      pRendition->pcitag,
@@ -1416,7 +1421,7 @@ renditionUnmapMem(ScrnInfoPtr pScreenInf
 #else
     pci_device_unmap_range(pRendition->PciInfo, 
 			   pRendition->board.vmem_base,
-			   pScreenInfo->videoRam * 1024);
+			   pRendition->PciInfo->regions[0].size);
 #endif
     return TRUE;
 #ifdef DEBUG0




--- src/rendition.h.orig	2015-10-11 22:31:54.085176000 +0200
+++ src/rendition.h	2015-10-11 22:32:12.657760000 +0200
@@ -14,9 +14,6 @@
 /* Everything using inb/outb, etc needs "compiler.h" */
 #include "compiler.h"
 
-/* Drivers for PCI hardware need this */
-#include "xf86PciInfo.h"
-
 /* Drivers that need to access the PCI config space directly need this */
 #include "xf86Pci.h"
 
@@ -28,9 +25,6 @@
 /* All drivers initialising the SW cursor need this */
 #include "mipointer.h"
 
-/* All drivers implementing backing store need this */
-#include "mibstore.h"
-
 /* All drivers using the mi colormap manipulation need this */
 #include "micmap.h"
 
@@ -69,4 +63,8 @@
 
 #include "compat-api.h"
 /* end of __RENDITION_H__ */
+
+#define PCI_CHIP_V1000 0x0001
+#define PCI_CHIP_V2x00 0x2000
+
 #endif

Return to bug 216288

Lines 1-51 Link Here

(-)x11-drivers/xf86-video-rendition/files/patch-src_rendition.c (-51 / +13 lines)
1	--- src/rendition.c.orig 2015-10-11 22:31:51.242126000 +0200	1	# Correct a string that should be const
2	+++ src/rendition.c 2015-10-11 22:32:20.465605000 +0200	2	#
3	@@ -1173,7 +1173,6 @@ renditionScreenInit(SCREEN_INIT_ARGS_DEC	3	--- src/rendition.c.orig 2014-09-30 14:21:44 UTC
4	fbPictureInit (pScreen, 0, 0);	4	+++ src/rendition.c
5		5	@@ -480,7 +480,7 @@ renditionPreInit(ScrnInfoPtr pScreenInfo
6	xf86SetBlackWhitePixels(pScreen);	6	MessageType From;
7	- miInitializeBackingStore(pScreen);	7	int videoRam, Rounding, nModes = 0;
8		8	renditionPtr pRendition;
9	/*********************************************************/	9	- char *in_string;
10	/* The actual setup of the driver-specific code */	10	+ const char *in_string;
11	@@ -1372,6 +1371,18 @@ renditionMapMem(ScrnInfoPtr pScreenInfo)	11	vgaHWPtr pvgaHW;
12	/* Override on users request */	12
13	WriteCombine	13	#ifdef DEBUG
14	= xf86ReturnOptValBool(pRendition->Options, OPTION_FBWC, WriteCombine);
15	+#ifdef XSERVER_LIBPCIACCESS
16	+ mapOption = PCI_DEV_MAP_FLAG_WRITABLE;
17	+ if (WriteCombine)
18	+ mapOption \|= PCI_DEV_MAP_FLAG_WRITE_COMBINE;
19	+
20	+ err = pci_device_map_range(pRendition->PciInfo,
21	+ pRendition->PciInfo->regions[0].base_addr,
22	+ pRendition->PciInfo->regions[0].size,
23	+ mapOption, (void *)&pRendition->board.vmem_base);
24	+
25	+ return (err == 0);
26	+#else
27	if (WriteCombine) {
28	xf86DrvMsg(pScreenInfo->scrnIndex, X_CONFIG,
29	("Requesting Write-Combined memory access\n"));
30	@@ -1382,12 +1393,6 @@ renditionMapMem(ScrnInfoPtr pScreenInfo)
31	mapOption = VIDMEM_MMIO;
32	}
33
34	-#ifdef XSERVER_LIBPCIACCESS
35	- err = pci_device_map_region(pRendition->PciInfo, 0, TRUE);
36	- pRendition->board.vmem_base = pRendition->PciInfo->regions[0].memory;
37	-
38	- return (err == 0);
39	-#else
40	pRendition->board.vmem_base=
41	xf86MapPciMem(pScreenInfo->scrnIndex, mapOption,
42	pRendition->pcitag,
43	@@ -1416,7 +1421,7 @@ renditionUnmapMem(ScrnInfoPtr pScreenInf
44	#else
45	pci_device_unmap_range(pRendition->PciInfo,
46	pRendition->board.vmem_base,
47	- pScreenInfo->videoRam * 1024);
48	+ pRendition->PciInfo->regions[0].size);
49	#endif
50	return TRUE;
51	#ifdef DEBUG0

Lines 1-31 Link Here

(-)x11-drivers/xf86-video-rendition/files/patch-src_rendition.h (-31 lines)
1	--- src/rendition.h.orig 2015-10-11 22:31:54.085176000 +0200
2	+++ src/rendition.h 2015-10-11 22:32:12.657760000 +0200
3	@@ -14,9 +14,6 @@
4	/* Everything using inb/outb, etc needs "compiler.h" */
5	#include "compiler.h"
6
7	-/* Drivers for PCI hardware need this */
8	-#include "xf86PciInfo.h"
9	-
10	/* Drivers that need to access the PCI config space directly need this */
11	#include "xf86Pci.h"
12
13	@@ -28,9 +25,6 @@
14	/* All drivers initialising the SW cursor need this */
15	#include "mipointer.h"
16
17	-/* All drivers implementing backing store need this */
18	-#include "mibstore.h"
19	-
20	/* All drivers using the mi colormap manipulation need this */
21	#include "micmap.h"
22
23	@@ -69,4 +63,8 @@
24
25	#include "compat-api.h"
26	/* end of __RENDITION_H__ */
27	+
28	+#define PCI_CHIP_V1000 0x0001
29	+#define PCI_CHIP_V2x00 0x2000
30	+
31	#endif