CVS commit: src/external/mit/xorg/server/drivers/xf86-video-radeon-kms

2020-02-09 Thread Jared D. McNeill
Module Name:src
Committed By:   jmcneill
Date:   Sun Feb  9 12:28:28 UTC 2020

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-radeon-kms: Makefile

Log Message:
Do not define HAVE_DRI3_H


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/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-radeon-kms/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile:1.11 src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile:1.12
--- src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile:1.11	Sun Jan 19 10:44:51 2020
+++ src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile	Sun Feb  9 12:28:28 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.11 2020/01/19 10:44:51 martin Exp $
+#	$NetBSD: Makefile,v 1.12 2020/02/09 12:28:28 jmcneill Exp $
 
 .include 
 
@@ -16,7 +16,6 @@ CPPFLAGS+= \
 		-DHAS_DIRTYTRACKING2 \
 		-DHAVE_XORG_LIST \
 		-DHAVE_XF86_CURSOR_RESET_CURSOR \
-		-DHAVE_DRI3_H \
 		-DHAVE_MISYNCSHM_H \
 		-DHAVE_PRESENT_H
 .endif



CVS commit: src/external/mit/xorg/server/drivers/xf86-video-radeon-kms

2020-01-19 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sun Jan 19 10:44:51 UTC 2020

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-radeon-kms: Makefile

Log Message:
Fix conditional in previous


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/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-radeon-kms/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile:1.10 src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile:1.11
--- src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile:1.10	Sun Jan 19 00:58:15 2020
+++ src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile	Sun Jan 19 10:44:51 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.10 2020/01/19 00:58:15 jmcneill Exp $
+#	$NetBSD: Makefile,v 1.11 2020/01/19 10:44:51 martin Exp $
 
 .include 
 
@@ -47,7 +47,7 @@ SRCS=		radeon_accel.c radeon_video.c \
 
 MAN=		radeon.4
 
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64"
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
 MANSUBDIR=	/x86
 .else
 MANSUBDIR=	/${MACHINE}



CVS commit: src/external/mit/xorg/server/drivers/xf86-video-radeon-kms

2018-12-30 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Sun Dec 30 08:34:29 UTC 2018

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-radeon-kms: Makefile

Log Message:
link against libgbm.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/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-radeon-kms/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile:1.6 src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile:1.7
--- src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile:1.6	Fri Aug 19 16:33:23 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile	Sun Dec 30 08:34:29 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2016/08/19 16:33:23 christos Exp $
+#	$NetBSD: Makefile,v 1.7 2018/12/30 08:34:29 mrg Exp $
 
 .include 
 
@@ -54,6 +54,8 @@ CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/X11 
 		-I${DESTDIR}${X11INCDIR}/pixman-1 \
 		-I${X11SRCDIR.${DRIVER}}/../include
 
+LIBDPLIBS+=	gbm ${.CURDIR}/../../../lib/libgbm
+
 # XXX
 COPTS+=	-Wno-error
 



CVS commit: src/external/mit/xorg/server/drivers/xf86-video-radeon-kms

2016-08-19 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Fri Aug 19 16:33:23 UTC 2016

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-radeon-kms: Makefile

Log Message:
fix reversed test


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/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-radeon-kms/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile:1.5 src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile:1.6
--- src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile:1.5	Thu Aug 18 23:59:30 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile	Fri Aug 19 12:33:23 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2016/08/19 03:59:30 mrg Exp $
+#	$NetBSD: Makefile,v 1.6 2016/08/19 16:33:23 christos Exp $
 
 .include 
 
@@ -29,12 +29,12 @@ SRCS.KMS=	radeon_dri2.c radeon_dri3.c ra
 		drmmode_display.c
 
 .if ${HAVE_XORG_GLAMOR} != "no"
-SRCS.GLAMOR=
-.else
 SRCS.GLAMOR=	radeon_glamor.c radeon_glamor_wrappers.c
 CPPFLAGS+= \
 		-DHAVE_GLAMOR_H \
 		-DUSE_GLAMOR
+.else
+SRCS.GLAMOR=
 .endif
 
 SRCS=		radeon_accel.c radeon_video.c \



CVS commit: src/external/mit/xorg/server/drivers/xf86-video-radeon-kms

2016-08-16 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Wed Aug 17 00:10:19 UTC 2016

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-radeon-kms: Makefile

Log Message:
clean up some obsolete and duplicated code.  port to xf86-video-ati 7.7.0.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/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-radeon-kms/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile:1.3 src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile:1.4
--- src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile:1.3	Tue Aug 16 06:24:02 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile	Wed Aug 17 00:10:19 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2016/08/16 06:24:02 mrg Exp $
+#	$NetBSD: Makefile,v 1.4 2016/08/17 00:10:19 mrg Exp $
 
 .include 
 
@@ -11,34 +11,30 @@ SRCS.ATOMBIOS= \
 Decoder.c \
 hwserv_drv.c
 
-.if ${X11DRI} != "no"
-SRCS.DRI=	radeon_dri.c
-CPPFLAGS+=	${X11FLAGS.DRI}
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+LIBDPLIBS+=	drm_radeon ${.CURDIR}/../../../lib/libdrm_radeon
 .endif
 
 .if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
 CPPFLAGS+=	-DUSE_XAA
 .else
-CPPFLAGS+=	-DHAS_DIRTYTRACKING2 -DHAVE_XORG_LIST
-.endif
-
-.if ${X11DRI} != "no"
-# XXX
-. if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
-SRCS.KMS=	radeon_dri2.c radeon_kms.c drmmode_display.c radeon_vbo.c
-CPPFLAGS+=	-DXF86DRM_MODE
-LIBDPLIBS+=	drm_radeon ${.CURDIR}/../../../lib/libdrm_radeon
-. endif
+CPPFLAGS+=	-DHAS_DIRTYTRACKING2 \
+		-DHAVE_XORG_LIST \
+		-DHAVE_XF86_CURSOR_RESET_CURSOR \
+		-DHAVE_DRI3_H \
+		-DHAVE_MISYNCSHM_H \
+		-DHAVE_PRESENT_H
 .endif
 
 SRCS.EXA=	radeon_exa.c r600_exa.c r6xx_accel.c \
 		r600_textured_videofuncs.c r600_shader.c radeon_exa_shared.c \
 		evergreen_exa.c evergreen_accel.c evergreen_shader.c \
 		evergreen_textured_videofuncs.c cayman_accel.c cayman_shader.c
-SRCS.KMS=	radeon_dri2.c radeon_kms.c drmmode_display.c radeon_vbo.c \
-		radeon_bo_helper.c
+SRCS.KMS=	radeon_dri2.c radeon_dri3.c radeon_drm_queue.c radeon_kms.c \
+		radeon_present.c radeon_sync.c radeon_vbo.c radeon_bo_helper.c \
+		drmmode_display.c
 # XXX not yet
-SRCS.GLAMOR=	radeon_glamor.c
+SRCS.GLAMOR=	radeon_glamor.c radeon_glamor_wrappers.c
 
 SRCS=		radeon_accel.c radeon_video.c \
 		radeon_misc.c radeon_probe.c \



CVS commit: src/external/mit/xorg/server/drivers/xf86-video-radeon

2016-08-16 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Tue Aug 16 07:08:17 UTC 2016

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-radeon: Makefile

Log Message:
define USE_XAA here for xorg-server 1.10.
for xorg-server 1.18 builds, copy some files from xorg-server 1.10.

this may not work with xorg-server 1.18, i'll test later.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 \
src/external/mit/xorg/server/drivers/xf86-video-radeon/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-radeon/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile:1.19 src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile:1.20
--- src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile:1.19	Thu May 28 14:36:45 2015
+++ src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile	Tue Aug 16 07:08:17 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.19 2015/05/28 14:36:45 rjs Exp $
+#	$NetBSD: Makefile,v 1.20 2016/08/16 07:08:17 mrg Exp $
 
 .include 
 
@@ -20,6 +20,11 @@ SRCS.DRI=	radeon_dri.c
 CPPFLAGS+=	${X11FLAGS.DRI}
 .endif
 
+# XXX
+.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
+CPPFLAGS+=	-DUSE_XAA
+.endif
+
 .if ${X11DRI} != "no"
 # XXX
 . if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
@@ -54,7 +59,14 @@ CPPFLAGS+=	-I${X11SRCDIR.${DRIVER}}/src/
 		-I${DESTDIR}${X11INCDIR}/X11 \
 		-I${DESTDIR}${X11INCDIR}/X11/dri \
 		-I${DESTDIR}${X11INCDIR}/libdrm \
-		-I${X11SRCDIR.${DRIVER}}/../include
+		-I${X11SRCDIR.${DRIVER}}/../include \
+		-I${X11SRCDIR.${DRIVER}}/../xorg-server-copy
+.if ${XORG_SERVER_SUBDIR} != "xorg-server.old"
+CPPFLAGS+=	-DHAVE_XORG_LIST
+# XXX These have been copied from xorg-server 1.10.6.
+SRCS+=		fi1236.c msp3430.c tda9885.c uda1380.c
+.PATH:		${X11SRCDIR.${DRIVER}}/../xorg-server-copy
+.endif
 
 # XXX
 COPTS+=	-Wno-error



CVS commit: src/external/mit/xorg/server/drivers/xf86-video-radeon

2014-08-11 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Mon Aug 11 08:25:58 UTC 2014

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-radeon: Makefile

Log Message:
put KMS support under our X11DRI definition.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 \
src/external/mit/xorg/server/drivers/xf86-video-radeon/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-radeon/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile:1.17 src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile:1.18
--- src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile:1.17	Mon Aug  4 01:25:23 2014
+++ src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile	Mon Aug 11 08:25:58 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.17 2014/08/04 01:25:23 rjs Exp $
+#	$NetBSD: Makefile,v 1.18 2014/08/11 08:25:58 mrg Exp $
 
 .include bsd.own.mk
 
@@ -16,11 +16,13 @@ SRCS.DRI=	radeon_dri.c
 CPPFLAGS+=	${X11FLAGS.DRI}
 .endif
 
+.if ${X11DRI} != no
 # XXX
-.if ${MACHINE_ARCH} == i386 || ${MACHINE_ARCH} == x86_64
+. if ${MACHINE_ARCH} == i386 || ${MACHINE_ARCH} == x86_64
 SRCS.KMS=	radeon_dri2.c radeon_kms.c drmmode_display.c radeon_vbo.c
 CPPFLAGS+=	-DXF86DRM_MODE
 LIBDPLIBS+=	drm_radeon ${.CURDIR}/../../../lib/libdrm_radeon
+. endif
 .endif
 
 SRCS.EXA=	radeon_exa.c r600_exa.c r6xx_accel.c \



CVS commit: src/external/mit/xorg/server/drivers/xf86-video-radeon

2014-08-03 Thread Robert Swindells
Module Name:src
Committed By:   rjs
Date:   Mon Aug  4 01:25:23 UTC 2014

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-radeon: Makefile

Log Message:
Link against radeon_libdrm.
Re-enable building kms bits, ok mrg@.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 \
src/external/mit/xorg/server/drivers/xf86-video-radeon/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-radeon/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile:1.16 src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile:1.17
--- src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile:1.16	Sun Jul 27 23:24:19 2014
+++ src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile	Mon Aug  4 01:25:23 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.16 2014/07/27 23:24:19 mrg Exp $
+#	$NetBSD: Makefile,v 1.17 2014/08/04 01:25:23 rjs Exp $
 
 .include bsd.own.mk
 
@@ -18,10 +18,9 @@ CPPFLAGS+=	${X11FLAGS.DRI}
 
 # XXX
 .if ${MACHINE_ARCH} == i386 || ${MACHINE_ARCH} == x86_64
-.if 0
 SRCS.KMS=	radeon_dri2.c radeon_kms.c drmmode_display.c radeon_vbo.c
 CPPFLAGS+=	-DXF86DRM_MODE
-.endif
+LIBDPLIBS+=	drm_radeon ${.CURDIR}/../../../lib/libdrm_radeon
 .endif
 
 SRCS.EXA=	radeon_exa.c r600_exa.c r6xx_accel.c \



CVS commit: src/external/mit/xorg/server/drivers/xf86-video-radeon

2014-07-27 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Sun Jul 27 23:24:19 UTC 2014

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-radeon: Makefile

Log Message:
disable KMS for now; it breaks UMS + (old) radeondrm.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 \
src/external/mit/xorg/server/drivers/xf86-video-radeon/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-radeon/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile:1.15 src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile:1.16
--- src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile:1.15	Sat Jul 26 08:05:15 2014
+++ src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile	Sun Jul 27 23:24:19 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.15 2014/07/26 08:05:15 mrg Exp $
+#	$NetBSD: Makefile,v 1.16 2014/07/27 23:24:19 mrg Exp $
 
 .include bsd.own.mk
 
@@ -18,9 +18,11 @@ CPPFLAGS+=	${X11FLAGS.DRI}
 
 # XXX
 .if ${MACHINE_ARCH} == i386 || ${MACHINE_ARCH} == x86_64
+.if 0
 SRCS.KMS=	radeon_dri2.c radeon_kms.c drmmode_display.c radeon_vbo.c
 CPPFLAGS+=	-DXF86DRM_MODE
 .endif
+.endif
 
 SRCS.EXA=	radeon_exa.c r600_exa.c r6xx_accel.c \
 		r600_textured_videofuncs.c r600_shader.c \



CVS commit: src/external/mit/xorg/server/drivers/xf86-video-radeon

2014-07-26 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Sat Jul 26 08:05:15 UTC 2014

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-radeon: Makefile

Log Message:
enable KMS on x86.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 \
src/external/mit/xorg/server/drivers/xf86-video-radeon/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-radeon/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile:1.14 src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile:1.15
--- src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile:1.14	Tue Jun 12 12:26:42 2012
+++ src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile	Sat Jul 26 08:05:15 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.14 2012/06/12 12:26:42 rjs Exp $
+#	$NetBSD: Makefile,v 1.15 2014/07/26 08:05:15 mrg Exp $
 
 .include bsd.own.mk
 
@@ -16,7 +16,11 @@ SRCS.DRI=	radeon_dri.c
 CPPFLAGS+=	${X11FLAGS.DRI}
 .endif
 
-#RADEON_KMS_SRCS=radeon_dri2.c radeon_kms.c drmmode_display.c radeon_vbo.c
+# XXX
+.if ${MACHINE_ARCH} == i386 || ${MACHINE_ARCH} == x86_64
+SRCS.KMS=	radeon_dri2.c radeon_kms.c drmmode_display.c radeon_vbo.c
+CPPFLAGS+=	-DXF86DRM_MODE
+.endif
 
 SRCS.EXA=	radeon_exa.c r600_exa.c r6xx_accel.c \
 		r600_textured_videofuncs.c r600_shader.c \
@@ -32,7 +36,8 @@ SRCS=	radeon_accel.c radeon_cursor.c \
 	radeon_crtc.c radeon_output.c radeon_modes.c radeon_tv.c \
 	radeon_legacy_memory.c radeon_pm.c radeon_xvmc.c \
 	$(SRCS.ATOMBIOS) radeon_atombios.c radeon_atomwrapper.c \
-	$(SRCS.DRI) $(SRCS.EXA) atombios_output.c atombios_crtc.c
+	$(SRCS.DRI) $(SRCS.EXA) atombios_output.c atombios_crtc.c \
+	$(SRCS.KMS)
 MAN=	radeon.4
 
 CPPFLAGS+=	-DDISABLE_EASF -DENABLE_ALL_SERVICE_FUNCTIONS \



CVS commit: src/external/mit/xorg/server/drivers/xf86-video-radeon

2012-06-12 Thread Robert Swindells
Module Name:src
Committed By:   rjs
Date:   Tue Jun 12 12:26:43 UTC 2012

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-radeon: Makefile

Log Message:
Add radeon_xvmc.c, new in 6.14.4.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 \
src/external/mit/xorg/server/drivers/xf86-video-radeon/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-radeon/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile:1.13 src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile:1.14
--- src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile:1.13	Sat Jul 23 12:13:40 2011
+++ src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile	Tue Jun 12 12:26:42 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.13 2011/07/23 12:13:40 mrg Exp $
+#	$NetBSD: Makefile,v 1.14 2012/06/12 12:26:42 rjs Exp $
 
 .include bsd.own.mk
 
@@ -30,7 +30,7 @@ SRCS=	radeon_accel.c radeon_cursor.c \
 	radeon_mm_i2c.c radeon_vip.c radeon_misc.c radeon_probe.c \
 	legacy_crtc.c legacy_output.c radeon_textured_video.c \
 	radeon_crtc.c radeon_output.c radeon_modes.c radeon_tv.c \
-	radeon_legacy_memory.c radeon_pm.c \
+	radeon_legacy_memory.c radeon_pm.c radeon_xvmc.c \
 	$(SRCS.ATOMBIOS) radeon_atombios.c radeon_atomwrapper.c \
 	$(SRCS.DRI) $(SRCS.EXA) atombios_output.c atombios_crtc.c
 MAN=	radeon.4



CVS commit: src/external/mit/xorg/server/drivers/xf86-video-radeon

2011-07-23 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Sat Jul 23 12:13:40 UTC 2011

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-radeon: Makefile

Log Message:
build cayman_shader.c for xf86-video 6.14.2.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 \
src/external/mit/xorg/server/drivers/xf86-video-radeon/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-radeon/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile:1.12 src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile:1.13
--- src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile:1.12	Mon Feb 21 01:01:54 2011
+++ src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile	Sat Jul 23 12:13:40 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.12 2011/02/21 01:01:54 mrg Exp $
+#	$NetBSD: Makefile,v 1.13 2011/07/23 12:13:40 mrg Exp $
 
 .include bsd.own.mk
 
@@ -22,7 +22,8 @@
 		r600_textured_videofuncs.c r600_shader.c \
 		radeon_exa_shared.c \
 		evergreen_exa.c evergreen_accel.c evergreen_shader.c \
-		evergreen_textured_videofuncs.c
+		evergreen_textured_videofuncs.c \
+		cayman_accel.c cayman_shader.c
 
 SRCS=	radeon_accel.c radeon_cursor.c \
 	radeon_driver.c radeon_video.c radeon_bios.c \



CVS commit: src/external/mit/xorg/server/drivers/xf86-video-radeon

2011-02-20 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Mon Feb 21 01:01:54 UTC 2011

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-radeon: Makefile

Log Message:
build the new evergreen files in xf86-video-ati 6.14.0


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
src/external/mit/xorg/server/drivers/xf86-video-radeon/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-radeon/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile:1.11 src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile:1.12
--- src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile:1.11	Sat Nov 20 21:24:00 2010
+++ src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile	Mon Feb 21 01:01:54 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.11 2010/11/20 21:24:00 mrg Exp $
+#	$NetBSD: Makefile,v 1.12 2011/02/21 01:01:54 mrg Exp $
 
 .include bsd.own.mk
 
@@ -20,7 +20,9 @@
 
 SRCS.EXA=	radeon_exa.c r600_exa.c r6xx_accel.c \
 		r600_textured_videofuncs.c r600_shader.c \
-		radeon_exa_shared.c
+		radeon_exa_shared.c \
+		evergreen_exa.c evergreen_accel.c evergreen_shader.c \
+		evergreen_textured_videofuncs.c
 
 SRCS=	radeon_accel.c radeon_cursor.c \
 	radeon_driver.c radeon_video.c radeon_bios.c \



CVS commit: src/external/mit/xorg/server/drivers/xf86-video-radeon

2010-11-20 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Sat Nov 20 21:24:00 UTC 2010

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-radeon: Makefile

Log Message:
add missing radeon_exa_shared.c, came with 6.13.2.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
src/external/mit/xorg/server/drivers/xf86-video-radeon/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-radeon/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile:1.10 src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile:1.11
--- src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile:1.10	Sun May 23 06:16:13 2010
+++ src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile	Sat Nov 20 21:24:00 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.10 2010/05/23 06:16:13 mrg Exp $
+#	$NetBSD: Makefile,v 1.11 2010/11/20 21:24:00 mrg Exp $
 
 .include bsd.own.mk
 
@@ -19,7 +19,8 @@
 #RADEON_KMS_SRCS=radeon_dri2.c radeon_kms.c drmmode_display.c radeon_vbo.c
 
 SRCS.EXA=	radeon_exa.c r600_exa.c r6xx_accel.c \
-		r600_textured_videofuncs.c r600_shader.c
+		r600_textured_videofuncs.c r600_shader.c \
+		radeon_exa_shared.c
 
 SRCS=	radeon_accel.c radeon_cursor.c \
 	radeon_driver.c radeon_video.c radeon_bios.c \



CVS commit: src/external/mit/xorg/server/drivers/xf86-video-radeon

2010-05-23 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Sun May 23 06:16:13 UTC 2010

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-radeon: Makefile

Log Message:
updates for xf86-video-ati 6.13.0.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
src/external/mit/xorg/server/drivers/xf86-video-radeon/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-radeon/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile:1.9 src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile:1.10
--- src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile:1.9	Sat May 22 23:04:01 2010
+++ src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile	Sun May 23 06:16:13 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.9 2010/05/22 23:04:01 mrg Exp $
+#	$NetBSD: Makefile,v 1.10 2010/05/23 06:16:13 mrg Exp $
 
 .include bsd.own.mk
 
@@ -16,15 +16,17 @@
 CPPFLAGS+=	${X11FLAGS.DRI}
 .endif
 
+#RADEON_KMS_SRCS=radeon_dri2.c radeon_kms.c drmmode_display.c radeon_vbo.c
+
 SRCS.EXA=	radeon_exa.c r600_exa.c r6xx_accel.c \
 		r600_textured_videofuncs.c r600_shader.c
 
-SRCS=	radeon_accel.c radeon_cursor.c radeon_dga.c \
+SRCS=	radeon_accel.c radeon_cursor.c \
 	radeon_driver.c radeon_video.c radeon_bios.c \
 	radeon_mm_i2c.c radeon_vip.c radeon_misc.c radeon_probe.c \
 	legacy_crtc.c legacy_output.c radeon_textured_video.c \
 	radeon_crtc.c radeon_output.c radeon_modes.c radeon_tv.c \
-	radeon_legacy_memory.c \
+	radeon_legacy_memory.c radeon_pm.c \
 	$(SRCS.ATOMBIOS) radeon_atombios.c radeon_atomwrapper.c \
 	$(SRCS.DRI) $(SRCS.EXA) atombios_output.c atombios_crtc.c
 MAN=	radeon.4



CVS commit: src/external/mit/xorg/server/drivers/xf86-video-radeon

2009-12-16 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Wed Dec 16 14:13:18 UTC 2009

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-radeon: Makefile

Log Message:
Use += otherwise COPTS loses important flags.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/drivers/xf86-video-radeon/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-radeon/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile:1.5 src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile:1.6
--- src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile:1.5	Thu Oct  8 19:06:51 2009
+++ src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile	Wed Dec 16 14:13:18 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2009/10/08 19:06:51 snj Exp $
+#	$NetBSD: Makefile,v 1.6 2009/12/16 14:13:18 skrll Exp $
 
 .include bsd.own.mk
 
@@ -39,6 +39,6 @@
 		-I${X11SRCDIR.${DRIVER}}/../include
 
 # XXX
-COPTS=	-Wno-error
+COPTS+=	-Wno-error
 
 .include ../Makefile.xf86-driver