Merge branch 'master' into vblank-rework, fixup remaining drivers

Conflicts:

	linux-core/drmP.h
	linux-core/drm_drv.c
	linux-core/drm_irq.c
	shared-core/i915_drv.h
	shared-core/i915_irq.c
	shared-core/mga_drv.h
	shared-core/mga_irq.c
	shared-core/radeon_drv.h
	shared-core/radeon_irq.c

Merge in the latest master bits and update the remaining drivers (except
mach64 which math_b is working on).  Also remove the 9xx hack from the i915
driver; it seems to be correct.

1 files changed, 2 insertions, 62 deletions

diff --git a/bsd-core/Makefile b/bsd-core/Makefile
index 00889dae..a58ac0a5 100644
--- a/bsd-core/Makefile
+++ b/bsd-core/Makefile
@@ -1,71 +1,11 @@
 SHARED=		../shared-core
-SHAREDFILES=	drm.h \
-		drm_sarea.h \
-		i915_dma.c \
-		i915_drm.h \
-		i915_drv.h \
-		i915_irq.c \
-		i915_mem.c \
-		mach64_dma.c \
-		mach64_drm.h \
-		mach64_drv.h \
-		mach64_irq.c \
-		mach64_state.c \
-		mga_dma.c \
-		mga_drm.h \
-		mga_drv.h \
-		mga_irq.c \
-		mga_state.c \
-		mga_ucode.h \
-		mga_warp.c \
-		r128_cce.c \
-		r128_drm.h \
-		r128_drv.h \
-		r128_irq.c \
-		r128_state.c \
-		radeon_cp.c \
-		radeon_drm.h \
-		radeon_drv.h \
-		radeon_irq.c \
-		radeon_mem.c \
-		radeon_state.c \
-		r300_cmdbuf.c \
-		r300_reg.h \
-		savage_bci.c \
-		savage_drm.h \
-		savage_drv.h \
-		savage_state.c \
-		sis_drm.h \
-		sis_drv.h \
-		sis_ds.c \
-		sis_ds.h \
-		sis_mm.c \
-		tdfx_drv.h \
-		via_3d_reg.h \
-		via_dma.c \
-		via_drm.h \
-		via_drv.h \
-		via_ds.c \
-		via_ds.h \
-		via_irq.c \
-		via_map.c \
-		via_mm.c \
-		via_mm.h \
-		via_verifier.c \
-		via_verifier.h \
-		via_video.c
 
 SUBDIR = drm mach64 mga r128 radeon savage sis tdfx i915 # via
 
-CLEANFILES+= ${SHAREDFILES}
-
 .include <bsd.obj.mk>
 
-depend: drm_pciids.h ${SHAREDFILES}
-all: drm_pciids.h ${SHAREDFILES}
+depend: drm_pciids.h
+all: drm_pciids.h
 
 drm_pciids.h: ${SHARED}/drm_pciids.txt
 	sh ../scripts/create_bsd_pci_lists.sh < ${SHARED}/drm_pciids.txt
-
-${SHAREDFILES}:
-	ln -sf ${SHARED}/$@ $@