d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implement a workaround for kms-drm modules

Browse Source 
pci_iov_if.h was added to pci.h, but none of the kms-drm branches have
that. Rather than play whack a mole with the branches, move its inclusion to
linux_pci.c which is the only part of the code that needs it now.

Longer term, other solutions will be needed, but this gives us time to get those
deployed on all the supported versions.
This commit is contained in:
Warner Losh 2020-03-20 15:07:25 +00:00
parent 6f7bbb2661
commit 9275cd0dc5
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/compat/linuxkpi/common/include/linux/pci.h
View File

@ -40,10 +40,10 @@
#include <sys/nv.h> #include <sys/nv.h>
#include <sys/pciio.h> #include <sys/pciio.h>
#include <sys/rman.h> #include <sys/rman.h>
#include <sys/bus.h>
#include <dev/pci/pcivar.h> #include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h> #include <dev/pci/pcireg.h>
#include <dev/pci/pci_private.h> #include <dev/pci/pci_private.h>
#include <dev/pci/pci_iov.h>
#include <machine/resource.h> #include <machine/resource.h>

5
sys/compat/linuxkpi/common/src/linux_pci.c
View File

@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$");
#include <sys/fcntl.h> #include <sys/fcntl.h>
#include <sys/file.h> #include <sys/file.h>
#include <sys/filio.h> #include <sys/filio.h>
#include <sys/pciio.h>
#include <sys/pctrie.h> #include <sys/pctrie.h>
#include <sys/rwlock.h> #include <sys/rwlock.h>
@ -46,6 +47,10 @@ __FBSDID("$FreeBSD$");
#include <machine/stdarg.h> #include <machine/stdarg.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pci_private.h>
#include <dev/pci/pci_iov.h>
#include <linux/kobject.h> #include <linux/kobject.h>
#include <linux/device.h> #include <linux/device.h>
#include <linux/slab.h> #include <linux/slab.h>