[src/trunk]: src/sys/external/bsd/drm2/linux Turn MSI off again.

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

details:   https://anonhg.NetBSD.org/src/rev/d20df88f8d0e
branches:  trunk
changeset: 969089:d20df88f8d0e
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Fri Feb 07 18:13:33 2020 +0000

description:
Turn MSI off again.

diffstat:

 sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/pci/nouveau_nvkm_subdev_pci_base.c |  12 +++------
 sys/external/bsd/drm2/linux/linux_pci.c                                               |   8 +++++-
 2 files changed, 10 insertions(+), 10 deletions(-)

diffs (75 lines):

diff -r 430cef959dab -r d20df88f8d0e sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/pci/nouveau_nvkm_subdev_pci_base.c
--- a/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/pci/nouveau_nvkm_subdev_pci_base.c     Fri Feb 07 15:11:46 2020 +0000
+++ b/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/pci/nouveau_nvkm_subdev_pci_base.c     Fri Feb 07 18:13:33 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nouveau_nvkm_subdev_pci_base.c,v 1.5 2020/02/03 16:22:25 jmcneill Exp $        */
+/*     $NetBSD: nouveau_nvkm_subdev_pci_base.c,v 1.6 2020/02/07 18:13:33 jmcneill Exp $        */
 
 /*
  * Copyright 2015 Red Hat Inc.
@@ -24,7 +24,7 @@
  * Authors: Ben Skeggs <bskeggs%redhat.com@localhost>
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_subdev_pci_base.c,v 1.5 2020/02/03 16:22:25 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_subdev_pci_base.c,v 1.6 2020/02/07 18:13:33 jmcneill Exp $");
 
 #include "priv.h"
 #include "agp.h"
@@ -142,18 +142,14 @@
 #ifdef __NetBSD__
     {
        const struct pci_attach_args *pa = &pdev->pd_pa;
-       const pci_intr_type_t intr_type = pci->msi ?
-           PCI_INTR_TYPE_MSI : PCI_INTR_TYPE_INTX;
-
        int counts[PCI_INTR_TYPE_SIZE] =  {
-                       [PCI_INTR_TYPE_INTX] = 0,
+                       [PCI_INTR_TYPE_INTX] = 1,
                        [PCI_INTR_TYPE_MSI] = 0,
                        [PCI_INTR_TYPE_MSIX] = 0,
        };
-       counts[intr_type] = 1;
 
        /* XXX errno NetBSD->Linux */
-       ret = -pci_intr_alloc(pa, &pci->pci_ihp, counts, intr_type);
+       ret = -pci_intr_alloc(pa, &pci->pci_ihp, counts, PCI_INTR_TYPE_INTX);
        if (ret)
                return ret;
        pci->pci_intrcookie = pci_intr_establish_xname(pa->pa_pc,
diff -r 430cef959dab -r d20df88f8d0e sys/external/bsd/drm2/linux/linux_pci.c
--- a/sys/external/bsd/drm2/linux/linux_pci.c   Fri Feb 07 15:11:46 2020 +0000
+++ b/sys/external/bsd/drm2/linux/linux_pci.c   Fri Feb 07 18:13:33 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: linux_pci.c,v 1.8 2020/02/03 16:22:52 jmcneill Exp $   */
+/*     $NetBSD: linux_pci.c,v 1.9 2020/02/07 18:13:33 jmcneill Exp $   */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_pci.c,v 1.8 2020/02/03 16:22:52 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_pci.c,v 1.9 2020/02/07 18:13:33 jmcneill Exp $");
 
 #include <linux/pci.h>
 
@@ -266,6 +266,7 @@
 int
 pci_enable_msi(struct pci_dev *pdev)
 {
+#ifdef notyet
        const struct pci_attach_args *const pa = &pdev->pd_pa;
 
        if (pci_msi_alloc_exact(pa, &pdev->pd_intr_handles, 1))
@@ -273,6 +274,9 @@
 
        pdev->msi_enabled = 1;
        return 0;
+#else
+       return -ENOSYS;
+#endif
 }
 
 void