Attachment #202148 for bug #235849

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

Lines 1-8 Link Here

(-)b/x11-drivers/xf86-video-s3virge/Makefile (-2 / +1 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= xf86-video-s3virge	3	PORTNAME= xf86-video-s3virge
4	PORTVERSION= 1.10.7	4	PORTVERSION= 1.11.0
5	PORTREVISION= 4
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

(-)b/x11-drivers/xf86-video-s3virge/distinfo (-2 / +3 lines)
1	SHA256 (xorg/driver/xf86-video-s3virge-1.10.7.tar.bz2) = 5dbe68de05483f902fdc48e97ce8d9fdd1d2ade14cb53c0c3642f0259f65a4da	1	TIMESTAMP = 1550524793
2	SIZE (xorg/driver/xf86-video-s3virge-1.10.7.tar.bz2) = 374129	2	SHA256 (xorg/driver/xf86-video-s3virge-1.11.0.tar.bz2) = 04c9ddff2d86f8ffea348697843db02f033075089f89d051f000b87e74d9a119
		3	SIZE (xorg/driver/xf86-video-s3virge-1.11.0.tar.bz2) = 380321




From 9c8a08c9c7a0f7ec591042abd5b4a0fb50c028f1 Mon Sep 17 00:00:00 2001
From: Nick Hudson <skrll@NetBSD.org>
Date: Mon, 28 Sep 2015 22:49:21 +0200
Subject: Increase BIOS_BSIZE.

libpciaccess expects a much bigger buffer when reading ROM.
Bump it to the (normal) IO space size.

Signed-off-by: Thomas Klausner <wiz@NetBSD.org>

diff --git a/src/s3v_driver.c b/src/s3v_driver.c
index d519dc8..e5dd2e4 100644
--- src/s3v_driver.c
+++ src/s3v_driver.c
@@ -316,7 +316,7 @@ s3virgeSetup(pointer module, pointer opts, int *errmaj, int *errmin)
 
 static unsigned char *find_bios_string(S3VPtr ps3v, int BIOSbase, char *match1, char *match2)
 {
-#define BIOS_BSIZE 1024
+#define BIOS_BSIZE 0x10000
 #define BIOS_BASE  0xc0000
 
    static unsigned char bios[BIOS_BSIZE];
-- 
cgit v0.10.2





From 47f43694645f3e6347b536d5e3fb2fee56e715ab Mon Sep 17 00:00:00 2001
From: Thomas Klausner <wiz@NetBSD.org>
Date: Mon, 28 Sep 2015 22:49:22 +0200
Subject: Add cast to remove a warning on 32-bit machines.

PCI_REGION_BASE returns a 64-bit value, which needs to be converted
down to 32-bit before it can be put into a 32-bit pointer.

diff --git a/src/s3v_dga.c b/src/s3v_dga.c
index 0e603cf..0ab374d 100644
--- src/s3v_dga.c
+++ src/s3v_dga.c
@@ -337,7 +337,7 @@ S3V_OpenFramebuffer(
     S3VPtr ps3v = S3VPTR(pScrn);
 
     *name = NULL; 		/* no special device */
-    *mem = (unsigned char*)PCI_REGION_BASE(ps3v->PciInfo, 0, REGION_MEM);
+    *mem = (unsigned char*)(uintptr_t)PCI_REGION_BASE(ps3v->PciInfo, 0, REGION_MEM);
     *size = ps3v->videoRambytes;
     *offset = 0;
     *flags = DGA_NEED_ROOT;
-- 
cgit v0.10.2





# Correct a string that should be const
# Remove extra parenthesis to clear a style warning
#
--- src/s3v_driver.c.orig	2019-02-19 03:28:50.953742000 +0000
+++ src/s3v_driver.c	2019-02-19 03:29:09.119821000 +0000
@@ -2848,7 +2848,7 @@
     ClockRangePtr clockRanges;
     char *mod = NULL;
     const char *reqSym = NULL;
-    char *s;
+    const char *s;
     
     unsigned char config1, config2, m, n, n1, n2, cr66 = 0;
     int mclk;
@@ -2850,7 +2850,7 @@ S3VModeInit(ScrnInfoPtr pScrn, DisplayMo
 	  else
 	     new->CR67 = 0x50 | 0x4;                  /* 16bpp */
           }

Return to bug 235849

Removed Link Here

(-)a/x11-drivers/xf86-video-s3virge/files/patch-git_01_9c8a08c (-26 lines)
1	From 9c8a08c9c7a0f7ec591042abd5b4a0fb50c028f1 Mon Sep 17 00:00:00 2001
2	From: Nick Hudson <skrll@NetBSD.org>
3	Date: Mon, 28 Sep 2015 22:49:21 +0200
4	Subject: Increase BIOS_BSIZE.
5
6	libpciaccess expects a much bigger buffer when reading ROM.
7	Bump it to the (normal) IO space size.
8
9	Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
10
11	diff --git a/src/s3v_driver.c b/src/s3v_driver.c
12	index d519dc8..e5dd2e4 100644
13	--- src/s3v_driver.c
14	+++ src/s3v_driver.c
15	@@ -316,7 +316,7 @@ s3virgeSetup(pointer module, pointer opts, int errmaj, int errmin)
16
17	static unsigned char find_bios_string(S3VPtr ps3v, int BIOSbase, char match1, char *match2)
18	{
19	-#define BIOS_BSIZE 1024
20	+#define BIOS_BSIZE 0x10000
21	#define BIOS_BASE 0xc0000
22
23	static unsigned char bios[BIOS_BSIZE];
24	--
25	cgit v0.10.2
26

Removed Link Here

(-)a/x11-drivers/xf86-video-s3virge/files/patch-git_02_47f4369 (-24 lines)
1	From 47f43694645f3e6347b536d5e3fb2fee56e715ab Mon Sep 17 00:00:00 2001
2	From: Thomas Klausner <wiz@NetBSD.org>
3	Date: Mon, 28 Sep 2015 22:49:22 +0200
4	Subject: Add cast to remove a warning on 32-bit machines.
5
6	PCI_REGION_BASE returns a 64-bit value, which needs to be converted
7	down to 32-bit before it can be put into a 32-bit pointer.
8
9	diff --git a/src/s3v_dga.c b/src/s3v_dga.c
10	index 0e603cf..0ab374d 100644
11	--- src/s3v_dga.c
12	+++ src/s3v_dga.c
13	@@ -337,7 +337,7 @@ S3V_OpenFramebuffer(
14	S3VPtr ps3v = S3VPTR(pScrn);
15
16	name = NULL; / no special device */
17	- mem = (unsigned char)PCI_REGION_BASE(ps3v->PciInfo, 0, REGION_MEM);
18	+ mem = (unsigned char)(uintptr_t)PCI_REGION_BASE(ps3v->PciInfo, 0, REGION_MEM);
19	*size = ps3v->videoRambytes;
20	*offset = 0;
21	*flags = DGA_NEED_ROOT;
22	--
23	cgit v0.10.2
24

Lines 1-18 Link Here

(-)b/x11-drivers/xf86-video-s3virge/files/patch-src_s3v__driver.c (-13 / +3 lines)
1	# Correct a string that should be const
2	# Remove extra parenthesis to clear a style warning	1	# Remove extra parenthesis to clear a style warning
3	#	2	#
4	--- src/s3v_driver.c.orig 2016-11-25 14:37:44 UTC	3	--- src/s3v_driver.c.orig 2019-02-19 03:28:50.953742000 +0000
5	+++ src/s3v_driver.c	4	+++ src/s3v_driver.c 2019-02-19 03:29:09.119821000 +0000
6	@@ -480,7 +480,7 @@ S3VPreInit(ScrnInfoPtr pScrn, int flags)	5	@@ -2848,7 +2848,7 @@
7	ClockRangePtr clockRanges;
8	char *mod = NULL;
9	const char *reqSym = NULL;
10	- char *s;
11	+ const char *s;
12
13	unsigned char config1, config2, m, n, n1, n2, cr66 = 0;
14	int mclk;
15	@@ -2850,7 +2850,7 @@ S3VModeInit(ScrnInfoPtr pScrn, DisplayMo
16	else	6	else
17	new->CR67 = 0x50 \| 0x4; /* 16bpp */	7	new->CR67 = 0x50 \| 0x4; /* 16bpp */
18	}	8	}