tech-x11 archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Re: Alternative intel driver
christos%astron.com@localhost (Christos Zoulas) wrote:
>In article <20150513163943.C6EA430285B%ren.fdy2.co.uk@localhost>,
>Robert Swindells <rjs%fdy2.co.uk@localhost> wrote:
>>
>>christos%zoulas.com@localhost (Christos Zoulas) wrote:
>>>On May 13, 3:43pm, rjs%fdy2.co.uk@localhost (Robert Swindells) wrote:
>>>-- Subject: Re: Alternative intel driver
>>>
>>
>>+/*
>> #if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC (1,6,99,1,0)
>> #define IMAGE_FROM_PICT(P) image_from_pict(P, 0)
>> #else
>>-#define IMAGE_FROM_PICT(P) image_from_pict(P, 0, 0)
>>-#endif
>>+*/
>>+#define IMAGE_FROM_PICT(P) image_from_pict(P, 0, 0, 0)
>>+/*#endif*/
>
>This looks tortured, I'd get rid of the commented out code; the rest is
>fine.
It doesn't really need any of this, I had replaced the single
IMAGE_FROM_PICT() usage with an explicit call to image_from_pict() as
it needed some writeback arguments.
The main Makefile and other build file diffs are below.
The contents of the subdirectories of
src/external/mit/xorg/server/drivers/xf86-video-intel-old are copied from
src/external/mit/xorg/server/drivers/xf86-video-intel. They ought to be
deleted from the newer driver directory as they are no longer used.
I have also included diffs to build both radeon drivers on amd64 and
i386, I would only propose to commit the intel stuff now though.
I can also change the directory names if people prefer.
Binaries are in my home directory on ftp.n.o if anyone wants to try them
out.
# $NetBSD: $
.include <bsd.own.mk>
DRIVER= xf86-video-intel-old
DRIVER_NAME= intel_drv_old
SRCS= drmmode_display.c i810_accel.c i810_cursor.c i810_dga.c
SRCS+= i810_dri.c i810_driver.c i810_io.c i810_memory.c i810_video.c
SRCS+= i810_wmark.c i830_3d.c i830_accel.c i830_bios.c
SRCS+= i830_batchbuffer.c i830_crt.c i830_cursor.c i830_debug.c
SRCS+= i830_display.c i830_quirks.c i830_driver.c i830_dvo.c
SRCS+= i830_hdmi.c i830_i2c.c i830_io.c i830_lvds.c i830_memory.c
SRCS+= i830_modes.c i830_sdvo.c i830_tv.c i830_uxa.c i830_video.c
SRCS+= i915_3d.c i915_video.c i965_video.c
SRCS+= i830_render.c i915_render.c i965_render.c
SRCS+= i830_dri.c
#SRCS+= i830_hwmc.c i915_hwmc.c i965_hwmc.c
# uxa
.PATH: ${X11SRCDIR.${DRIVER}}/uxa
SRCS+= uxa-accel.c uxa-unaccel.c uxa-glyphs.c uxa-render.c uxa.c
MAN= intel.4
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/dri
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/libdrm
CPPFLAGS+= -I${X11SRCDIR.${DRIVER}}/uxa
CPPFLAGS+= -I${X11SRCDIR.${DRIVER}}/src/render_program
#CPPFLAGS+= -I${X11SRCDIR.${DRIVER}}/src/xvmc
CPPFLAGS+= -DI830_XV # -DINTEL_XVMC
LDADD+= -ldrm_intel
.include "../Makefile.xf86-driver"
SUBDIR= ch7017 ch7xxx ivch sil164 tfp410
CWARNFLAGS.clang+= -Wno-parentheses -Wno-tautological-compare \
-Wno-empty-body -Wno-error
.include <bsd.subdir.mk>
Index: share/mk/bsd.own.mk
===================================================================
RCS file: /cvsroot/src/share/mk/bsd.own.mk,v
retrieving revision 1.847
diff -u -r1.847 bsd.own.mk
--- share/mk/bsd.own.mk 26 Apr 2015 21:37:22 -0000 1.847
+++ share/mk/bsd.own.mk 16 May 2015 22:18:17 -0000
@@ -1298,7 +1298,7 @@
.for _v in \
ag10e apm ark ast ati ati-kms chips cirrus crime \
- geode glint i128 i740 igs imstt intel mach64 mga \
+ geode glint i128 i740 igs imstt intel intel-old mach64 mga \
neomagic newport nsc nv nvxbox openchrome pnozz \
r128 radeonhd rendition \
s3 s3virge savage siliconmotion sis suncg14 \
Index: external/mit/xorg/server/drivers/Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/server/drivers/Makefile,v
retrieving revision 1.65
diff -u -r1.65 Makefile
--- external/mit/xorg/server/drivers/Makefile 1 Mar 2015 11:19:08 -0000 1.65
+++ external/mit/xorg/server/drivers/Makefile 16 May 2015 22:18:17 -0000
@@ -23,13 +23,6 @@
.include <bsd.own.mk>
-# Set this to "no" to build the UMS-happy 6.x driver, vs KMS 7.x
-.if ${MKX11RADEONKMS} != "no"
-RADEON_SUBDIR=radeon-kms
-.else
-RADEON_SUBDIR=radeon
-.endif
-
.if ${MACHINE_ARCH} == "i386" || \
${MACHINE_ARCH} == "x86_64"
SUBDIR+= \
@@ -50,13 +43,15 @@
SUBDIR+= \
xf86-video-intel \
+ xf86-video-intel-old \
xf86-video-mach64 \
xf86-video-mga \
xf86-video-neomagic \
xf86-video-nv \
xf86-video-openchrome \
xf86-video-r128 \
- xf86-video-${RADEON_SUBDIR} \
+ xf86-video-radeon-kms \
+ xf86-video-radeon \
xf86-video-radeonhd \
xf86-video-s3 \
xf86-video-s3virge \
@@ -97,7 +92,7 @@
xf86-video-mga \
xf86-video-nv \
xf86-video-r128 \
- xf86-video-${RADEON_SUBDIR} \
+ xf86-video-radeon \
xf86-video-radeonhd \
xf86-video-s3 \
xf86-video-s3virge \
@@ -137,7 +132,7 @@
xf86-video-mga \
xf86-video-neomagic \
xf86-video-nv \
- xf86-video-${RADEON_SUBDIR} \
+ xf86-video-radeon \
xf86-video-radeonhd \
xf86-video-s3 \
xf86-video-s3virge \
@@ -197,7 +192,7 @@
xf86-video-mach64 \
xf86-video-mga \
xf86-video-nv \
- xf86-video-${RADEON_SUBDIR} \
+ xf86-video-radeon \
xf86-video-r128 \
xf86-video-tdfx \
xf86-video-wsfb
@@ -222,7 +217,7 @@
xf86-video-mach64 \
xf86-video-mga \
xf86-video-nv \
- xf86-video-${RADEON_SUBDIR} \
+ xf86-video-radeon \
xf86-video-r128 \
xf86-video-tdfx \
xf86-video-wsfb
@@ -259,7 +254,7 @@
xf86-video-mach64 \
xf86-video-mga \
xf86-video-r128 \
- xf86-video-${RADEON_SUBDIR} \
+ xf86-video-radeon \
xf86-video-suncg6 \
xf86-video-sunffb \
xf86-video-sunleo \
Index: external/mit/xorg/server/drivers/xf86-video-radeon/Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- external/mit/xorg/server/drivers/xf86-video-radeon/Makefile 11 Aug 2014 08:25:58 -0000 1.18
+++ external/mit/xorg/server/drivers/xf86-video-radeon/Makefile 16 May 2015 22:18:18 -0000
@@ -3,7 +3,7 @@
.include <bsd.own.mk>
DRIVER= xf86-video-ati
-DRIVER_NAME= radeon_drv
+DRIVER_NAME= radeon_drv_old
.PATH: ${X11SRCDIR.${DRIVER}}/src/AtomBios
SRCS.ATOMBIOS= \
Index: distrib/sets/lists/xserver/md.amd64
===================================================================
RCS file: /cvsroot/src/distrib/sets/lists/xserver/md.amd64,v
retrieving revision 1.76
diff -u -r1.76 md.amd64
--- distrib/sets/lists/xserver/md.amd64 1 Mar 2015 07:46:04 -0000 1.76
+++ distrib/sets/lists/xserver/md.amd64 16 May 2015 22:18:18 -0000
@@ -425,6 +425,8 @@
./usr/X11R7/lib/modules/drivers/imstt_drv.so.1 -unknown- obsolete
./usr/X11R7/lib/modules/drivers/intel_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/intel_drv.so.2 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/intel_drv_old.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/intel_drv_old.so.2 -unknown- xorg
./usr/X11R7/lib/modules/drivers/ivch_drv.so -unknown- obsolete
./usr/X11R7/lib/modules/drivers/ivch_drv.so.2 -unknown- obsolete
./usr/X11R7/lib/modules/drivers/kbd_drv.so -unknown- xorg
@@ -445,9 +447,10 @@
./usr/X11R7/lib/modules/drivers/openchrome_drv.so.0 -unknown- xorg
./usr/X11R7/lib/modules/drivers/r128_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/r128_drv.so.6 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/radeon_drv_old.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/radeon_drv_old.so.6 -unknown- xorg
./usr/X11R7/lib/modules/drivers/radeon_drv.so -unknown- xorg
-./usr/X11R7/lib/modules/drivers/radeon_drv.so.6 -unknown- xorg,!x11radeonkms
-./usr/X11R7/lib/modules/drivers/radeon_drv.so.7 -unknown- xorg,x11radeonkms
+./usr/X11R7/lib/modules/drivers/radeon_drv.so.7 -unknown- xorg
./usr/X11R7/lib/modules/drivers/radeonhd_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/radeonhd_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/s3_drv.so -unknown- xorg
Index: distrib/sets/lists/xserver/md.i386
===================================================================
RCS file: /cvsroot/src/distrib/sets/lists/xserver/md.i386,v
retrieving revision 1.95
diff -u -r1.95 md.i386
--- distrib/sets/lists/xserver/md.i386 1 Mar 2015 07:46:04 -0000 1.95
+++ distrib/sets/lists/xserver/md.i386 16 May 2015 22:18:18 -0000
@@ -465,6 +465,8 @@
./usr/X11R7/lib/modules/drivers/imstt_drv.so.1 -unknown- obsolete
./usr/X11R7/lib/modules/drivers/intel_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/intel_drv.so.2 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/intel_drv_old.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/intel_drv_old.so.2 -unknown- xorg
./usr/X11R7/lib/modules/drivers/ivch_drv.so -unknown- obsolete
./usr/X11R7/lib/modules/drivers/ivch_drv.so.2 -unknown- obsolete
./usr/X11R7/lib/modules/drivers/kbd_drv.so -unknown- xorg
@@ -485,9 +487,10 @@
./usr/X11R7/lib/modules/drivers/openchrome_drv.so.0 -unknown- xorg
./usr/X11R7/lib/modules/drivers/r128_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/r128_drv.so.6 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/radeon_drv_old.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/radeon_drv_old.so.6 -unknown- xorg
./usr/X11R7/lib/modules/drivers/radeon_drv.so -unknown- xorg
-./usr/X11R7/lib/modules/drivers/radeon_drv.so.6 -unknown- xorg,!x11radeonkms
-./usr/X11R7/lib/modules/drivers/radeon_drv.so.7 -unknown- xorg,x11radeonkms
+./usr/X11R7/lib/modules/drivers/radeon_drv.so.7 -unknown- xorg
./usr/X11R7/lib/modules/drivers/radeonhd_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/radeonhd_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/s3_drv.so -unknown- xorg
Home |
Main Index |
Thread Index |
Old Index