Attachment #241519 for bug #270869




PORTNAME=	xf86-video-nv
PORTVERSION=	2.1.22
PORTREVISION=	5
CATEGORIES=	x11-drivers

MAINTAINER=	x11@FreeBSD.org
COMMENT=	X.Org nv display driver
WWW=		https://www.x.org/

USES=		tar:xz xorg-cat:driver

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/x11-drivers/xf86-video-nv/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1484715801	1	TIMESTAMP = 1681571410
2	SHA256 (xorg/driver/xf86-video-nv-2.1.21.tar.bz2) = 1f98649e6ff0e8214b9d5dcac661f1d004be8e73823d8247b9c7025fd81db32d	2	SHA256 (xorg/driver/xf86-video-nv-2.1.22.tar.xz) = 6218932db5c389878d853b11b8fbb667c321b65276f55aa6842a56fb1a30d288
3	SIZE (xorg/driver/xf86-video-nv-2.1.21.tar.bz2) = 424091	3	SIZE (xorg/driver/xf86-video-nv-2.1.22.tar.xz) = 354708




--- src/nv_driver.c.orig	2017-01-17 22:41:33 UTC
+++ src/nv_driver.c
@@ -911,6 +911,8 @@ NVPciProbe(DriverPtr drv, int entity, struct pci_devic
                       NVGetPCIXpressChip(dev) : dev->vendor_id << 16 | dev->device_id;
     const char *name = xf86TokenToString(NVKnownChipsets, id);
 
+#ifndef __FreeBSD__
+    /* FreeBSD always has vgapci driver attached.  */
     if (pci_device_has_kernel_driver(dev)) {
         xf86DrvMsg(0, X_ERROR,
                    NV_NAME ": The PCI device 0x%x (%s) at %2.2d@%2.2d:%2.2d:%1.1d has a kernel module claiming it.\n",
@@ -919,6 +921,7 @@ NVPciProbe(DriverPtr drv, int entity, struct pci_devic
                    NV_NAME ": This driver cannot operate until it has been unloaded.\n");
         return FALSE;
     }
+#endif
 
     if(dev->vendor_id == PCI_VENDOR_NVIDIA && !name &&
        !NVIsSupported(id) && !NVIsG80(id)) {
@@ -1543,7 +1546,11 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
 	xf86FreeInt10(pNv->pInt);
 	return FALSE;
     }




# ifdef away this XAA function call as done above
#
--- src/riva_xaa.c.orig	2013-02-07 07:56:01 UTC
+++ src/riva_xaa.c
@@ -91,7 +91,9 @@ RivaSetRopPattern(RivaPtr pRiva, int rop
     if (pRiva->currentRop != (rop + 16)) {
         pRiva->currentRop = rop + 16; /* +16 is important */
         RIVA_FIFO_FREE(pRiva->riva, Rop, 1);
+#ifdef HAVE_XAA_H
         pRiva->riva.Rop->Rop3 = XAAGetPatternROP(rop);
+#endif
     }
 }
 #ifdef HAVE_XAA_H
- 

Return to bug 270869

Lines 1-12 Link Here

(-)b/x11-drivers/xf86-video-nv/Makefile (-3 / +2 lines)
1	PORTNAME= xf86-video-nv	1	PORTNAME= xf86-video-nv
2	PORTVERSION= 2.1.21	2	PORTVERSION= 2.1.22
3	PORTREVISION= 5
4	CATEGORIES= x11-drivers	3	CATEGORIES= x11-drivers
5		4
6	MAINTAINER= x11@FreeBSD.org	5	MAINTAINER= x11@FreeBSD.org
7	COMMENT= X.Org nv display driver	6	COMMENT= X.Org nv display driver
8	WWW= https://www.x.org/	7	WWW= https://www.x.org/
9		8
10	USES= xorg-cat:driver	9	USES= tar:xz xorg-cat:driver
11		10
12	.include <bsd.port.mk>	11	.include <bsd.port.mk>

Lines 1-6 Link Here

(-)b/x11-drivers/xf86-video-nv/files/patch-src-nv_driver.c (-1 / +18 lines)
1	--- src/nv_driver.c.orig 2017-01-17 22:41:33 UTC	1	--- src/nv_driver.c.orig 2017-01-17 22:41:33 UTC
2	+++ src/nv_driver.c	2	+++ src/nv_driver.c
3	@@ -1543,7 +1543,11 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)	3	@@ -911,6 +911,8 @@ NVPciProbe(DriverPtr drv, int entity, struct pci_devic
		4	NVGetPCIXpressChip(dev) : dev->vendor_id << 16 \| dev->device_id;
		5	const char *name = xf86TokenToString(NVKnownChipsets, id);
		6
		7	+#ifndef __FreeBSD__
		8	+ /* FreeBSD always has vgapci driver attached. */
		9	if (pci_device_has_kernel_driver(dev)) {
		10	xf86DrvMsg(0, X_ERROR,
		11	NV_NAME ": The PCI device 0x%x (%s) at %2.2d@%2.2d:%2.2d:%1.1d has a kernel module claiming it.\n",
		12	@@ -919,6 +921,7 @@ NVPciProbe(DriverPtr drv, int entity, struct pci_devic
		13	NV_NAME ": This driver cannot operate until it has been unloaded.\n");
		14	return FALSE;
		15	}
		16	+#endif
		17
		18	if(dev->vendor_id == PCI_VENDOR_NVIDIA && !name &&
		19	!NVIsSupported(id) && !NVIsG80(id)) {
		20	@@ -1543,7 +1546,11 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
4	xf86FreeInt10(pNv->pInt);	21	xf86FreeInt10(pNv->pInt);
5	return FALSE;	22	return FALSE;
6	}	23	}

Removed Link Here

(-)a/x11-drivers/xf86-video-nv/files/patch-src_riva__xaa.c (-15 lines)
1	# ifdef away this XAA function call as done above
2	#
3	--- src/riva_xaa.c.orig 2013-02-07 07:56:01 UTC
4	+++ src/riva_xaa.c
5	@@ -91,7 +91,9 @@ RivaSetRopPattern(RivaPtr pRiva, int rop
6	if (pRiva->currentRop != (rop + 16)) {
7	pRiva->currentRop = rop + 16; /* +16 is important */
8	RIVA_FIFO_FREE(pRiva->riva, Rop, 1);
9	+#ifdef HAVE_XAA_H
10	pRiva->riva.Rop->Rop3 = XAAGetPatternROP(rop);
11	+#endif
12	}
13	}
14	#ifdef HAVE_XAA_H
15	-