i915 drm module

diff --git a/linux-core/Makefile b/linux-core/Makefile
index c5149b2..28965e4 100644 (file)
--- a/linux-core/Makefile
+++ b/linux-core/Makefile
@@ -49,7 +49,7 @@ MODULE_LIST := gamma.o tdfx.o r128.o radeon.o mga.o sis.o savage.o via.o mach64.
 # Modules only for ix86 architectures
 ifneq (,$(findstring 86,$(MACHINE)))
 ARCHX86 := 1
-MODULE_LIST += i830.o i810.o
+MODULE_LIST += i830.o i810.o i915.o
 endif
 
 ifneq (,$(findstring sparc64,$(MACHINE)))
@@ -84,6 +84,8 @@ MGASHARED =     mga.h mga_dma.c mga_drm.h mga_drv.h mga_irq.c mga_state.c \
                 mga_ucode.h mga_warp.c
 I810HEADERS =   i810.h i810_drv.h i810_drm.h $(DRMHEADERS) $(DRMTEMPLATES)
 I830HEADERS =   i830.h i830_drv.h i830_drm.h $(DRMHEADERS) $(DRMTEMPLATES)
+I915HEADERS =   i915.h i915_drv.h i915_drm.h $(DRMHEADERS) $(DRMTEMPLATES)
+I915SHARED  =   i915.h i915_drv.h i915_drm.h i915_irq.c i915_mem.c i915_dma.c
 SISHEADERS=     sis.h sis_drv.h sis_drm.h $(DRMHEADERS)
 SISSHARED=      sis.h sis_drv.h sis_drm.h sis_ds.c sis_ds.h sis_mm.c
 SAVAGEHEADERS=  savage.h savage_drv.h savage_drm.h $(DRMHEADERS) \
@@ -99,7 +101,8 @@ MACH64SHARED         = mach64.h mach64_drv.h mach64_drm.h mach64_dma.c \
 FFBHEADERS     = ffb.h ffb_drv.h $(DRMHEADERS) $(DRMTEMPLATES)
 
 SHAREDSRC = $(DRMSHARED) $(MGASHARED) $(R128SHARED) $(RADEONSHARED) \
-       $(SISSHARED) $(TDFXSHARED) $(VIASHARED) $(MACH64SHARED)
+       $(SISSHARED) $(TDFXSHARED) $(VIASHARED) $(MACH64SHARED) \
+       $(I915SHARED)
 
 PROGS = dristat drmstat
 
@@ -315,6 +318,7 @@ CONFIG_DRM_I810 := n
 CONFIG_DRM_R128 := n
 CONFIG_DRM_RADEON := n
 CONFIG_DRM_I830 := n
+CONFIG_DRM_I915 := n
 CONFIG_DRM_SIS := n
 CONFIG_DRM_FFB := n
 CONFIG_DRM_SAVAGE := n
@@ -360,6 +364,9 @@ endif
 ifneq (,$(findstring i830,$(DRM_MODULES)))
 CONFIG_DRM_I830 := m
 endif
+ifneq (,$(findstring i915,$(DRM_MODULES)))
+CONFIG_DRM_I915 := m
+endif
 ifneq (,$(findstring savage,$(DRM_MODULES)))
 CONFIG_DRM_SAVAGE := m
 endif
@@ -374,6 +381,7 @@ $(r128-objs):       $(R128HEADERS)
 $(mga-objs):   $(MGAHEADERS)
 $(i810-objs):  $(I810HEADERS)
 $(i830-objs):  $(I830HEADERS)
+$(i915-objs):  $(I830HEADERS)
 $(radeon-objs):        $(RADEONHEADERS)
 $(sis-objs):   $(SISHEADERS)
 $(ffb-objs):   $(FFBHEADERS)

diff --git a/linux-core/Makefile.kernel b/linux-core/Makefile.kernel
index 3f46738..30b00f6 100644 (file)
--- a/linux-core/Makefile.kernel
+++ b/linux-core/Makefile.kernel
@@ -13,6 +13,7 @@ r128-objs   := r128_drv.o r128_cce.o r128_state.o r128_irq.o
 mga-objs    := mga_drv.o mga_dma.o mga_state.o mga_warp.o mga_irq.o 
 i810-objs   := i810_drv.o i810_dma.o
 i830-objs   := i830_drv.o i830_dma.o i830_irq.o
+i915-objs   := i915_drv.o i915_dma.o i915_irq.o i915_mem.o
 radeon-objs := radeon_drv.o radeon_cp.o radeon_state.o radeon_mem.o radeon_irq.o
 sis-objs    := sis_drv.o sis_ds.o sis_mm.o
 ffb-objs    := ffb_drv.o ffb_context.o
@@ -34,7 +35,7 @@ endif
 ifeq ($(BELOW25),y)
 O_TARGET       := drm.o
 list-multi     := gamma.o tdfx.o r128.o mga.o i810.o i830.o ffb.o radeon.o \
-                   savage.o via.o mach64.o
+                   savage.o via.o mach64.o i915.o
 obj-m          :=
 obj-n          :=
 obj-           :=
@@ -48,6 +49,7 @@ obj-$(CONFIG_DRM_RADEON)+= radeon.o
 obj-$(CONFIG_DRM_MGA)  += mga.o
 obj-$(CONFIG_DRM_I810) += i810.o
 obj-$(CONFIG_DRM_I830) += i830.o
+obj-$(CONFIG_DRM_I915) += i915.o
 obj-$(CONFIG_DRM_SIS)   += sis.o
 obj-$(CONFIG_DRM_FFB)   += ffb.o
 obj-$(CONFIG_DRM_SAVAGE)+= savage.o
@@ -74,6 +76,9 @@ i810.o: $(i810-objs) $(lib)
 i830.o: $(i830-objs) $(lib)
        $(LD) -r -o $@ $(i830-objs) $(lib)
 
+i915.o: $(i915-objs) $(lib)
+       $(LD) -r -o $@ $(i915-objs) $(lib)
+
 r128.o: $(r128-objs) $(lib)
        $(LD) -r -o $@ $(r128-objs) $(lib)
 

diff --git a/linux-core/i915_drv.c b/linux-core/i915_drv.c
new file mode 100644 (file)
index 0000000..1e56338
--- /dev/null
+++ b/linux-core/i915_drv.c
@@ -0,0 +1,31 @@
+/* i915_drv.c -- i830,i845,i855,i865,i915 driver -*- linux-c -*-
+ */
+
+/**************************************************************************
+ * 
+ * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * All Rights Reserved.
+ * 
+ **************************************************************************/
+
+#include "i915.h"
+#include "drmP.h"
+#include "drm.h"
+#include "i915_drm.h"
+#include "i915_drv.h"
+
+#include "drm_agpsupport.h"    
+#include "drm_auth.h"          /* is this needed? */
+#include "drm_bufs.h"
+#include "drm_context.h"       /* is this needed? */
+#include "drm_drawable.h"      /* is this needed? */
+#include "drm_drv.h"
+#include "drm_fops.h"          
+#include "drm_init.h"
+#include "drm_irq.h"
+#include "drm_ioctl.h"
+#include "drm_lock.h"
+#include "drm_memory.h"                /*  */
+#include "drm_proc.h"
+#include "drm_vm.h"
+#include "drm_stub.h"  

diff --git a/linux/Makefile b/linux/Makefile
index c5149b2..28965e4 100644 (file)
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -49,7 +49,7 @@ MODULE_LIST := gamma.o tdfx.o r128.o radeon.o mga.o sis.o savage.o via.o mach64.
 # Modules only for ix86 architectures
 ifneq (,$(findstring 86,$(MACHINE)))
 ARCHX86 := 1
-MODULE_LIST += i830.o i810.o
+MODULE_LIST += i830.o i810.o i915.o
 endif
 
 ifneq (,$(findstring sparc64,$(MACHINE)))
@@ -84,6 +84,8 @@ MGASHARED =     mga.h mga_dma.c mga_drm.h mga_drv.h mga_irq.c mga_state.c \
                 mga_ucode.h mga_warp.c
 I810HEADERS =   i810.h i810_drv.h i810_drm.h $(DRMHEADERS) $(DRMTEMPLATES)
 I830HEADERS =   i830.h i830_drv.h i830_drm.h $(DRMHEADERS) $(DRMTEMPLATES)
+I915HEADERS =   i915.h i915_drv.h i915_drm.h $(DRMHEADERS) $(DRMTEMPLATES)
+I915SHARED  =   i915.h i915_drv.h i915_drm.h i915_irq.c i915_mem.c i915_dma.c
 SISHEADERS=     sis.h sis_drv.h sis_drm.h $(DRMHEADERS)
 SISSHARED=      sis.h sis_drv.h sis_drm.h sis_ds.c sis_ds.h sis_mm.c
 SAVAGEHEADERS=  savage.h savage_drv.h savage_drm.h $(DRMHEADERS) \
@@ -99,7 +101,8 @@ MACH64SHARED         = mach64.h mach64_drv.h mach64_drm.h mach64_dma.c \
 FFBHEADERS     = ffb.h ffb_drv.h $(DRMHEADERS) $(DRMTEMPLATES)
 
 SHAREDSRC = $(DRMSHARED) $(MGASHARED) $(R128SHARED) $(RADEONSHARED) \
-       $(SISSHARED) $(TDFXSHARED) $(VIASHARED) $(MACH64SHARED)
+       $(SISSHARED) $(TDFXSHARED) $(VIASHARED) $(MACH64SHARED) \
+       $(I915SHARED)
 
 PROGS = dristat drmstat
 
@@ -315,6 +318,7 @@ CONFIG_DRM_I810 := n
 CONFIG_DRM_R128 := n
 CONFIG_DRM_RADEON := n
 CONFIG_DRM_I830 := n
+CONFIG_DRM_I915 := n
 CONFIG_DRM_SIS := n
 CONFIG_DRM_FFB := n
 CONFIG_DRM_SAVAGE := n
@@ -360,6 +364,9 @@ endif
 ifneq (,$(findstring i830,$(DRM_MODULES)))
 CONFIG_DRM_I830 := m
 endif
+ifneq (,$(findstring i915,$(DRM_MODULES)))
+CONFIG_DRM_I915 := m
+endif
 ifneq (,$(findstring savage,$(DRM_MODULES)))
 CONFIG_DRM_SAVAGE := m
 endif
@@ -374,6 +381,7 @@ $(r128-objs):       $(R128HEADERS)
 $(mga-objs):   $(MGAHEADERS)
 $(i810-objs):  $(I810HEADERS)
 $(i830-objs):  $(I830HEADERS)
+$(i915-objs):  $(I830HEADERS)
 $(radeon-objs):        $(RADEONHEADERS)
 $(sis-objs):   $(SISHEADERS)
 $(ffb-objs):   $(FFBHEADERS)

diff --git a/linux/Makefile.kernel b/linux/Makefile.kernel
index 3f46738..30b00f6 100644 (file)
--- a/linux/Makefile.kernel
+++ b/linux/Makefile.kernel
@@ -13,6 +13,7 @@ r128-objs   := r128_drv.o r128_cce.o r128_state.o r128_irq.o
 mga-objs    := mga_drv.o mga_dma.o mga_state.o mga_warp.o mga_irq.o 
 i810-objs   := i810_drv.o i810_dma.o
 i830-objs   := i830_drv.o i830_dma.o i830_irq.o
+i915-objs   := i915_drv.o i915_dma.o i915_irq.o i915_mem.o
 radeon-objs := radeon_drv.o radeon_cp.o radeon_state.o radeon_mem.o radeon_irq.o
 sis-objs    := sis_drv.o sis_ds.o sis_mm.o
 ffb-objs    := ffb_drv.o ffb_context.o
@@ -34,7 +35,7 @@ endif
 ifeq ($(BELOW25),y)
 O_TARGET       := drm.o
 list-multi     := gamma.o tdfx.o r128.o mga.o i810.o i830.o ffb.o radeon.o \
-                   savage.o via.o mach64.o
+                   savage.o via.o mach64.o i915.o
 obj-m          :=
 obj-n          :=
 obj-           :=
@@ -48,6 +49,7 @@ obj-$(CONFIG_DRM_RADEON)+= radeon.o
 obj-$(CONFIG_DRM_MGA)  += mga.o
 obj-$(CONFIG_DRM_I810) += i810.o
 obj-$(CONFIG_DRM_I830) += i830.o
+obj-$(CONFIG_DRM_I915) += i915.o
 obj-$(CONFIG_DRM_SIS)   += sis.o
 obj-$(CONFIG_DRM_FFB)   += ffb.o
 obj-$(CONFIG_DRM_SAVAGE)+= savage.o
@@ -74,6 +76,9 @@ i810.o: $(i810-objs) $(lib)
 i830.o: $(i830-objs) $(lib)
        $(LD) -r -o $@ $(i830-objs) $(lib)
 
+i915.o: $(i915-objs) $(lib)
+       $(LD) -r -o $@ $(i915-objs) $(lib)
+
 r128.o: $(r128-objs) $(lib)
        $(LD) -r -o $@ $(r128-objs) $(lib)
 

diff --git a/linux/i915_drv.c b/linux/i915_drv.c
new file mode 100644 (file)
index 0000000..1e56338
--- /dev/null
+++ b/linux/i915_drv.c
@@ -0,0 +1,31 @@
+/* i915_drv.c -- i830,i845,i855,i865,i915 driver -*- linux-c -*-
+ */
+
+/**************************************************************************
+ * 
+ * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * All Rights Reserved.
+ * 
+ **************************************************************************/
+
+#include "i915.h"
+#include "drmP.h"
+#include "drm.h"
+#include "i915_drm.h"
+#include "i915_drv.h"
+
+#include "drm_agpsupport.h"    
+#include "drm_auth.h"          /* is this needed? */
+#include "drm_bufs.h"
+#include "drm_context.h"       /* is this needed? */
+#include "drm_drawable.h"      /* is this needed? */
+#include "drm_drv.h"
+#include "drm_fops.h"          
+#include "drm_init.h"
+#include "drm_irq.h"
+#include "drm_ioctl.h"
+#include "drm_lock.h"
+#include "drm_memory.h"                /*  */
+#include "drm_proc.h"
+#include "drm_vm.h"
+#include "drm_stub.h"