re: install/53188: Can't use console on systems with modern NVIDIA

[matthew green <mrg%eterna.com.au@localhost>]

can you or anyone else with a modern nvidia card test this patch?

thanks.


.mrg.

Index: nouveau_pci.c
===================================================================
RCS file: /cvsroot/src/sys/external/bsd/drm2/nouveau/nouveau_pci.c,v
retrieving revision 1.8
diff -p -u -r1.8 nouveau_pci.c
--- nouveau_pci.c	19 Apr 2016 06:57:37 -0000	1.8
+++ nouveau_pci.c	19 May 2018 09:08:22 -0000
@@ -91,6 +91,28 @@ nouveau_pci_match(device_t parent, cfdat
 	if (PCI_CLASS(pa->pa_class) != PCI_CLASS_DISPLAY)
 		return 0;
 
+	/*
+	 * NetBSD drm2 doesn't suport Pascal-based cards:
+	 *   0x1580-0x15ff 	GP100
+	 *   0x1b00-0x1b7f 	GP102
+	 *   0x1b80-0x1bff 	GP104
+	 *   0x1c00-0x1b7f 	GP106
+	 *   0x1c80-0x1cff 	GP107
+	 *   0x1d00-0x1d7f 	GP108
+	 *   0x1d80-0x1dff 	GV100
+	 */
+#define IS_BETWEEN(x,y) \
+	(PCI_PRODUCT(pa->pa_id) >= (x) && PCI_PRODUCT(pa->pa_id) <= (y))
+	
+	if (IS_BETWEEN(0x1580, 0x15ff) ||
+	    IS_BETWEEN(0x1b00, 0x1b7f) ||
+	    IS_BETWEEN(0x1b80, 0x1bff) ||
+	    IS_BETWEEN(0x1c00, 0x1b7f) ||
+	    IS_BETWEEN(0x1c80, 0x1cff) ||
+	    IS_BETWEEN(0x1d00, 0x1d7f) ||
+	    IS_BETWEEN(0x1d80, 0x1dff))
+		return 0;
+
 	return 6;		/* XXX Beat genfb_pci...  */
 }