[src/trunk]: src/sys/external/bsd/drm2/nouveau the previous change doubled th...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/432e26a0edb7
branches:  trunk
changeset: 319489:432e26a0edb7
user:      mrg <mrg%NetBSD.org@localhost>
date:      Thu May 31 23:46:59 2018 +0000

description:
the previous change doubled the check for pascal.  fix it so
that we only check for later maxwell and pascal once each,
as intended.

diffstat:

 sys/external/bsd/drm2/nouveau/nouveau_pci.c |  28 ++--------------------------
 1 files changed, 2 insertions(+), 26 deletions(-)

diffs (49 lines):

diff -r 3c8e7a842778 -r 432e26a0edb7 sys/external/bsd/drm2/nouveau/nouveau_pci.c
--- a/sys/external/bsd/drm2/nouveau/nouveau_pci.c       Thu May 31 23:22:50 2018 +0000
+++ b/sys/external/bsd/drm2/nouveau/nouveau_pci.c       Thu May 31 23:46:59 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nouveau_pci.c,v 1.10 2018/05/31 09:18:31 mrg Exp $     */
+/*     $NetBSD: nouveau_pci.c,v 1.11 2018/05/31 23:46:59 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.10 2018/05/31 09:18:31 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_pci.c,v 1.11 2018/05/31 23:46:59 mrg Exp $");
 
 #include <sys/types.h>
 #include <sys/device.h>
@@ -93,30 +93,6 @@
 
 #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:
-        *   0x1580-0x15ff      GP100
-        *   0x1b00-0x1b7f      GP102
-        *   0x1b80-0x1bff      GP104
-        *   0x1c00-0x1c7f      GP106
-        *   0x1c80-0x1cff      GP107
-        *   0x1d00-0x1d7f      GP108
-        *   0x1d80-0x1dff      GV100
-        */
-       
-       if (IS_BETWEEN(0x1580, 0x15ff) ||
-           IS_BETWEEN(0x1b00, 0x1b7f) ||
-           IS_BETWEEN(0x1b80, 0x1bff) ||
-           IS_BETWEEN(0x1c00, 0x1c7f) ||
-           IS_BETWEEN(0x1c80, 0x1cff) ||
-           IS_BETWEEN(0x1d00, 0x1d7f) ||
-           IS_BETWEEN(0x1d80, 0x1dff))
-               return 0;
-#undef IS_BETWEEN
-
-#define IS_BETWEEN(x,y) \
-       (PCI_PRODUCT(pa->pa_id) >= (x) && PCI_PRODUCT(pa->pa_id) <= (y))
        /*
         * NetBSD drm2 needs missing-so-far firmware for Maxwell-based cards:
         *   0x1380-0x13bf      GM107