Mon Aug 27 07:15:29 2018 UTC ()
Allow shadowing in i915_vgpu.c.


(riastradh)
diff -r1.17 -r1.18 src/sys/external/bsd/drm2/i915drm/files.i915drmkms
cvs diff -r1.17 -r1.18 src/sys/external/bsd/drm2/i915drm/files.i915drmkms (expand / switch to unified diff)

--- src/sys/external/bsd/drm2/i915drm/files.i915drmkms 2018/08/27 07:09:17 1.17
+++ src/sys/external/bsd/drm2/i915drm/files.i915drmkms 2018/08/27 07:15:29 1.18
@@ -1,29 +1,30 @@ @@ -1,29 +1,30 @@
1# $NetBSD: files.i915drmkms,v 1.17 2018/08/27 07:09:17 riastradh Exp $ 1# $NetBSD: files.i915drmkms,v 1.18 2018/08/27 07:15:29 riastradh Exp $
2 2
3define intelfbbus { } 3define intelfbbus { }
4device i915drmkms: drmkms, drmkms_pci, intelfbbus, agp_i810 4device i915drmkms: drmkms, drmkms_pci, intelfbbus, agp_i810
5attach i915drmkms at pci 5attach i915drmkms at pci
6 6
7device intelfb: intelfbbus, drmfb, drmfb_pci, wsemuldisplaydev 7device intelfb: intelfbbus, drmfb, drmfb_pci, wsemuldisplaydev
8attach intelfb at intelfbbus 8attach intelfb at intelfbbus
9 9
10makeoptions i915drmkms CPPFLAGS+="-I$S/external/bsd/drm2/dist/drm/i915" 10makeoptions i915drmkms CPPFLAGS+="-I$S/external/bsd/drm2/dist/drm/i915"
11makeoptions i915drmkms CPPFLAGS+="-I$S/external/bsd/drm2/i915drm" 11makeoptions i915drmkms CPPFLAGS+="-I$S/external/bsd/drm2/i915drm"
12 12
13makeoptions i915drmkms "CWARNFLAGS.i915_drv.c"+="${${ACTIVE_CC} == gcc:? -Wno-override-init :}" 13makeoptions i915drmkms "CWARNFLAGS.i915_drv.c"+="${${ACTIVE_CC} == gcc:? -Wno-override-init :}"
14makeoptions i915drmkms "CWARNFLAGS.i915_drv.c"+="${${ACTIVE_CC} == clang:? -Wno-initializer-overrides :}" 14makeoptions i915drmkms "CWARNFLAGS.i915_drv.c"+="${${ACTIVE_CC} == clang:? -Wno-initializer-overrides :}"
15makeoptions i915drmkms "CWARNFLAGS.i915_gem.c"+="-Wno-shadow" 15makeoptions i915drmkms "CWARNFLAGS.i915_gem.c"+="-Wno-shadow"
16makeoptions i915drmkms "CWARNFLAGS.i915_gpu_error.c"+="-Wno-shadow" 16makeoptions i915drmkms "CWARNFLAGS.i915_gpu_error.c"+="-Wno-shadow"
 17makeoptions i915drmkms "CWARNFLAGS.i915_vgpu.c"+="-Wno-shadow"
17makeoptions i915drmkms "CWARNFLAGS.intel_display.c"+="-Wno-shadow -Wno-conversion" 18makeoptions i915drmkms "CWARNFLAGS.intel_display.c"+="-Wno-shadow -Wno-conversion"
18makeoptions i915drmkms "CWARNFLAGS.intel_panel.c"+="-Wno-shadow" 19makeoptions i915drmkms "CWARNFLAGS.intel_panel.c"+="-Wno-shadow"
19makeoptions i915drmkms "CWARNFLAGS.intel_pm.c"+="-Wno-shadow" 20makeoptions i915drmkms "CWARNFLAGS.intel_pm.c"+="-Wno-shadow"
20 21
21# XXX x86 kludge. 22# XXX x86 kludge.
22makeoptions i915drmkms CPPFLAGS+="-DCONFIG_DRM_I915_FBDEV=1" 23makeoptions i915drmkms CPPFLAGS+="-DCONFIG_DRM_I915_FBDEV=1"
23makeoptions i915drmkms CPPFLAGS+="-DCONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT=0" 24makeoptions i915drmkms CPPFLAGS+="-DCONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT=0"
24makeoptions i915drmkms CPPFLAGS+="-DCONFIG_DRM_FBDEV_EMULATION=1" 25makeoptions i915drmkms CPPFLAGS+="-DCONFIG_DRM_FBDEV_EMULATION=1"
25 26
26file external/bsd/drm2/i915drm/i915_module.c i915drmkms 27file external/bsd/drm2/i915drm/i915_module.c i915drmkms
27file external/bsd/drm2/i915drm/i915_pci.c i915drmkms 28file external/bsd/drm2/i915drm/i915_pci.c i915drmkms
28file external/bsd/drm2/i915drm/intel_gtt.c i915drmkms 29file external/bsd/drm2/i915drm/intel_gtt.c i915drmkms
29 30