CVS commit: [netbsd-7] src/external/mit/xorg/server/drivers/xf86-video-intel
Module Name:src
Committed By: snj
Date: Tue May 19 05:17:47 UTC 2015
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-intel [netbsd-7]:
Makefile
Log Message:
Pull up following revision(s) (requested by mrg in ticket #786):
external/mit/xorg/server/drivers/xf86-video-intel/Makefile: revision
1.21
switch the default method to SNA.
To generate a diff of this commit:
cvs rdiff -u -r1.15.2.2 -r1.15.2.3 \
src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.15.2.2 src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.15.2.3
--- src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.15.2.2 Wed Jan 21 11:32:07 2015
+++ src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile Tue May 19 05:17:47 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15.2.2 2015/01/21 11:32:07 martin Exp $
+# $NetBSD: Makefile,v 1.15.2.3 2015/05/19 05:17:47 snj Exp $
.include bsd.own.mk
@@ -144,7 +144,7 @@ CPPFLAGS+= -I${X11SRCDIR.${DRIVER}}/xvmc
# Use the Intel-style __sync_* atomic primitives.
-CPPFLAGS+= -DDEFAULT_ACCEL_METHOD=UXA
+CPPFLAGS+= -DDEFAULT_ACCEL_METHOD=SNA
CPPFLAGS+= -DENABLE_XVMC=1
CPPFLAGS+= -DHAS_PIXMAN_GLYPHS=1
CPPFLAGS+= -DHAS_PIXMAN_TRIANGLES=1
CVS commit: [netbsd-7] src/external/mit/xorg/server/drivers
Module Name:src
Committed By: snj
Date: Mon Mar 9 08:47:19 UTC 2015
Modified Files:
src/external/mit/xorg/server/drivers [netbsd-7]: Makefile
Log Message:
Pull up following revision(s) (requested by mrg in ticket #575):
external/mit/xorg/server/drivers/Makefile: revision 1.65
fix the previous; it had a reversed test and was also missing bsd.own.mk
before checking MK* values.
To generate a diff of this commit:
cvs rdiff -u -r1.63.10.1 -r1.63.10.2 \
src/external/mit/xorg/server/drivers/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/drivers/Makefile
diff -u src/external/mit/xorg/server/drivers/Makefile:1.63.10.1 src/external/mit/xorg/server/drivers/Makefile:1.63.10.2
--- src/external/mit/xorg/server/drivers/Makefile:1.63.10.1 Mon Mar 9 08:45:26 2015
+++ src/external/mit/xorg/server/drivers/Makefile Mon Mar 9 08:47:19 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63.10.1 2015/03/09 08:45:26 snj Exp $
+# $NetBSD: Makefile,v 1.63.10.2 2015/03/09 08:47:19 snj Exp $
# xf86-input drivers
@@ -19,14 +19,15 @@ SUBDIR+= \
.endif
-
# xf86-video drivers
+.include bsd.own.mk
+
# Set this to no to build the UMS-happy 6.x driver, vs KMS 7.x
-.if ${MKX11RADEONKMS:U} != no
-RADEON_SUBDIR=radeon
-.else
+.if ${MKX11RADEONKMS} != no
RADEON_SUBDIR=radeon-kms
+.else
+RADEON_SUBDIR=radeon
.endif
.if ${MACHINE_ARCH} == i386 || \
CVS commit: [netbsd-7] src/external/mit/xorg/server/drivers/xf86-video-intel
Module Name:src
Committed By: martin
Date: Wed Jan 21 11:32:07 UTC 2015
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-intel [netbsd-7]:
Makefile
Log Message:
Pull up following revision(s) (requested by snj in ticket #439):
external/mit/xorg/server/drivers/xf86-video-intel/Makefile: revision
1.17-1.20
Update for 2.99.917
To generate a diff of this commit:
cvs rdiff -u -r1.15.2.1 -r1.15.2.2 \
src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.15.2.1 src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.15.2.2
--- src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.15.2.1 Sun Sep 21 18:34:50 2014
+++ src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile Wed Jan 21 11:32:07 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15.2.1 2014/09/21 18:34:50 snj Exp $
+# $NetBSD: Makefile,v 1.15.2.2 2015/01/21 11:32:07 martin Exp $
.include bsd.own.mk
@@ -9,59 +9,71 @@ DRIVER_NAME= intel_drv
SRCS+= intel_device.c
SRCS+= intel_options.c
SRCS+= intel_module.c
+SRCS+= backlight.c
+SRCS+= fd.c
# legacy/i810
.PATH: ${X11SRCDIR.${DRIVER}}/src/legacy/i810
SRCS+= i810_accel.c
SRCS+= i810_cursor.c
+SRCS+= i810_dga.c
+SRCS+= i810_dri.c
SRCS+= i810_driver.c
+SRCS+= i810_hwmc.c
SRCS+= i810_memory.c
SRCS+= i810_video.c
SRCS+= i810_wmark.c
-
SRCS+= i810_xaa.c
-SRCS+= i810_dga.c
-SRCS+= i810_dri.c
-SRCS+= i810_hwmc.c
# sna
.PATH: ${X11SRCDIR.${DRIVER}}/src/sna
SRCS+= blt.c
SRCS+= kgem.c
+SRCS+= gen2_render.c
+SRCS+= gen3_render.c
+SRCS+= gen4_common.c
+SRCS+= gen4_render.c
+SRCS+= gen4_source.c
+SRCS+= gen4_vertex.c
+SRCS+= gen5_render.c
+SRCS+= gen6_common.c
+SRCS+= gen6_render.c
+SRCS+= gen7_render.c
+SRCS+= gen8_eu.c
+SRCS+= gen8_render.c
+SRCS+= gen8_vertex.c
+
SRCS+= sna_accel.c
+SRCS+= sna_acpi.c
SRCS+= sna_blt.c
SRCS+= sna_composite.c
SRCS+= sna_cpu.c
SRCS+= sna_damage.c
SRCS+= sna_display.c
SRCS+= sna_display_fake.c
+SRCS+= sna_dri2.c
+#SRCS+= sna_dri3.c
SRCS+= sna_driver.c
SRCS+= sna_glyphs.c
SRCS+= sna_gradient.c
SRCS+= sna_io.c
+#SRCS+= sna_present.c
SRCS+= sna_render.c
SRCS+= sna_stream.c
-SRCS+= sna_trapezoids.c
+SRCS+= sna_threads.c
SRCS+= sna_tiling.c
SRCS+= sna_transform.c
-SRCS+= sna_threads.c
+SRCS+= sna_trapezoids.c
+SRCS+= sna_trapezoids_boxes.c
+SRCS+= sna_trapezoids_imprecise.c
+SRCS+= sna_trapezoids_mono.c
+SRCS+= sna_trapezoids_precise.c
SRCS+= sna_vertex.c
SRCS+= sna_video.c
+SRCS+= sna_video_hwmc.c
SRCS+= sna_video_overlay.c
SRCS+= sna_video_sprite.c
SRCS+= sna_video_textured.c
-SRCS+= gen2_render.c
-SRCS+= gen3_render.c
-SRCS+= gen4_render.c
-SRCS+= gen4_source.c
-SRCS+= gen4_vertex.c
-SRCS+= gen5_render.c
-SRCS+= gen6_render.c
-SRCS+= gen7_render.c
-
-SRCS+= sna_dri.c
-
-SRCS+= sna_video_hwmc.c
# sna/brw
.PATH: ${X11SRCDIR.${DRIVER}}/src/sna/brw
@@ -95,31 +107,31 @@ SRCS+= fbutil.c
# uxa
.PATH: ${X11SRCDIR.${DRIVER}}/src/uxa
-SRCS+= intel_batchbuffer.c
-SRCS+= intel_display.c
-SRCS+= intel_driver.c
-SRCS+= intel_memory.c
-SRCS+= intel_uxa.c
-SRCS+= intel_video.c
SRCS+= i830_3d.c
SRCS+= i830_render.c
SRCS+= i915_3d.c
SRCS+= i915_render.c
SRCS+= i915_video.c
SRCS+= i965_3d.c
-SRCS+= i965_video.c
SRCS+= i965_render.c
-SRCS+= uxa.c
+SRCS+= i965_video.c
+SRCS+= intel_batchbuffer.c
+SRCS+= intel_display.c
+SRCS+= intel_dri.c
+SRCS+= intel_driver.c
+SRCS+= intel_hwmc.c
+SRCS+= intel_memory.c
+#SRCS+= intel_present.c
+#SRCS+= intel_sync.c
+SRCS+= intel_uxa.c
+SRCS+= intel_uxa_video.c
+SRCS+= intel_video.c
+SRCS+= intel_video_overlay.c
SRCS+= uxa-accel.c
SRCS+= uxa-glyphs.c
SRCS+= uxa-render.c
SRCS+= uxa-unaccel.c
-
-#SRCS+= intel_glamor.c
-
-SRCS+= intel_dri.c
-
-SRCS+= intel_hwmc.c
+SRCS+= uxa.c
MAN= intel.4
@@ -131,18 +143,43 @@ CPPFLAGS+= -I${X11SRCDIR.${DRIVER}}/src/
CPPFLAGS+= -I${X11SRCDIR.${DRIVER}}/xvmc
# Use the Intel-style __sync_* atomic primitives.
-CPPFLAGS+= -DHAVE_ATOMIC_PRIMITIVES
-CPPFLAGS+= -DENABLE_XVMC
-CPPFLAGS+= -DUSE_UXA
-CPPFLAGS+= -DUSE_SNA
CPPFLAGS+= -DDEFAULT_ACCEL_METHOD=UXA
+CPPFLAGS+= -DENABLE_XVMC=1
CPPFLAGS+= -DHAS_PIXMAN_GLYPHS=1
CPPFLAGS+= -DHAS_PIXMAN_TRIANGLES=1
-
-CPPFLAGS+= -DHAVE_DRI1
-CPPFLAGS+= -DHAVE_DRI2_H
-CPPFLAGS+= -DHAVE_XAA_H
+CPPFLAGS+= -DHAVE_ATOMIC_PRIMITIVES=1
+CPPFLAGS+= -DHAVE_CPUID_H=1
+CPPFLAGS+= -DHAVE_DGAPROC_H=1
+CPPFLAGS+= -DHAVE_DLFCN_H=1
+CPPFLAGS+= -DHAVE_DRI1=1
+CPPFLAGS+= -DHAVE_DRI2=1
+CPPFLAGS+= -DHAVE_DRI2_H=1
+CPPFLAGS+= -DHAVE_DRISTRUCT_H=1
+CPPFLAGS+= -DHAVE_DRI_H=1
+CPPFLAGS+= -DHAVE_GETLINE=1
+CPPFLAGS+= -DHAVE_INTTYPES_H=1
+CPPFLAGS+= -DHAVE_MEMORY_H=1
+CPPFLAGS+=
CVS commit: [netbsd-7] src/external/mit/xorg/server/drivers/xf86-video-intel
Module Name:src Committed By: snj Date: Sun Sep 21 18:34:51 UTC 2014 Modified Files: src/external/mit/xorg/server/drivers/xf86-video-intel [netbsd-7]: Makefile Log Message: Pull up following revision(s) (requested by riastradh in ticket #104): external/mit/xorg/server/drivers/xf86-video-intel/Makefile: revision 1.16 Switch default accelmethod back to UXA until we import a stabler SNA. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.15.2.1 \ src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile diff -u src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.15 src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.15.2.1 --- src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.15 Sun Aug 10 14:17:19 2014 +++ src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile Sun Sep 21 18:34:50 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2014/08/10 14:17:19 jmcneill Exp $ +# $NetBSD: Makefile,v 1.15.2.1 2014/09/21 18:34:50 snj Exp $ .include bsd.own.mk @@ -136,7 +136,7 @@ CPPFLAGS+= -DHAVE_ATOMIC_PRIMITIVES CPPFLAGS+= -DENABLE_XVMC CPPFLAGS+= -DUSE_UXA CPPFLAGS+= -DUSE_SNA -CPPFLAGS+= -DDEFAULT_ACCEL_METHOD=SNA +CPPFLAGS+= -DDEFAULT_ACCEL_METHOD=UXA CPPFLAGS+= -DHAS_PIXMAN_GLYPHS=1 CPPFLAGS+= -DHAS_PIXMAN_TRIANGLES=1
CVS commit: [netbsd-7] src/external/mit/xorg/server/drivers/xf86-video-openchrome
Module Name:src Committed By: martin Date: Fri Aug 29 11:35:28 UTC 2014 Modified Files: src/external/mit/xorg/server/drivers/xf86-video-openchrome [netbsd-7]: Makefile Log Message: Pull up following revision(s) (requested by mrg in ticket #60): external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile: revision 1.6 fix the sources list to match the upstream Makefile.am. fixes problems reported by jdbaker. XXX: pullup-7. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.5.6.1 \ src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile diff -u src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.5 src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.5.6.1 --- src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.5 Sat Jun 1 21:21:36 2013 +++ src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile Fri Aug 29 11:35:28 2014 @@ -1,10 +1,13 @@ -# $NetBSD: Makefile,v 1.5 2013/06/01 21:21:36 mrg Exp $ +# $NetBSD: Makefile,v 1.5.6.1 2014/08/29 11:35:28 martin Exp $ DRIVER= xf86-video-openchrome DRIVER_NAME= openchrome_drv SRCS= \ via_3d.c \ + via_exa.c \ + via_exa_h2.c \ + via_exa_h6.c \ via_bandwidth.c \ via_ch7xxx.c \ via_display.c \ @@ -13,13 +16,19 @@ SRCS= \ via_id.c \ via_lvds.c \ via_memcpy.c \ + via_memmgr.c \ + via_outputs.c \ + via_xv_overlay.c \ + via_ums.c \ via_vbe.c \ via_vgahw.c \ + via_xv.c \ via_vt162x.c # DRI SRCS+= \ via_dri.c \ + via_kms.c \ via_xvmc.c MAN= openchrome.4
CVS commit: [netbsd-7] src/external/mit/xorg/server/drivers/xf86-video-nv
Module Name:src
Committed By: martin
Date: Thu Aug 21 08:43:42 UTC 2014
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-nv [netbsd-7]: Makefile
Log Message:
Pull up following revision(s) (requested by macallan in ticket #40):
external/mit/xorg/server/drivers/xf86-video-nv/Makefile: revision 1.7
put pci_device_has_kernel_driver(dev) into #if NV_TEST_FOR_KERNEL_DRIVER
at least for now there is nothing that keeps the nv driver from running
if a kernel driver other than vga is attached
Now this works again on macppc ( and x86 if you use for example genfb )
mention NV_TEST_FOR_KERNEL_DRIVER and explain why it isn't enabled for now
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.6.6.1 \
src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile:1.6 src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile:1.6.6.1
--- src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile:1.6 Fri Jun 14 04:43:38 2013
+++ src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile Thu Aug 21 08:43:42 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2013/06/14 04:43:38 mrg Exp $
+# $NetBSD: Makefile,v 1.6.6.1 2014/08/21 08:43:42 martin Exp $
DRIVER= xf86-video-nv
DRIVER_NAME= nv_drv
@@ -15,6 +15,16 @@ MAN= nv.4
CPPFLAGS+= -DAVOID_VGAHW
.endif
+.if ${MACHINE} == i386 || ${MACHINE} == amd64
+# XXX
+# the test uses pci_device_has_kernel_driver() which, for now at least, only
+# makes sense on x86 ( it just checks if the kernel driver handling the
+# device is vga ) - and even there, genfb and the like don't do anything
+# that would prevent this driver from working. Might need to revisit this once
+# the new DRM2 code has nvidia support
+#CPPFLAGS+= -DNV_TEST_FOR_KERNEL_DRIVER
+.endif
+
CPPFLAGS+= -DHAVE_XAA_H
.include ../Makefile.xf86-driver
