kern/49330: Attempting to compile a Xen DOM0 and DRMKMS kernel doesn't compile

[brad%anduin.eldar.org@localhost]

>Number:         49330
>Category:       kern
>Synopsis:       Attempting to compile a Xen DOM0 and DRMKMS kernel doesn't compile
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    kern-bug-people
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Tue Oct 28 12:05:00 +0000 2014
>Originator:     Brad
>Release:        7.0_BETA
>Organization:
eldar.org
>Environment:
Compiling up 7.0_BETA on 6.1_STABLE
>Description:
I don't know if this is exactly suppose to work, but I was attempting to compile a Xen DOM0 kernel with the new DRMKMS support in it and the compile fails:

/lhome/build/NetBSD_7/amd64/TOOLS/bin/x86_64--netbsd-gcc -mcmodel=kernel -mno-red-zone -mno-mmx -mno-sse -mno-avx -msoft-float -mno-fp-ret-in-387 -ffreestanding -fno-zero-initialized-in-bss -g -O2 -fno-omit-frame-pointer -fstack-protector -Wstack-protector --param ssp-buffer-size=1 -fno-strict-aliasing -fno-common -std=gnu99 -Werror -Wall -Wno-main -Wno-format-zero-length -Wpointer-arith -Wmissing-prototypes -Wstrict-prototypes -Wold-style-definition -Wswitch -Wshadow -Wcast-qual -Wwrite-strings -Wno-unreachable-code -Wno-pointer-sign -Wno-attributes -Wextra -Wno-unused-parameter -Wold-style-definition -Wno-sign-compare --sysroot=/lhome/build/NetBSD_7/amd64/DIST -Damd64 -Dx86_64 -I. -I/usr/installed_src/NetBSD_7_branch/src/sys/arch/amd64/compile/DRMKMS_XEN3_DOM0/xen-ma -I../../../../../common/include -I../../../../arch -I../../../.. -nostdinc -DMSGBUFSIZE=24576 -DMAXUSERS=32 -D_KERNEL -D_KERNEL_OPT -std=gnu99 -I../../../../lib/libkern/../../../common/lib/libc/quad -I../../../
 ../lib/libkern/../../../common/lib/libc/string -I../../../../lib/libkern/../../../common/lib/libc/arch/x86_64/string -D_FORTIFY_SOURCE=2 -I../../../../external/bsd/ipf -I../../../../external/isc/atheros_hal/dist -I../../../../external/isc/atheros_hal/ic -I../../../../external/bsd/drm2/include -I../../../../external/bsd/common/include -I../../../../external/bsd/drm2/include -I../../../../external/bsd/drm2/include/drm -I../../../../external/bsd/drm2/dist -I../../../../external/bsd/drm2/dist/include -I../../../../external/bsd/drm2/dist/include/drm -I../../../../external/bsd/drm2/dist/uapi -I../../../../external/bsd/common/include -D__KERNEL__ -DCONFIG_AGP -I../../../../external/bsd/drm2/dist/drm/i915 -I../../../../external/bsd/drm2/i915drm -DCONFIG_DRM_I915_FBDEV -I../../../../external/bsd/drm2/dist/drm/radeon -I../../../../external/bsd/drm2/include/radeon -I../../../../external/bsd/drm2/radeon -I../../../../external/bsd/acpica/dist/include -c ../../../../external/bsd/drm2/pci/
 drm_pci.c
../../../../external/bsd/drm2/pci/drm_pci.c: In function 'drm_pci_get_irq':
../../../../external/bsd/drm2/pci/drm_pci.c:232:9: error: incompatible types when assigning to type 'int' from type 'pci_intr_handle_t'
  ih_int = ih_pih;
         ^

*** Failed target:  drm_pci.o

The kernel include:

include "arch/amd64/conf/XEN3_DOM0"

i915drmkms*     at pci? dev ? function ?
intelfb*        at intelfbbus?

radeon*         at pci? dev ? function ?
radeondrmkmsfb* at radeonfbbus?

#nouveau*       at pci? dev ? function ?
#nouveaufb*     at nouveaufbbus

#no options     DIAGNOSTIC
#options        DIAGNOSTIC      # inexpensive kernel consistency checks
#options        DEBUG           # expensive debugging checks/support
#options        LOCKDEBUG       # debug locks
makeoptions     DEBUG="-g"      # compile full symbol table

#options        ACPIVERBOSE     # verbose ACPI device autoconfig messages
options         PCIVERBOSE      # verbose PCI device autoconfig messages
options         USBVERBOSE      # verbose USB device autoconfig messages

You will get some additional errors if you leave in the the debugging / diag options.


The background:

I have a Lenovo T530 with 16GB of memory that I am running a 6.1_STABLE DOM0 kernel on it hosting a number of guests of various sorts.  This all works pretty well.  A weakness is the X speed, as it is using the vesa X driver when running the local X server.  I have booted a non-Xen kernel of 7.0_BETA and the new DRMKMS X servers for the intel chipset appears to perform much better, so I was hoping that I would be able to combine a Xen DOM0 kernel with DRMKMS and get the full and desired effect.
>How-To-Repeat:
Attempt to use the above config.
>Fix: