Module Name: src Committed By: riastradh Date: Wed Jul 16 20:56:26 UTC 2014
Modified Files: src/sys/arch/amd64/conf: DRMKMS src/sys/external/bsd/common/include/linux: errno.h kernel.h list.h src/sys/external/bsd/drm2/dist/drm: drm_agpsupport.c drm_bufs.c drm_crtc.c drm_crtc_helper.c drm_dp_helper.c drm_edid.c drm_fb_helper.c drm_flip_work.c drm_gem.c drm_irq.c drm_modes.c drm_plane_helper.c drm_probe_helper.c drm_stub.c src/sys/external/bsd/drm2/dist/drm/i915: dvo_ch7xxx.c i915_cmd_parser.c i915_dma.c i915_drv.c i915_drv.h i915_gem.c i915_gem_context.c i915_gem_execbuffer.c i915_gem_gtt.c i915_gem_stolen.c i915_gpu_error.c i915_irq.c i915_params.c intel_acpi.c intel_display.c intel_dp.c intel_drv.h intel_dsi.c intel_fbdev.c intel_hdmi.c intel_i2c.c intel_lvds.c intel_opregion.c intel_overlay.c intel_panel.c intel_pm.c intel_ringbuffer.c intel_ringbuffer.h intel_sdvo.c intel_uncore.c src/sys/external/bsd/drm2/dist/include/drm: drmP.h drm_agpsupport.h drm_fb_helper.h drm_plane_helper.h src/sys/external/bsd/drm2/dist/uapi/drm: drm.h src/sys/external/bsd/drm2/drm: drm_cache.c drm_drv.c drm_fops.c drm_gem_vm.c drm_lock.c drm_memory.c drm_module.c drm_scatter.c drm_sysfs.c drm_vm.c files.drmkms src/sys/external/bsd/drm2/i915drm: files.i915drmkms i915_module.c i915_pci.c intel_gtt.c src/sys/external/bsd/drm2/include: i915_trace.h src/sys/external/bsd/drm2/include/asm: io.h mtrr.h src/sys/external/bsd/drm2/include/drm: bus_dma_hacks.h drm_agp_netbsd.h drm_wait_netbsd.h intel-gtt.h src/sys/external/bsd/drm2/include/linux: atomic.h bitops.h bug.h delay.h device.h err.h gfp.h idr.h io.h jiffies.h kref.h ktime.h log2.h mm_types.h mutex.h pci.h printk.h sched.h shrinker.h slab.h string.h time.h timer.h types.h vmalloc.h workqueue.h src/sys/external/bsd/drm2/linux: files.drmkms_linux linux_idr.c linux_module.c linux_work.c src/sys/external/bsd/drm2/pci: drm_pci.c src/sys/modules/drmkms: Makefile Makefile.inc src/sys/modules/drmkms_linux: Makefile src/sys/modules/i915drmkms: Makefile Added Files: src/sys/external/bsd/drm2/drm: drm_vma_manager.c src/sys/external/bsd/drm2/include/asm: div64.h page.h src/sys/external/bsd/drm2/include/drm: drm_vma_manager.h src/sys/external/bsd/drm2/include/linux: ctype.h hdmi.h irqflags.h kfifo.h mount.h pm_qos.h pm_runtime.h src/sys/external/bsd/drm2/include/video: mipi_display.h src/sys/external/bsd/drm2/linux: linux_writecomb.c Removed Files: src/sys/external/bsd/drm2/i915drm: i915_gem_gtt.c intel_fb.c src/sys/modules/drmkms: drmkms.ioconf Log Message: Make it build and boot on my test machines. Screen blanks on boot on the Ivy Bridge system with DRM error in cpt_serr_int_handler: PCH transcoder A FIFO underrun But after that everything is OK. Appears to be an upstream problem. To investigate... I think there's a cache flushing issue somewhere -- there are little display artefacts on my T60. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/amd64/conf/DRMKMS cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/common/include/linux/errno.h \ src/sys/external/bsd/common/include/linux/kernel.h \ src/sys/external/bsd/common/include/linux/list.h cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/dist/drm/drm_agpsupport.c \ src/sys/external/bsd/drm2/dist/drm/drm_crtc.c \ src/sys/external/bsd/drm2/dist/drm/drm_crtc_helper.c \ src/sys/external/bsd/drm2/dist/drm/drm_dp_helper.c \ src/sys/external/bsd/drm2/dist/drm/drm_edid.c \ src/sys/external/bsd/drm2/dist/drm/drm_gem.c cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/drm2/dist/drm/drm_bufs.c \ src/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c cvs rdiff -u -r1.1.1.1 -r1.2 \ src/sys/external/bsd/drm2/dist/drm/drm_flip_work.c \ src/sys/external/bsd/drm2/dist/drm/drm_plane_helper.c \ src/sys/external/bsd/drm2/dist/drm/drm_probe_helper.c cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm2/dist/drm/drm_irq.c \ src/sys/external/bsd/drm2/dist/drm/drm_modes.c \ src/sys/external/bsd/drm2/dist/drm/drm_stub.c cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/dist/drm/i915/dvo_ch7xxx.c \ src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c \ src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_execbuffer.c \ src/sys/external/bsd/drm2/dist/drm/i915/intel_hdmi.c \ src/sys/external/bsd/drm2/dist/drm/i915/intel_i2c.c \ src/sys/external/bsd/drm2/dist/drm/i915/intel_panel.c \ src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c \ src/sys/external/bsd/drm2/dist/drm/i915/intel_ringbuffer.c \ src/sys/external/bsd/drm2/dist/drm/i915/intel_ringbuffer.h cvs rdiff -u -r1.1.1.1 -r1.2 \ src/sys/external/bsd/drm2/dist/drm/i915/i915_cmd_parser.c \ src/sys/external/bsd/drm2/dist/drm/i915/i915_gpu_error.c \ src/sys/external/bsd/drm2/dist/drm/i915/i915_params.c \ src/sys/external/bsd/drm2/dist/drm/i915/intel_acpi.c \ src/sys/external/bsd/drm2/dist/drm/i915/intel_dsi.c \ src/sys/external/bsd/drm2/dist/drm/i915/intel_fbdev.c cvs rdiff -u -r1.8 -r1.9 src/sys/external/bsd/drm2/dist/drm/i915/i915_dma.c cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h \ src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_context.c \ src/sys/external/bsd/drm2/dist/drm/i915/intel_dp.c \ src/sys/external/bsd/drm2/dist/drm/i915/intel_lvds.c \ src/sys/external/bsd/drm2/dist/drm/i915/intel_opregion.c \ src/sys/external/bsd/drm2/dist/drm/i915/intel_overlay.c \ src/sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c cvs rdiff -u -r1.12 -r1.13 src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c cvs rdiff -u -r1.1.1.2 -r1.2 \ src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_gtt.c \ src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_stolen.c cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/drm2/dist/drm/i915/i915_irq.c \ src/sys/external/bsd/drm2/dist/drm/i915/intel_drv.h cvs rdiff -u -r1.7 -r1.8 \ src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c cvs rdiff -u -r1.2 -r1.3 \ src/sys/external/bsd/drm2/dist/drm/i915/intel_uncore.c cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/drm2/dist/include/drm/drmP.h cvs rdiff -u -r1.1.1.1 -r1.2 \ src/sys/external/bsd/drm2/dist/include/drm/drm_agpsupport.h \ src/sys/external/bsd/drm2/dist/include/drm/drm_plane_helper.h cvs rdiff -u -r1.3 -r1.4 \ src/sys/external/bsd/drm2/dist/include/drm/drm_fb_helper.h cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/dist/uapi/drm/drm.h cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/drm/drm_cache.c \ src/sys/external/bsd/drm2/drm/drm_lock.c \ src/sys/external/bsd/drm2/drm/drm_scatter.c \ src/sys/external/bsd/drm2/drm/drm_sysfs.c cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/drm2/drm/drm_drv.c cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/drm/drm_fops.c \ src/sys/external/bsd/drm2/drm/drm_gem_vm.c \ src/sys/external/bsd/drm2/drm/drm_vm.c cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/drm2/drm/drm_memory.c \ src/sys/external/bsd/drm2/drm/drm_module.c \ src/sys/external/bsd/drm2/drm/files.drmkms cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm2/drm/drm_vma_manager.c cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/i915drm/files.i915drmkms \ src/sys/external/bsd/drm2/i915drm/i915_module.c cvs rdiff -u -r1.15 -r0 src/sys/external/bsd/drm2/i915drm/i915_gem_gtt.c cvs rdiff -u -r1.10 -r1.11 src/sys/external/bsd/drm2/i915drm/i915_pci.c cvs rdiff -u -r1.2 -r0 src/sys/external/bsd/drm2/i915drm/intel_fb.c cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/i915drm/intel_gtt.c cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/include/i915_trace.h cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm2/include/asm/div64.h \ src/sys/external/bsd/drm2/include/asm/page.h cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/include/asm/io.h \ src/sys/external/bsd/drm2/include/asm/mtrr.h cvs rdiff -u -r1.3 -r1.4 \ src/sys/external/bsd/drm2/include/drm/bus_dma_hacks.h \ src/sys/external/bsd/drm2/include/drm/intel-gtt.h cvs rdiff -u -r1.2 -r1.3 \ src/sys/external/bsd/drm2/include/drm/drm_agp_netbsd.h \ src/sys/external/bsd/drm2/include/drm/drm_wait_netbsd.h cvs rdiff -u -r0 -r1.1 \ src/sys/external/bsd/drm2/include/drm/drm_vma_manager.h cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm2/include/linux/atomic.h cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/include/linux/bitops.h \ src/sys/external/bsd/drm2/include/linux/bug.h \ src/sys/external/bsd/drm2/include/linux/delay.h \ src/sys/external/bsd/drm2/include/linux/device.h \ src/sys/external/bsd/drm2/include/linux/err.h \ src/sys/external/bsd/drm2/include/linux/gfp.h \ src/sys/external/bsd/drm2/include/linux/idr.h \ src/sys/external/bsd/drm2/include/linux/io.h \ src/sys/external/bsd/drm2/include/linux/jiffies.h \ src/sys/external/bsd/drm2/include/linux/kref.h \ src/sys/external/bsd/drm2/include/linux/ktime.h \ src/sys/external/bsd/drm2/include/linux/log2.h \ src/sys/external/bsd/drm2/include/linux/mm_types.h \ src/sys/external/bsd/drm2/include/linux/mutex.h \ src/sys/external/bsd/drm2/include/linux/printk.h \ src/sys/external/bsd/drm2/include/linux/sched.h \ src/sys/external/bsd/drm2/include/linux/shrinker.h \ src/sys/external/bsd/drm2/include/linux/slab.h \ src/sys/external/bsd/drm2/include/linux/string.h \ src/sys/external/bsd/drm2/include/linux/time.h \ src/sys/external/bsd/drm2/include/linux/types.h \ src/sys/external/bsd/drm2/include/linux/vmalloc.h \ src/sys/external/bsd/drm2/include/linux/workqueue.h cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm2/include/linux/ctype.h \ src/sys/external/bsd/drm2/include/linux/hdmi.h \ src/sys/external/bsd/drm2/include/linux/irqflags.h \ src/sys/external/bsd/drm2/include/linux/kfifo.h \ src/sys/external/bsd/drm2/include/linux/mount.h \ src/sys/external/bsd/drm2/include/linux/pm_qos.h \ src/sys/external/bsd/drm2/include/linux/pm_runtime.h cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/include/linux/pci.h \ src/sys/external/bsd/drm2/include/linux/timer.h cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm2/include/video/mipi_display.h cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/drm2/linux/files.drmkms_linux cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/linux/linux_idr.c \ src/sys/external/bsd/drm2/linux/linux_module.c \ src/sys/external/bsd/drm2/linux/linux_work.c cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm2/linux/linux_writecomb.c cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/pci/drm_pci.c cvs rdiff -u -r1.2 -r1.3 src/sys/modules/drmkms/Makefile cvs rdiff -u -r1.3 -r1.4 src/sys/modules/drmkms/Makefile.inc cvs rdiff -u -r1.2 -r0 src/sys/modules/drmkms/drmkms.ioconf cvs rdiff -u -r1.2 -r1.3 src/sys/modules/drmkms_linux/Makefile cvs rdiff -u -r1.2 -r1.3 src/sys/modules/i915drmkms/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.