summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--driver/Makefile4
-rw-r--r--driver/xf86-video-intel/man/Makefile.am9
-rw-r--r--driver/xf86-video-intel/src/Makefile.am145
-rw-r--r--xserver/hw/xfree86/common/xf86AutoConfig.c14
4 files changed, 139 insertions, 33 deletions
diff --git a/driver/Makefile b/driver/Makefile
index e02d42154..6fbb0994b 100644
--- a/driver/Makefile
+++ b/driver/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2008/01/05 17:53:33 matthieu Exp $
+# $OpenBSD: Makefile,v 1.17 2008/01/16 23:20:50 matthieu Exp $
# Broken
# xf86-input-calcomp xf86-input-citron xf86-input-dmc
@@ -74,7 +74,7 @@ VIDEO_DRV_hppa=
VIDEO_DRV_i386= \
${VIDEO_DRV_COMMON} \
- xf86-video-i810 xf86-video-vmware \
+ xf86-video-i810 xf86-video-intel xf86-video-vmware \
xf86-video-i740 xf86-video-nsc \
xf86-video-radeonhd \
xf86-video-via xf86-video-voodoo
diff --git a/driver/xf86-video-intel/man/Makefile.am b/driver/xf86-video-intel/man/Makefile.am
index 7432d5a32..37937803b 100644
--- a/driver/xf86-video-intel/man/Makefile.am
+++ b/driver/xf86-video-intel/man/Makefile.am
@@ -31,8 +31,7 @@ DRIVER_MAN_DIR_SUFFIX = $(DRIVER_MAN_DIR:@mandir@/man%=%)
driverman_PRE = @DRIVER_NAME@.man
driverman_DATA = \
- $(driverman_PRE:man=@DRIVER_MAN_SUFFIX@) \
- i810.@DRIVER_MAN_SUFFIX@
+ $(driverman_PRE:man=@DRIVER_MAN_SUFFIX@)
EXTRA_DIST = @DRIVER_NAME@.man
@@ -61,9 +60,3 @@ SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
.man.$(DRIVER_MAN_SUFFIX):
sed $(MAN_SUBSTS) < $< > $@
-BUILT_SOURCES = shadows.DONE
-
-shadows.DONE:
- -rm -f i810.@DRIVER_MAN_SUFFIX@
- echo .so man$(DRIVER_MAN_DIR_SUFFIX)/intel.$(DRIVER_MAN_SUFFIX) > \
- i810.@DRIVER_MAN_SUFFIX@
diff --git a/driver/xf86-video-intel/src/Makefile.am b/driver/xf86-video-intel/src/Makefile.am
index ce7b40e48..0c340d857 100644
--- a/driver/xf86-video-intel/src/Makefile.am
+++ b/driver/xf86-video-intel/src/Makefile.am
@@ -18,24 +18,56 @@
# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-SUBDIRS = xvmc
+if LIBPCIACCESS
+REGDUMPER = reg_dumper
+endif
+
+SUBDIRS = xvmc bios_reader ch7017 ch7xxx ivch sil164 tfp410 $(REGDUMPER)
+
# this is obnoxious:
# -module lets us name the module exactly how we want
# -avoid-version prevents gratuitous .0.0.0 version numbers on the end
# _ladir passes a dummy rpath to libtool so the thing will actually link
# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
-AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ -DI830_XV
-i810_drv_la_LTLIBRARIES = i810_drv.la
-i810_drv_la_LDFLAGS = -module -avoid-version
-i810_drv_ladir = @moduledir@/drivers
+AM_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ @XMODES_CFLAGS@ \
+ -DI830_XV -DI830_USE_XAA -DI830_USE_EXA
+
+intel_drv_la_LTLIBRARIES = intel_drv.la
+intel_drv_la_LDFLAGS = -module -avoid-version
+intel_drv_ladir = @moduledir@/drivers
+
+XMODE_SRCS=\
+ local_xf86Rename.h \
+ parser/xf86Parser.h \
+ parser/xf86Optrec.h \
+ modes/xf86Modes.h \
+ modes/xf86Modes.c \
+ modes/xf86cvt.c \
+ modes/xf86Crtc.h \
+ modes/xf86Crtc.c \
+ modes/xf86Cursors.c \
+ modes/xf86EdidModes.c \
+ modes/xf86RandR12.c \
+ modes/xf86RandR12.h \
+ modes/xf86Rename.h \
+ modes/xf86Rotate.c \
+ modes/xf86DiDGA.c
+
+INTEL_DRI_SRCS = \
+ i810_dri.c \
+ i810_dri.h \
+ i830_dri.c \
+ i810_hwmc.c \
+ i830_dri.h
-i810_drv_la_SOURCES = \
+intel_drv_la_SOURCES = \
brw_defines.h \
brw_structs.h \
sf_prog.h \
wm_prog.h \
common.h \
+ i2c_vid.h \
i810_accel.c \
i810_common.h \
i810_cursor.c \
@@ -47,42 +79,115 @@ i810_drv_la_SOURCES = \
i810_reg.h \
i810_video.c \
i810_wmark.c \
+ i830_3d.c \
i830_accel.c \
+ i830_bios.c \
+ i830_bios.h \
i830_common.h \
+ i830_crt.c \
i830_cursor.c \
- i830_dga.c \
+ i830_debug.c \
+ i830_debug.h \
+ i830_display.c \
+ i830_display.h \
+ i830_quirks.c \
i830_driver.c \
+ i830_dvo.c \
i830.h \
+ i830_i2c.c \
i830_io.c \
+ i830_lvds.c \
i830_memory.c \
i830_modes.c \
i830_video.c \
i830_video.h \
- i830_rotate.c \
- i830_randr.c \
- i830_3d.c \
i830_reg.h \
+ i830_sdvo.c \
+ i830_sdvo.h \
+ i830_sdvo_regs.h \
+ i830_tv.c \
i915_3d.c \
i915_3d.h \
i915_reg.h \
- i915_video.c
+ i915_video.c \
+ i965_video.c \
+ i830_exa.c \
+ i830_xaa.c \
+ i830_render.c \
+ i915_render.c \
+ i965_render.c
+
+INTEL_G4A = \
+ packed_yuv_sf.g4a \
+ packed_yuv_wm.g4a \
+ exa_sf.g4a \
+ exa_sf_mask.g4a \
+ exa_sf_rotation.g4a \
+ exa_wm_maskca.g4a \
+ exa_wm_maskca_srcalpha.g4a \
+ exa_wm_masknoca.g4a \
+ exa_wm_nomask.g4a \
+ exa_wm_rotation.g4a
+
+INTEL_G4H = \
+ sf_prog.h \
+ wm_prog.h \
+ exa_sf_mask_prog.h \
+ exa_sf_prog.h \
+ exa_sf_rotation_prog.h \
+ exa_wm_maskca_prog.h \
+ exa_wm_maskca_srcalpha_prog.h \
+ exa_wm_masknoca_prog.h \
+ exa_wm_nomask_prog.h \
+ exa_wm_rotation_prog.h
+
+EXTRA_DIST = \
+ $(XMODE_SRCS) \
+ $(INTEL_G4A) \
+ $(INTEL_G4H) \
+ $(INTEL_DRI_SRCS)
if HAVE_GEN4ASM
+
sf_prog.h: packed_yuv_sf.g4a
intel-gen4asm -o sf_prog.h packed_yuv_sf.g4a
+
wm_prog.h: packed_yuv_wm.g4a
intel-gen4asm -o wm_prog.h packed_yuv_wm.g4a
+
+exa_sf_mask_prog.h: exa_sf_mask.g4a
+ intel-gen4asm -o exa_sf_mask_prog.h exa_sf_mask.g4a
+
+exa_sf_prog.h: exa_sf.g4a
+ intel-gen4asm -o exa_sf_prog.h exa_sf.g4a
+
+exa_sf_rotation_prog.h: exa_sf_rotation.g4a
+ intel-gen4asm -o exa_sf_rotation_prog.h exa_sf_rotation.g4a
+
+exa_wm_maskca_prog.h: exa_wm_maskca.g4a
+ intel-gen4asm -o exa_wm_maskca_prog.h exa_wm_maskca.g4a
+
+exa_wm_maskca_srcalpha_prog.h: exa_wm_maskca_srcalpha.g4a
+ intel-gen4asm -o exa_wm_maskca_srcalpha_prog.h exa_wm_maskca_srcalpha.g4a
+
+exa_wm_masknoca_prog.h: exa_wm_masknoca.g4a
+ intel-gen4asm -o exa_wm_masknoca_prog.h exa_wm_masknoca.g4a
+
+exa_wm_nomask_prog.h: exa_wm_nomask.g4a
+ intel-gen4asm -o exa_wm_nomask_prog.h exa_wm_nomask.g4a
+
+exa_wm_rotation_prog.h: exa_wm_rotation.g4a
+ intel-gen4asm -o exa_wm_rotation_prog.h exa_wm_rotation.g4a
+
+endif
+
+if XMODES
+intel_drv_la_SOURCES += \
+ $(XMODE_SRCS)
endif
if DRI
-i810_drv_la_SOURCES += \
- i810_dri.c \
- i810_dri.h \
- i830_dri.c \
- i810_hwmc.c \
- i830_dri.h
+intel_drv_la_SOURCES += \
+ $(INTEL_DRI_SRCS)
endif
-EXTRA_DIST = \
- packed_yuv_sf.g4a \
- packed_yuv_wm.g4a
diff --git a/xserver/hw/xfree86/common/xf86AutoConfig.c b/xserver/hw/xfree86/common/xf86AutoConfig.c
index 4f6a98aef..a2c9c5d0e 100644
--- a/xserver/hw/xfree86/common/xf86AutoConfig.c
+++ b/xserver/hw/xfree86/common/xf86AutoConfig.c
@@ -173,9 +173,17 @@ videoPtrToDriverName(pciVideoPtr info)
case 0x102c: return "chips";
case 0x1013: return "cirrus";
case 0x8086:
- if ((info->chipType == 0x00d1) || (info->chipType == 0x7800))
- return "i740";
- else return "i810";
+ switch (info->chipType)
+ {
+ case 0x00d1: case 0x7800:
+ return "i740";
+ case 0x1132: case 0x2562: case 0x2572: case 0x3577:
+ case 0x3582: case 0x358e: case 0x7121: case 0x7123:
+ case 0x7125:
+ return "i810";
+ default:
+ return "intel";
+ }
case 0x102b: return "mga";
case 0x10c8: return "neomagic";
case 0x105d: return "i128";
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 02:02:12 +0000