Module Name: src
Committed By: martin
Date: Fri Sep 1 09:51:08 UTC 2017
Modified Files:
src/sys/external/bsd/drm2/include/linux [netbsd-8]: pci.h
Log Message:
Pull up following revision(s) (requested by maya in ticket #259):
sys/external/bsd/drm2/include/linux/pci.h: revision 1.24
Disable MSI on DRMKMS (again).
It is causing problems on some older nvidia graphics cards:
http://mail-index.netbsd.org/netbsd-users/2017/08/02/msg020026.html
http://mail-index.netbsd.org/pkgsrc-users/2017/08/26/msg025492.html
PR kern/52440
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.23.6.1 src/sys/external/bsd/drm2/include/linux/pci.h
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/include/linux/pci.h
diff -u src/sys/external/bsd/drm2/include/linux/pci.h:1.23 src/sys/external/bsd/drm2/include/linux/pci.h:1.23.6.1
--- src/sys/external/bsd/drm2/include/linux/pci.h:1.23 Thu Mar 2 04:31:51 2017
+++ src/sys/external/bsd/drm2/include/linux/pci.h Fri Sep 1 09:51:08 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: pci.h,v 1.23 2017/03/02 04:31:51 nonaka Exp $ */
+/* $NetBSD: pci.h,v 1.23.6.1 2017/09/01 09:51:08 martin Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -293,6 +293,7 @@ pci_write_config_byte(struct pci_dev *pd
static inline 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->intr_handles, 1))
@@ -300,6 +301,9 @@ pci_enable_msi(struct pci_dev *pdev)
pdev->msi_enabled = 1;
return 0;
+#else
+ return -ENOSYS;
+#endif
}
static inline void
