Module Name: src
Committed By: mrg
Date: Mon Dec 24 08:40:33 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/nouveau: nouveau_pci.c
Log Message:
don't attach to new turing based nouveau cards.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/external/bsd/drm2/nouveau/nouveau_pci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/nouveau/nouveau_pci.c
diff -u src/sys/external/bsd/drm2/nouveau/nouveau_pci.c:1.22 src/sys/external/bsd/drm2/nouveau/nouveau_pci.c:1.23
--- src/sys/external/bsd/drm2/nouveau/nouveau_pci.c:1.22 Mon Dec 24 08:26:04 2018
+++ src/sys/external/bsd/drm2/nouveau/nouveau_pci.c Mon Dec 24 08:40:33 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_pci.c,v 1.22 2018/12/24 08:26:04 mrg Exp $ */
+/* $NetBSD: nouveau_pci.c,v 1.23 2018/12/24 08:40:33 mrg Exp $ */
/*-
* Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_pci.c,v 1.22 2018/12/24 08:26:04 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_pci.c,v 1.23 2018/12/24 08:40:33 mrg Exp $");
#include <sys/types.h>
#include <sys/device.h>
@@ -98,7 +98,7 @@ nouveau_pci_match(device_t parent, cfdat
#define IS_BETWEEN(x,y) \
(PCI_PRODUCT(pa->pa_id) >= (x) && PCI_PRODUCT(pa->pa_id) <= (y))
/*
- * NetBSD drm2 doesn't support Pascal-based cards:
+ * NetBSD drm2 doesn't support Pascal, Volta or Turing based cards:
* 0x1580-0x15ff GP100
* 0x1b00-0x1b7f GP102
* 0x1b80-0x1bff GP104
@@ -106,6 +106,9 @@ nouveau_pci_match(device_t parent, cfdat
* 0x1c80-0x1cff GP107
* 0x1d00-0x1d7f GP108
* 0x1d80-0x1dff GV100
+ * 0x1e00-0x1e7f TU102
+ * 0x1e80-0x1eff TU104
+ * 0x1f00-0x1f7f TU106
*/
if (IS_BETWEEN(0x1580, 0x15ff) ||
@@ -114,7 +117,10 @@ nouveau_pci_match(device_t parent, cfdat
IS_BETWEEN(0x1c00, 0x1c7f) ||
IS_BETWEEN(0x1c80, 0x1cff) ||
IS_BETWEEN(0x1d00, 0x1d7f) ||
- IS_BETWEEN(0x1d80, 0x1dff))
+ IS_BETWEEN(0x1d80, 0x1dff) ||
+ IS_BETWEEN(0x1e00, 0x1e7f) ||
+ IS_BETWEEN(0x1e80, 0x1eff) ||
+ IS_BETWEEN(0x1f00, 0x1f7f))
return 0;
#undef IS_BETWEEN
