head	1.22;
access;
symbols
	netbsd-11-0-RC4:1.22
	netbsd-11-0-RC3:1.22
	netbsd-11-0-RC2:1.22
	netbsd-11-0-RC1:1.22
	perseant-exfatfs-base-20250801:1.22
	netbsd-11:1.22.0.12
	netbsd-11-base:1.22
	netbsd-10-1-RELEASE:1.22
	perseant-exfatfs-base-20240630:1.22
	perseant-exfatfs:1.22.0.10
	perseant-exfatfs-base:1.22
	netbsd-8-3-RELEASE:1.20
	netbsd-9-4-RELEASE:1.21
	netbsd-10-0-RELEASE:1.22
	netbsd-10-0-RC6:1.22
	netbsd-10-0-RC5:1.22
	netbsd-10-0-RC4:1.22
	netbsd-10-0-RC3:1.22
	netbsd-10-0-RC2:1.22
	netbsd-10-0-RC1:1.22
	netbsd-10:1.22.0.8
	netbsd-10-base:1.22
	netbsd-9-3-RELEASE:1.21
	cjep_sun2x-base1:1.22
	cjep_sun2x:1.22.0.6
	cjep_sun2x-base:1.22
	cjep_staticlib_x-base1:1.22
	netbsd-9-2-RELEASE:1.21
	cjep_staticlib_x:1.22.0.4
	cjep_staticlib_x-base:1.22
	netbsd-9-1-RELEASE:1.21
	phil-wifi-20200421:1.22
	phil-wifi-20200411:1.22
	is-mlppp:1.22.0.2
	is-mlppp-base:1.22
	phil-wifi-20200406:1.22
	netbsd-8-2-RELEASE:1.20
	netbsd-9-0-RELEASE:1.21
	netbsd-9-0-RC2:1.21
	netbsd-9-0-RC1:1.21
	phil-wifi-20191119:1.21
	netbsd-9:1.21.0.2
	netbsd-9-base:1.21
	phil-wifi-20190609:1.21
	netbsd-8-1-RELEASE:1.20
	netbsd-8-1-RC1:1.20
	pgoyette-compat-merge-20190127:1.20.12.1
	pgoyette-compat-20190127:1.21
	pgoyette-compat-20190118:1.21
	pgoyette-compat-1226:1.20
	pgoyette-compat-1126:1.20
	pgoyette-compat-1020:1.20
	pgoyette-compat-0930:1.20
	pgoyette-compat-0906:1.20
	netbsd-7-2-RELEASE:1.18
	pgoyette-compat-0728:1.20
	netbsd-8-0-RELEASE:1.20
	phil-wifi:1.20.0.14
	phil-wifi-base:1.20
	pgoyette-compat-0625:1.20
	netbsd-8-0-RC2:1.20
	pgoyette-compat-0521:1.20
	pgoyette-compat-0502:1.20
	pgoyette-compat-0422:1.20
	netbsd-8-0-RC1:1.20
	pgoyette-compat-0415:1.20
	pgoyette-compat-0407:1.20
	pgoyette-compat-0330:1.20
	pgoyette-compat-0322:1.20
	pgoyette-compat-0315:1.20
	netbsd-7-1-2-RELEASE:1.18
	pgoyette-compat:1.20.0.12
	pgoyette-compat-base:1.20
	netbsd-7-1-1-RELEASE:1.18
	matt-nb8-mediatek:1.20.0.10
	matt-nb8-mediatek-base:1.20
	perseant-stdc-iso10646:1.20.0.8
	perseant-stdc-iso10646-base:1.20
	netbsd-8:1.20.0.6
	netbsd-8-base:1.20
	prg-localcount2-base3:1.20
	prg-localcount2-base2:1.20
	prg-localcount2-base1:1.20
	prg-localcount2:1.20.0.4
	prg-localcount2-base:1.20
	pgoyette-localcount-20170426:1.20
	bouyer-socketcan-base1:1.20
	pgoyette-localcount-20170320:1.20
	netbsd-7-1:1.18.0.8
	netbsd-7-1-RELEASE:1.18
	netbsd-7-1-RC2:1.18
	netbsd-7-nhusb-base-20170116:1.18
	bouyer-socketcan:1.20.0.2
	bouyer-socketcan-base:1.20
	pgoyette-localcount-20170107:1.20
	netbsd-7-1-RC1:1.18
	pgoyette-localcount-20161104:1.20
	netbsd-7-0-2-RELEASE:1.18
	localcount-20160914:1.20
	netbsd-7-nhusb:1.18.0.6
	netbsd-7-nhusb-base:1.18
	pgoyette-localcount-20160806:1.19
	pgoyette-localcount-20160726:1.19
	pgoyette-localcount:1.19.0.2
	pgoyette-localcount-base:1.19
	netbsd-7-0-1-RELEASE:1.18
	netbsd-7-0:1.18.0.4
	netbsd-7-0-RELEASE:1.18
	netbsd-7-0-RC3:1.18
	netbsd-7-0-RC2:1.18
	netbsd-7-0-RC1:1.18
	netbsd-5-2-3-RELEASE:1.1.8.3
	netbsd-5-1-5-RELEASE:1.1.8.2
	netbsd-6-0-6-RELEASE:1.13
	netbsd-6-1-5-RELEASE:1.13.4.1
	netbsd-7:1.18.0.2
	netbsd-7-base:1.18
	yamt-pagecache-base9:1.14
	yamt-pagecache-tag8:1.13.2.1
	netbsd-6-1-4-RELEASE:1.13.4.1
	netbsd-6-0-5-RELEASE:1.13
	tls-earlyentropy:1.14.0.8
	tls-earlyentropy-base:1.17
	riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.14
	riastradh-drm2-base3:1.14
	netbsd-6-1-3-RELEASE:1.13.4.1
	netbsd-6-0-4-RELEASE:1.13
	netbsd-5-2-2-RELEASE:1.1.8.3
	netbsd-5-1-4-RELEASE:1.1.8.2
	netbsd-6-1-2-RELEASE:1.13.4.1
	netbsd-6-0-3-RELEASE:1.13
	netbsd-5-2-1-RELEASE:1.1.8.3
	netbsd-5-1-3-RELEASE:1.1.8.2
	netbsd-6-1-1-RELEASE:1.13.4.1
	riastradh-drm2-base2:1.14
	riastradh-drm2-base1:1.14
	riastradh-drm2:1.14.0.4
	riastradh-drm2-base:1.14
	netbsd-6-1:1.13.4.1.0.2
	netbsd-6-0-2-RELEASE:1.13
	netbsd-6-1-RELEASE:1.13.4.1
	netbsd-6-1-RC4:1.13.4.1
	netbsd-6-1-RC3:1.13.4.1
	agc-symver:1.14.0.6
	agc-symver-base:1.14
	netbsd-6-1-RC2:1.13.4.1
	netbsd-6-1-RC1:1.13.4.1
	yamt-pagecache-base8:1.14
	netbsd-5-2:1.1.8.3.0.2
	netbsd-6-0-1-RELEASE:1.13
	yamt-pagecache-base7:1.14
	netbsd-5-2-RELEASE:1.1.8.3
	netbsd-5-2-RC1:1.1.8.3
	matt-nb6-plus-nbase:1.13
	yamt-pagecache-base6:1.14
	netbsd-6-0:1.13.0.8
	netbsd-6-0-RELEASE:1.13
	netbsd-6-0-RC2:1.13
	tls-maxphys:1.14.0.2
	tls-maxphys-base:1.18
	matt-nb6-plus:1.13.0.6
	matt-nb6-plus-base:1.13
	netbsd-6-0-RC1:1.13
	yamt-pagecache-base5:1.13
	yamt-pagecache-base4:1.13
	netbsd-6:1.13.0.4
	netbsd-6-base:1.13
	netbsd-5-1-2-RELEASE:1.1.8.2
	netbsd-5-1-1-RELEASE:1.1.8.2
	yamt-pagecache-base3:1.13
	yamt-pagecache-base2:1.13
	yamt-pagecache:1.13.0.2
	yamt-pagecache-base:1.13
	cherry-xenmp:1.12.0.2
	cherry-xenmp-base:1.12
	bouyer-quota2-nbase:1.12
	bouyer-quota2:1.11.0.2
	bouyer-quota2-base:1.11
	matt-mips64-premerge-20101231:1.11
	matt-nb5-mips64-premerge-20101231:1.1.14.1
	matt-nb5-pq3:1.1.8.2.0.4
	matt-nb5-pq3-base:1.1.8.2
	netbsd-5-1:1.1.8.2.0.2
	netbsd-5-1-RELEASE:1.1.8.2
	netbsd-5-1-RC4:1.1.8.2
	matt-nb5-mips64-k15:1.1.14.1
	netbsd-5-1-RC3:1.1.8.2
	netbsd-5-1-RC2:1.1.8.2
	netbsd-5-1-RC1:1.1.8.2
	netbsd-5-0-2-RELEASE:1.1
	matt-nb5-mips64-premerge-20091211:1.1
	matt-premerge-20091211:1.5
	matt-nb5-mips64-u2-k2-k4-k7-k8-k9:1.1
	matt-nb4-mips64-k7-u2a-k9b:1.1
	matt-nb5-mips64-u1-k1-k5:1.1
	matt-nb5-mips64:1.1.0.14
	netbsd-5-0-1-RELEASE:1.1
	jym-xensuspend-nbase:1.2
	netbsd-5-0:1.1.0.12
	netbsd-5-0-RELEASE:1.1
	netbsd-5-0-RC4:1.1
	netbsd-5-0-RC3:1.1
	netbsd-5-0-RC2:1.1
	jym-xensuspend:1.1.0.10
	jym-xensuspend-base:1.2
	netbsd-5-0-RC1:1.1
	haad-dm-base:1.1
	haad-dm-base2:1.1
	haad-nbase2:1.1
	netbsd-5:1.1.0.8
	netbsd-5-base:1.1
	matt-mips64-base2:1.1
	haad-dm:1.1.0.6
	haad-dm-base1:1.1
	wrstuden-revivesa-base-3:1.1
	wrstuden-revivesa:1.1.0.2
	wrstuden-revivesa-base-2:1.1;
locks; strict;
comment	@# @;


1.22
date	2020.01.19.00.58.15;	author jmcneill;	state Exp;
branches;
next	1.21;
commitid	rnaLnZIKTqeHJeTB;

1.21
date	2019.01.01.00.37.06;	author mrg;	state Exp;
branches;
next	1.20;
commitid	re5bd8HS5c69V06B;

1.20
date	2016.08.16.07.08.17;	author mrg;	state Exp;
branches
	1.20.12.1
	1.20.14.1;
next	1.19;
commitid	upDoi6lBWfRrZuiz;

1.19
date	2015.05.28.14.36.45;	author rjs;	state Exp;
branches;
next	1.18;
commitid	AfLWdk5IZEmeOdny;

1.18
date	2014.08.11.08.25.58;	author mrg;	state Exp;
branches;
next	1.17;
commitid	QOZoMFV5iGJ75VLx;

1.17
date	2014.08.04.01.25.23;	author rjs;	state Exp;
branches;
next	1.16;
commitid	qJJj4siJFkCnYYKx;

1.16
date	2014.07.27.23.24.19;	author mrg;	state Exp;
branches;
next	1.15;
commitid	RFrtcbTtAfqdx4Kx;

1.15
date	2014.07.26.08.05.15;	author mrg;	state Exp;
branches;
next	1.14;
commitid	QHyEQW8mNzLZtRJx;

1.14
date	2012.06.12.12.26.42;	author rjs;	state Exp;
branches
	1.14.2.1
	1.14.8.1;
next	1.13;

1.13
date	2011.07.23.12.13.40;	author mrg;	state Exp;
branches
	1.13.2.1
	1.13.4.1;
next	1.12;

1.12
date	2011.02.21.01.01.54;	author mrg;	state Exp;
branches;
next	1.11;

1.11
date	2010.11.20.21.24.00;	author mrg;	state Exp;
branches
	1.11.2.1;
next	1.10;

1.10
date	2010.05.23.06.16.13;	author mrg;	state Exp;
branches;
next	1.9;

1.9
date	2010.05.22.23.04.01;	author mrg;	state Exp;
branches;
next	1.8;

1.8
date	2010.05.22.10.18.03;	author mrg;	state Exp;
branches;
next	1.7;

1.7
date	2010.05.22.05.42.54;	author mrg;	state Exp;
branches;
next	1.6;

1.6
date	2009.12.16.14.13.18;	author skrll;	state Exp;
branches;
next	1.5;

1.5
date	2009.10.08.19.06.51;	author snj;	state Exp;
branches;
next	1.4;

1.4
date	2009.06.12.04.00.57;	author mrg;	state Exp;
branches;
next	1.3;

1.3
date	2009.06.10.09.22.09;	author mrg;	state Exp;
branches;
next	1.2;

1.2
date	2009.03.30.02.01.11;	author mrg;	state Exp;
branches;
next	1.1;

1.1
date	2008.08.28.07.49.05;	author mrg;	state Exp;
branches
	1.1.2.1
	1.1.6.1
	1.1.8.1
	1.1.10.1
	1.1.14.1;
next	;

1.20.12.1
date	2019.01.18.08.49.05;	author pgoyette;	state Exp;
branches;
next	;
commitid	Lmlzg3OVT2cd6f8B;

1.20.14.1
date	2019.06.10.22.02.45;	author christos;	state Exp;
branches;
next	1.20.14.2;
commitid	jtc8rnCzWiEEHGqB;

1.20.14.2
date	2020.04.08.14.07.03;	author martin;	state Exp;
branches;
next	;
commitid	Qli2aW9E74UFuA3C;

1.14.2.1
date	2014.08.20.00.00.14;	author tls;	state Exp;
branches;
next	;
commitid	jTnpym9Qu0o4R1Nx;

1.14.8.1
date	2014.08.10.06.50.58;	author tls;	state Exp;
branches;
next	;
commitid	DgL6ai6yRo4DAMLx;

1.13.2.1
date	2012.10.30.18.58.13;	author yamt;	state Exp;
branches;
next	;

1.13.4.1
date	2013.02.11.21.04.46;	author riz;	state Exp;
branches;
next	1.13.4.2;

1.13.4.2
date	2016.07.13.19.34.23;	author snj;	state Exp;
branches;
next	;
commitid	URHQnCtDxo8tdcez;

1.11.2.1
date	2011.03.05.15.09.12;	author bouyer;	state Exp;
branches;
next	;

1.1.2.1
date	2008.08.28.07.49.05;	author wrstuden;	state dead;
branches;
next	1.1.2.2;

1.1.2.2
date	2008.09.18.05.18.42;	author wrstuden;	state Exp;
branches;
next	;

1.1.6.1
date	2008.08.28.07.49.05;	author haad;	state dead;
branches;
next	1.1.6.2;

1.1.6.2
date	2008.10.19.22.41.16;	author haad;	state Exp;
branches;
next	;

1.1.8.1
date	2009.09.17.04.24.36;	author snj;	state Exp;
branches;
next	1.1.8.2;

1.1.8.2
date	2009.10.10.19.53.23;	author sborrill;	state Exp;
branches;
next	1.1.8.3;

1.1.8.3
date	2011.01.16.14.17.36;	author bouyer;	state Exp;
branches;
next	;

1.1.10.1
date	2009.05.13.18.53.28;	author jym;	state Exp;
branches;
next	;

1.1.14.1
date	2010.04.21.05.24.41;	author matt;	state Exp;
branches;
next	;


desc
@@


1.22
log
@Build radeon and nouveau drivers on evbarm.
@
text
@#	$NetBSD: Makefile,v 1.21 2019/01/01 00:37:06 mrg Exp $

.include <bsd.own.mk>

DRIVER=		xf86-video-ati
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || \
    ${MACHINE} == "evbarm"
DRIVER_NAME=	radeon_drv_old
.else
DRIVER_NAME=	radeon_drv
.endif

.PATH:  ${X11SRCDIR.${DRIVER}}/src/AtomBios
SRCS.ATOMBIOS= \
        CD_Operations.c \
        Decoder.c \
        hwserv_drv.c

.if ${X11DRI} != "no"
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" || \
     ${MACHINE} == "evbarm"
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 \
		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=	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_pm.c radeon_xvmc.c \
	$(SRCS.ATOMBIOS) radeon_atombios.c radeon_atomwrapper.c \
	$(SRCS.DRI) $(SRCS.EXA) atombios_output.c atombios_crtc.c \
	$(SRCS.KMS)
MAN=	radeon.4

CPPFLAGS+=	-DDISABLE_EASF -DENABLE_ALL_SERVICE_FUNCTIONS \
		-DATOM_BIOS -DATOM_BIOS_PARSER -DDRIVER_PARSER \
		-DHAVE_CONFIG_H -DHAVE_XF86_CURSOR_RESET_CURSOR
CPPFLAGS+=	-I${X11SRCDIR.${DRIVER}}/src/AtomBios/includes \
		-I${DESTDIR}${X11INCDIR}/X11 \
		-I${DESTDIR}${X11INCDIR}/X11/dri \
		-I${DESTDIR}${X11INCDIR}/libdrm \
		-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

.include "../Makefile.xf86-driver"
@


1.21
log
@build fixes for xorg-server 1.20 parts:

- define HAVE_XF86_CURSOR_RESET_CURSOR for several drivers that now
  look for it.
- remove various -Wno* options no longer needed, in particular the
  global -Wno-error in the radeon and radeon-kms drivers
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.20 2016/08/16 07:08:17 mrg Exp $
d6 2
a7 1
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
d31 2
a32 1
. if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
@


1.20
log
@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.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.19 2015/05/28 14:36:45 rjs Exp $
d57 1
a57 1
		-DHAVE_CONFIG_H
d64 1
a71 3
# XXX
COPTS+=	-Wno-error

@


1.20.14.1
log
@Sync with HEAD
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.21 2019/01/01 00:37:06 mrg Exp $
d57 1
a57 1
		-DHAVE_CONFIG_H -DHAVE_XF86_CURSOR_RESET_CURSOR
a63 1

d71 3
@


1.20.14.2
log
@Merge changes from current as of 20200406
@
text
@d1 1
a1 1
#	$NetBSD$
d6 1
a6 2
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || \
    ${MACHINE} == "evbarm"
d30 1
a30 2
. if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || \
     ${MACHINE} == "evbarm"
@


1.20.12.1
log
@Synch with HEAD
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.20 2016/08/16 07:08:17 mrg Exp $
d57 1
a57 1
		-DHAVE_CONFIG_H -DHAVE_XF86_CURSOR_RESET_CURSOR
a63 1

d71 3
@


1.19
log
@Build both xf86-video-radeon drivers for amd64 and i386, just build the
old one for other ports.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.18 2014/08/11 08:25:58 mrg Exp $
d23 5
d62 8
a69 1
		-I${X11SRCDIR.${DRIVER}}/../include
@


1.18
log
@put KMS support under our X11DRI definition.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.17 2014/08/04 01:25:23 rjs Exp $
d6 3
d10 1
@


1.17
log
@Link against radeon_libdrm.
Re-enable building kms bits, ok mrg@@.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.16 2014/07/27 23:24:19 mrg Exp $
d19 1
d21 1
a21 1
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
d25 1
@


1.16
log
@disable KMS for now; it breaks UMS + (old) radeondrm.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.15 2014/07/26 08:05:15 mrg Exp $
a20 1
.if 0
d23 1
a23 1
.endif
@


1.15
log
@enable KMS on x86.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.14 2012/06/12 12:26:42 rjs Exp $
d21 1
d25 1
@


1.14
log
@Add radeon_xvmc.c, new in 6.14.4.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.13 2011/07/23 12:13:40 mrg Exp $
d19 5
a23 1
#RADEON_KMS_SRCS=radeon_dri2.c radeon_kms.c drmmode_display.c radeon_vbo.c
d39 2
a40 1
	$(SRCS.DRI) $(SRCS.EXA) atombios_output.c atombios_crtc.c
@


1.14.2.1
log
@Rebase to HEAD as of a few days ago.
@
text
@d1 1
a1 1
#	$NetBSD$
d19 1
a19 8
.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
.endif
d35 1
a35 2
	$(SRCS.DRI) $(SRCS.EXA) atombios_output.c atombios_crtc.c \
	$(SRCS.KMS)
@


1.14.8.1
log
@Rebase.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.17 2014/08/04 01:25:23 rjs Exp $
d19 1
a19 6
# 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
d35 1
a35 2
	$(SRCS.DRI) $(SRCS.EXA) atombios_output.c atombios_crtc.c \
	$(SRCS.KMS)
@


1.13
log
@build cayman_shader.c for xf86-video 6.14.2.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.12 2011/02/21 01:01:54 mrg Exp $
d33 1
a33 1
	radeon_legacy_memory.c radeon_pm.c \
@


1.13.4.1
log
@Pull up following revision(s) (requested by veego in ticket #812):

external/mit/xorg/server/drivers/xf86-video-radeon/Makefile		patch
xsrc/external/mit/xf86-video-ati/dist/ChangeLog				patch
xsrc/external/mit/xf86-video-ati/dist/INSTALL				patch
xsrc/external/mit/xf86-video-ati/dist/Makefile.in			patch
xsrc/external/mit/xf86-video-ati/dist/aclocal.m4			patch
xsrc/external/mit/xf86-video-ati/dist/config.h.in			patch
xsrc/external/mit/xf86-video-ati/dist/configure				patch
xsrc/external/mit/xf86-video-ati/dist/configure.ac			patch
xsrc/external/mit/xf86-video-ati/dist/ltmain.sh				patch
xsrc/external/mit/xf86-video-ati/dist/man/Makefile.in			patch
xsrc/external/mit/xf86-video-ati/dist/man/radeon.man			patch
xsrc/external/mit/xf86-video-ati/dist/src/Makefile.am			patch
xsrc/external/mit/xf86-video-ati/dist/src/Makefile.in			patch
xsrc/external/mit/xf86-video-ati/dist/src/ati.c				patch
xsrc/external/mit/xf86-video-ati/dist/src/ati.h				patch
xsrc/external/mit/xf86-video-ati/dist/src/ati_pciids_gen.h		patch
xsrc/external/mit/xf86-video-ati/dist/src/atipciids.h			patch
xsrc/external/mit/xf86-video-ati/dist/src/atombios_crtc.c		patch
xsrc/external/mit/xf86-video-ati/dist/src/atombios_output.c		patch
xsrc/external/mit/xf86-video-ati/dist/src/cayman_reg.h			patch
xsrc/external/mit/xf86-video-ati/dist/src/cayman_shader.c		patch
xsrc/external/mit/xf86-video-ati/dist/src/compat-api.h			patch
xsrc/external/mit/xf86-video-ati/dist/src/drmmode_display.c		patch
xsrc/external/mit/xf86-video-ati/dist/src/drmmode_display.h		patch
xsrc/external/mit/xf86-video-ati/dist/src/evergreen_accel.c		patch
xsrc/external/mit/xf86-video-ati/dist/src/evergreen_exa.c		patch
xsrc/external/mit/xf86-video-ati/dist/src/evergreen_reg.h		patch
xsrc/external/mit/xf86-video-ati/dist/src/evergreen_shader.c		patch
xsrc/external/mit/xf86-video-ati/dist/src/evergreen_state.h		patch
xsrc/external/mit/xf86-video-ati/dist/src/evergreen_textured_videofuncs.c patch
xsrc/external/mit/xf86-video-ati/dist/src/generic_bus.h			patch
xsrc/external/mit/xf86-video-ati/dist/src/legacy_crtc.c			patch
xsrc/external/mit/xf86-video-ati/dist/src/r600_exa.c			patch
xsrc/external/mit/xf86-video-ati/dist/src/r600_reg.h			patch
xsrc/external/mit/xf86-video-ati/dist/src/r600_shader.c			patch
xsrc/external/mit/xf86-video-ati/dist/src/r600_state.h			patch
xsrc/external/mit/xf86-video-ati/dist/src/r600_textured_videofuncs.c	patch
xsrc/external/mit/xf86-video-ati/dist/src/r6xx_accel.c			patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon.h			patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_accel.c		patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_accelfuncs.c		patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_atombios.c		patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_atombios.h		patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_bios.c			patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_chipinfo_gen.h		patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_chipset_gen.h		patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_commonfuncs.c		patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_crtc.c			patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_cursor.c		patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_dri.c			patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_dri2.c			patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_driver.c		patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_drm.h			patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa.c			patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa_funcs.c		patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa_render.c		patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa_shared.c		patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa_shared.h		patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_kms.c			patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_legacy_memory.c	patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_modes.c		patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_output.c		patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_pci_chipset_gen.h	patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_pci_device_match_gen.h	patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_probe.c		patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_probe.h		patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_textured_video.c	patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_textured_videofuncs.c	patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_video.c		patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_video.h		patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_vip.c			patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_xvmc.c			patch
xsrc/external/mit/xf86-video-ati/dist/src/theatre.c			patch
xsrc/external/mit/xf86-video-ati/dist/src/theatre200.c			patch
xsrc/external/mit/xf86-video-ati/dist/src/theatre_detect.c		patch
xsrc/external/mit/xf86-video-ati/dist/src/pcidb/ati_pciids.csv		patch
xsrc/external/mit/xf86-video-ati/include/config.h			patch

	Update Xorg ATI driver to version 6.14.6.
	[veego, ticket #812]

NetBSD note: The libdrm requirement seems to be KMS related which we do
             not have.

* 6.14.6
  This version requires the latest libdrm 2.4.36 release, and fixes a few
  other bugs seen since 6.14.5.
* 6.14.5
  - add solid picture accel
  - tiling fixes
  - new pci ids
  - 6xx-9xx Xv improvements
  - support for upcoming xserver API changes
  - bug fixes
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.14 2012/06/12 12:26:42 rjs Exp $
d33 1
a33 1
	radeon_legacy_memory.c radeon_pm.c radeon_xvmc.c \
@


1.13.4.2
log
@Pull up following revision(s) (requested by mrg in ticket #1326):
	distrib/sets/lists/xbase/shl.mi: patch
	distrib/sets/lists/xcomp/mi: patch
	distrib/sets/lists/xcomp/shl.mi: patch
	external/mit/xorg/lib/libdrm/Makefile: patch
	external/mit/xorg/lib/libdrm/Makefile.defines: patch
	external/mit/xorg/lib/libdrm/shlib_version: patch
	external/mit/xorg/lib/libdrm/drm/Makefile: patch
	external/mit/xorg/lib/libdrm_intel/Makefile: patch
	external/mit/xorg/lib/libdrm_radeon/Makefile: patch
	external/mit/xorg/lib/libdrm_radeon/shlib_version: patch
	external/mit/xorg/server/drivers/xf86-video-radeon/Makefile: revision 1.15
	external/mit/xorg/server/drivers/xf86-video-ati/Makefile: patch
	xsrc/external/mit/libdrm/dist/Makefile.am: patch
	xsrc/external/mit/libdrm/dist/Makefile.in: patch
	xsrc/external/mit/libdrm/dist/aclocal.m4: patch
	xsrc/external/mit/libdrm/dist/config.guess: patch
	xsrc/external/mit/libdrm/dist/config.h.in: patch
	xsrc/external/mit/libdrm/dist/config.sub: patch
	xsrc/external/mit/libdrm/dist/configure: patch
	xsrc/external/mit/libdrm/dist/configure.ac: patch
	xsrc/external/mit/libdrm/dist/depcomp: patch
	xsrc/external/mit/libdrm/dist/install-sh: patch
	xsrc/external/mit/libdrm/dist/libdrm_lists.h: patch
	xsrc/external/mit/libdrm/dist/ltmain.sh: patch
	xsrc/external/mit/libdrm/dist/missing: patch
	xsrc/external/mit/libdrm/dist/xf86drm.c: patch
	xsrc/external/mit/libdrm/dist/xf86drm.h: patch
	xsrc/external/mit/libdrm/dist/xf86drmMode.c: patch
	xsrc/external/mit/libdrm/dist/xf86drmMode.h: patch
	xsrc/external/mit/libdrm/dist/build-aux/config.guess: patch
	xsrc/external/mit/libdrm/dist/build-aux/config.sub: patch
	xsrc/external/mit/libdrm/dist/build-aux/depcomp: patch
	xsrc/external/mit/libdrm/dist/build-aux/install-sh: patch
	xsrc/external/mit/libdrm/dist/build-aux/ltmain.sh: patch
	xsrc/external/mit/libdrm/dist/build-aux/missing: patch
	xsrc/external/mit/libdrm/dist/exynos/Makefile.am: patch
	xsrc/external/mit/libdrm/dist/exynos/Makefile.in: patch
	xsrc/external/mit/libdrm/dist/exynos/exynos_drm.c: patch
	xsrc/external/mit/libdrm/dist/exynos/exynos_drm.h: patch
	xsrc/external/mit/libdrm/dist/exynos/exynos_drmif.h: patch
	xsrc/external/mit/libdrm/dist/exynos/libdrm_exynos.pc.in: patch
	xsrc/external/mit/libdrm/dist/include/Makefile.in: patch
	xsrc/external/mit/libdrm/dist/include/drm/Makefile: patch
	xsrc/external/mit/libdrm/dist/include/drm/Makefile.am: patch
	xsrc/external/mit/libdrm/dist/include/drm/Makefile.in: patch
	xsrc/external/mit/libdrm/dist/include/drm/drm.h: patch
	xsrc/external/mit/libdrm/dist/include/drm/drm_fourcc.h: patch
	xsrc/external/mit/libdrm/dist/include/drm/drm_mode.h: patch
	xsrc/external/mit/libdrm/dist/include/drm/i915_drm.h: patch
	xsrc/external/mit/libdrm/dist/include/drm/radeon_drm.h: patch
	xsrc/external/mit/libdrm/dist/intel/Makefile.am: patch
	xsrc/external/mit/libdrm/dist/intel/Makefile.in: patch
	xsrc/external/mit/libdrm/dist/intel/intel_aub.h:patch
	xsrc/external/mit/libdrm/dist/intel/intel_bufmgr.c: patch
	xsrc/external/mit/libdrm/dist/intel/intel_bufmgr.h: patch
	xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_gem.c: patch
	xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_priv.h: patch
	xsrc/external/mit/libdrm/dist/intel/intel_chipset.h: patch
	xsrc/external/mit/libdrm/dist/intel/intel_debug.h: patch
	xsrc/external/mit/libdrm/dist/intel/intel_decode.c: patch
	xsrc/external/mit/libdrm/dist/intel/test_decode.c: patch
	xsrc/external/mit/libdrm/dist/intel/tests/gen4-3d.batch-ref.txt: patch
	xsrc/external/mit/libdrm/dist/intel/tests/gen4-3d.batch.sh: patch
	xsrc/external/mit/libdrm/dist/intel/tests/gen5-3d.batch-ref.txt: patch
	xsrc/external/mit/libdrm/dist/intel/tests/gen5-3d.batch.sh: patch
	xsrc/external/mit/libdrm/dist/intel/tests/gen6-3d.batch-ref.txt: patch
	xsrc/external/mit/libdrm/dist/intel/tests/gen6-3d.batch.sh: patch
	xsrc/external/mit/libdrm/dist/intel/tests/gen7-2d-copy.batch-ref.txt: patch
	xsrc/external/mit/libdrm/dist/intel/tests/gen7-2d-copy.batch.sh: patch
	xsrc/external/mit/libdrm/dist/intel/tests/gen7-3d.batch-ref.txt: patch
	xsrc/external/mit/libdrm/dist/intel/tests/gen7-3d.batch.sh: patch
	xsrc/external/mit/libdrm/dist/intel/tests/gm45-3d.batch-ref.txt: patch
	xsrc/external/mit/libdrm/dist/intel/tests/gm45-3d.batch.sh: patch
	xsrc/external/mit/libdrm/dist/intel/tests/test-batch.sh: patch
	xsrc/external/mit/libdrm/dist/libkms/Makefile.am: patch
	xsrc/external/mit/libdrm/dist/libkms/Makefile.in: patch
	xsrc/external/mit/libdrm/dist/libkms/dumb.c: patch
	xsrc/external/mit/libdrm/dist/libkms/internal.h: patch
	xsrc/external/mit/libdrm/dist/libkms/linux.c: patch
	xsrc/external/mit/libdrm/dist/libkms/radeon.c: patch
	xsrc/external/mit/libdrm/dist/m4/libtool.m4: patch
	xsrc/external/mit/libdrm/dist/m4/ltoptions.m4: patch
	xsrc/external/mit/libdrm/dist/m4/ltsugar.m4: patch
	xsrc/external/mit/libdrm/dist/m4/ltversion.m4: patch
	xsrc/external/mit/libdrm/dist/m4/lt~obsolete.m4: patch
	xsrc/external/mit/libdrm/dist/nouveau/Makefile.am:  patch
	xsrc/external/mit/libdrm/dist/nouveau/Makefile.in:  patch
	xsrc/external/mit/libdrm/dist/nouveau/abi16.c: patch
	xsrc/external/mit/libdrm/dist/nouveau/bufctx.c: patch
	xsrc/external/mit/libdrm/dist/nouveau/libdrm_nouveau.pc.in: patch
	xsrc/external/mit/libdrm/dist/nouveau/nouveau.c: patch
	xsrc/external/mit/libdrm/dist/nouveau/nouveau.h: patch
	xsrc/external/mit/libdrm/dist/nouveau/nouveau_bo.c: patch
	xsrc/external/mit/libdrm/dist/nouveau/nouveau_bo.h: patch
	xsrc/external/mit/libdrm/dist/nouveau/nouveau_channel.c: patch
	xsrc/external/mit/libdrm/dist/nouveau/nouveau_channel.h: patch
	xsrc/external/mit/libdrm/dist/nouveau/nouveau_device.c: patch
	xsrc/external/mit/libdrm/dist/nouveau/nouveau_device.h: patch
	xsrc/external/mit/libdrm/dist/nouveau/nouveau_drmif.h: patch
	xsrc/external/mit/libdrm/dist/nouveau/nouveau_grobj.c: patch
	xsrc/external/mit/libdrm/dist/nouveau/nouveau_grobj.h: patch
	xsrc/external/mit/libdrm/dist/nouveau/nouveau_notifier.c: patch
	xsrc/external/mit/libdrm/dist/nouveau/nouveau_notifier.h: patch
	xsrc/external/mit/libdrm/dist/nouveau/nouveau_private.h: patch
	xsrc/external/mit/libdrm/dist/nouveau/nouveau_pushbuf.c: patch
	xsrc/external/mit/libdrm/dist/nouveau/nouveau_pushbuf.h: patch
	xsrc/external/mit/libdrm/dist/nouveau/nouveau_reloc.c: patch
	xsrc/external/mit/libdrm/dist/nouveau/nouveau_reloc.h: patch
	xsrc/external/mit/libdrm/dist/nouveau/nouveau_resource.c: patch
	xsrc/external/mit/libdrm/dist/nouveau/nouveau_resource.h: patch
	xsrc/external/mit/libdrm/dist/nouveau/private.h: patch
	xsrc/external/mit/libdrm/dist/nouveau/pushbuf.c: patch
	xsrc/external/mit/libdrm/dist/omap/Makefile.am: patch
	xsrc/external/mit/libdrm/dist/omap/Makefile.in: patch
	xsrc/external/mit/libdrm/dist/omap/libdrm_omap.pc.in: patch
	xsrc/external/mit/libdrm/dist/omap/omap_drm.c: patch
	xsrc/external/mit/libdrm/dist/omap/omap_drm.h: patch
	xsrc/external/mit/libdrm/dist/omap/omap_drmif.h: patch
	xsrc/external/mit/libdrm/dist/radeon/Makefile.am: patch
	xsrc/external/mit/libdrm/dist/radeon/Makefile.in: patch
	xsrc/external/mit/libdrm/dist/radeon/r600_pci_ids.h: patch
	xsrc/external/mit/libdrm/dist/radeon/radeon_cs_space.c: patch
	xsrc/external/mit/libdrm/dist/radeon/radeon_surface.c: patch
	xsrc/external/mit/libdrm/dist/radeon/radeon_surface.h: patch
	xsrc/external/mit/libdrm/dist/tests/Makefile.am: patch
	xsrc/external/mit/libdrm/dist/tests/Makefile.in: patch
	xsrc/external/mit/libdrm/dist/tests/drmtest.c: patch
	xsrc/external/mit/libdrm/dist/tests/gem_flink.c: patch
	xsrc/external/mit/libdrm/dist/tests/kmstest/Makefile.in: patch
	xsrc/external/mit/libdrm/dist/tests/modeprint/Makefile.am: patch
	xsrc/external/mit/libdrm/dist/tests/modeprint/Makefile.in: patch
	xsrc/external/mit/libdrm/dist/tests/modeprint/modeprint.c: patch
	xsrc/external/mit/libdrm/dist/tests/modetest/Makefile.am: patch
	xsrc/external/mit/libdrm/dist/tests/modetest/Makefile.in: patch
	xsrc/external/mit/libdrm/dist/tests/modetest/modetest.c: patch
	xsrc/external/mit/libdrm/dist/tests/radeon/Makefile.am: patch
	xsrc/external/mit/libdrm/dist/tests/radeon/Makefile.in: patch
	xsrc/external/mit/libdrm/dist/tests/radeon/list.h: patch
	xsrc/external/mit/libdrm/dist/tests/radeon/radeon_ttm.c: patch
	xsrc/external/mit/libdrm/dist/tests/radeon/rbo.c: patch
	xsrc/external/mit/libdrm/dist/tests/radeon/rbo.h: patch
	xsrc/external/mit/libdrm/dist/tests/vbltest/Makefile.in: patch
	xsrc/external/mit/libdrm/dist/tests/vbltest/vbltest.c: patch
	xsrc/external/mit/xf86-video-ati/dist/src/r600_exa.c: revision 1.6
	xsrc/external/mit/xf86-video-ati/dist/src/r600_textured_videofuncs.c: revision 1.2
	xsrc/external/mit/xf86-video-ati/dist/src/r6xx_accel.c: revision 1.7
	xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa.c: revision 1.2
	xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa_funcs.c: revision 1.10
	xsrc/external/mit/xf86-video-ati/dist/src/radeon_textured_video.c: revision 1.5
Update libdrm to 2.4.36.
--
make sure all the KMS code is only ever run when in KMS mode.  fixes
problems with the UMS (aka existing) driver type when KMS is enabled.
--
enable KMS on x86.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.15 2014/07/26 08:05:15 mrg Exp $
d19 1
a19 6
# 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
d35 1
a35 2
	$(SRCS.DRI) $(SRCS.EXA) atombios_output.c atombios_crtc.c \
	$(SRCS.KMS)
@


1.13.2.1
log
@sync with head
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.13 2011/07/23 12:13:40 mrg Exp $
d33 1
a33 1
	radeon_legacy_memory.c radeon_pm.c radeon_xvmc.c \
@


1.12
log
@build the new evergreen files in xf86-video-ati 6.14.0
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.11 2010/11/20 21:24:00 mrg Exp $
d25 2
a26 1
		evergreen_textured_videofuncs.c
@


1.11
log
@add missing radeon_exa_shared.c, came with 6.13.2.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.10 2010/05/23 06:16:13 mrg Exp $
d23 3
a25 1
		radeon_exa_shared.c
@


1.11.2.1
log
@Sync with HEAD
@
text
@d1 1
a1 1
#	$NetBSD$
d23 1
a23 3
		radeon_exa_shared.c \
		evergreen_exa.c evergreen_accel.c evergreen_shader.c \
		evergreen_textured_videofuncs.c
@


1.10
log
@updates for xf86-video-ati 6.13.0.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.9 2010/05/22 23:04:01 mrg Exp $
d22 2
a23 1
		r600_textured_videofuncs.c r600_shader.c
@


1.9
log
@find libdrm files in their new place.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.8 2010/05/22 10:18:03 mrg Exp $
d19 2
d24 1
a24 1
SRCS=	radeon_accel.c radeon_cursor.c radeon_dga.c \
d29 1
a29 1
	radeon_legacy_memory.c \
@


1.8
log
@push HAVE_XEXTPROTO_71 into Makefile.xf86-driver.  (for now?)
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.7 2010/05/22 05:42:54 mrg Exp $
d38 1
a38 1
		-I${DESTDIR}${X11INCDIR}/drm \
@


1.7
log
@define HAVE_XEXTPROTO_71 now.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.6 2009/12/16 14:13:18 skrll Exp $
d34 1
a34 1
		-DHAVE_CONFIG_H -DHAVE_XEXTPROTO_71
@


1.6
log
@Use += otherwise COPTS loses important flags.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.5 2009/10/08 19:06:51 snj Exp $
d34 1
a34 1
		-DHAVE_CONFIG_H
@


1.5
log
@Move libdrm headers up one level (out of the X11 directory) to match
the rest of the world and fix the inconsistency with libdrm.pc.
Fixes PR xsrc/42126.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.4 2009/06/12 04:00:57 mrg Exp $
d42 1
a42 1
COPTS=	-Wno-error
@


1.4
log
@add missing source files.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.3 2009/06/10 09:22:09 mrg Exp $
d38 1
a38 1
		-I${DESTDIR}${X11INCDIR}/X11/drm \
@


1.3
log
@merge xf86-video-ati 6.12.2
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.2 2009/03/30 02:01:11 mrg Exp $
d27 1
@


1.2
log
@- add X11FLAGS.DRI.
- prepare for rhd_audio.c & rhd_hdmi.c (still not used.)
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.1 2008/08/28 07:49:05 mrg Exp $
d19 2
a20 1
SRCS.EXA=	radeon_exa.c
d32 2
a33 1
		-DATOM_BIOS -DATOM_BIOS_PARSER -DDRIVER_PARSER
@


1.1
log
@build xf86-video-radeon driver, as well as xf86-video-ati.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.4 2008/08/03 14:47:26 rtr Exp $
d16 1
@


1.1.14.1
log
@sync to netbsd-5
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.1.8.2 2009/10/10 19:53:23 sborrill Exp $
a15 1
CPPFLAGS+=	${X11FLAGS.DRI}
d18 1
a18 2
SRCS.EXA=	radeon_exa.c r600_exa.c r6xx_accel.c \
		r600_textured_videofuncs.c r600_shader.c
a24 1
	radeon_legacy_memory.c \
d30 1
a30 2
		-DATOM_BIOS -DATOM_BIOS_PARSER -DDRIVER_PARSER \
		-DHAVE_CONFIG_H
d34 1
a34 1
		-I${DESTDIR}${X11INCDIR}/drm \
@


1.1.8.1
log
@Apply patch (requested by mrg in ticket #958):
Sync X.Org reachover build framework and setlists with the new X.Org.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.4 2009/06/12 04:00:57 mrg Exp $
a15 1
CPPFLAGS+=	${X11FLAGS.DRI}
d18 1
a18 2
SRCS.EXA=	radeon_exa.c r600_exa.c r6xx_accel.c \
		r600_textured_videofuncs.c r600_shader.c
a24 1
	radeon_legacy_memory.c \
d30 1
a30 2
		-DATOM_BIOS -DATOM_BIOS_PARSER -DDRIVER_PARSER \
		-DHAVE_CONFIG_H
@


1.1.8.2
log
@Pull up the following revisions(s) (requested by snj in ticket #1079):
	distrib/sets/lists/base/mi:	patch
	etc/mtree/NetBSD.dist:		patch
	distrib/sets/lists/xcomp/mi:	revision 1.100
	external/mit/xorg/lib/dri/dri.mk:	revision 1.8
	external/mit/xorg/lib/dri/libmesa/Makefile:	revision 1.4
	external/mit/xorg/lib/libGL/Makefile:	revision 1.10
	external/mit/xorg/lib/libdrm/Makefile:	revision 1.5
	external/mit/xorg/lib/libdrm/drm/Makefile:	revision 1.3
	external/mit/xorg/lib/libdrm_intel/Makefile:	revision 1.3
	external/mit/xorg/server/drivers/Makefile.xf86-driver:	revision 1.16
	external/mit/xorg/server/drivers/xf86-video-glint/Makefile:	revision 1.7
	external/mit/xorg/server/drivers/xf86-video-intel/Makefile:	revision 1.7
	external/mit/xorg/server/drivers/xf86-video-intel/ch7017/Makefile:	revision 1.2
	external/mit/xorg/server/drivers/xf86-video-intel/ch7xxx/Makefile:	revision 1.2
	external/mit/xorg/server/drivers/xf86-video-intel/ivch/Makefile:	revision 1.2
	external/mit/xorg/server/drivers/xf86-video-intel/sil164/Makefile:	revision 1.2
	external/mit/xorg/server/drivers/xf86-video-intel/tfp410/Makefile:	revision 1.2
	external/mit/xorg/server/drivers/xf86-video-mga/Makefile:	revision 1.7
	external/mit/xorg/server/drivers/xf86-video-radeon/Makefile:	revision 1.5
	external/mit/xorg/server/drivers/xf86-video-savage/Makefile:	revision 1.7
	external/mit/xorg/server/drivers/xf86-video-sis/Makefile:	revision 1.7
	external/mit/xorg/server/drivers/xf86-video-tdfx/Makefile:	revision 1.6
	external/mit/xorg/server/drivers/xf86-video-via/Makefile:	revision 1.5
	external/mit/xorg/server/xorg-server/GL/glx/Makefile.glx:	revision 1.5
	external/mit/xorg/server/xorg-server/glx/Makefile.glx:	revision 1.4
	external/mit/xorg/server/xorg-server/hw/xfree86/dri/Makefile:	revision 1.7
	external/mit/xorg/server/xorg-server/hw/xfree86/dri2/Makefile:	revision 1.4

Move libdrm headers up one level (out of the X11 directory) to match
the rest of the world and fix the inconsistency with libdrm.pc.
Fixes PR xsrc/42126.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.1.8.1 2009/09/17 04:24:36 snj Exp $
d38 1
a38 1
		-I${DESTDIR}${X11INCDIR}/drm \
@


1.1.8.3
log
@Apply patch, requested by mrg in ticket #1524:
external/mit/xorg/server/drivers/xf86-video-radeon/Makefile		patch
xsrc/external/mit/xf86-video-ati/dist/COPYING				patch
xsrc/external/mit/xf86-video-ati/dist/ChangeLog				patch
xsrc/external/mit/xf86-video-ati/dist/Makefile.am			patch
xsrc/external/mit/xf86-video-ati/dist/Makefile.in			patch
xsrc/external/mit/xf86-video-ati/dist/README				patch
xsrc/external/mit/xf86-video-ati/dist/aclocal.m4			patch
xsrc/external/mit/xf86-video-ati/dist/compile				patch
xsrc/external/mit/xf86-video-ati/dist/config.guess			patch
xsrc/external/mit/xf86-video-ati/dist/config.h.in			patch
xsrc/external/mit/xf86-video-ati/dist/config.sub			patch
xsrc/external/mit/xf86-video-ati/dist/configure				patch
xsrc/external/mit/xf86-video-ati/dist/configure.ac			patch
xsrc/external/mit/xf86-video-ati/dist/depcomp				patch
xsrc/external/mit/xf86-video-ati/dist/install-sh			patch
xsrc/external/mit/xf86-video-ati/dist/ltmain.sh				patch
xsrc/external/mit/xf86-video-ati/dist/missing				patch
xsrc/external/mit/xf86-video-ati/dist/man/Makefile.am			patch
xsrc/external/mit/xf86-video-ati/dist/man/Makefile.in			patch
xsrc/external/mit/xf86-video-ati/dist/man/radeon.man			patch
xsrc/external/mit/xf86-video-ati/dist/src/Makefile.am			patch
xsrc/external/mit/xf86-video-ati/dist/src/Makefile.in			patch
xsrc/external/mit/xf86-video-ati/dist/src/ati.c				patch
xsrc/external/mit/xf86-video-ati/dist/src/ati_pciids_gen.h		patch
xsrc/external/mit/xf86-video-ati/dist/src/atipciids.h			patch
xsrc/external/mit/xf86-video-ati/dist/src/atombios_crtc.c		patch
xsrc/external/mit/xf86-video-ati/dist/src/atombios_output.c		patch
xsrc/external/mit/xf86-video-ati/dist/src/drmmode_display.c		patch
xsrc/external/mit/xf86-video-ati/dist/src/drmmode_display.h		patch
xsrc/external/mit/xf86-video-ati/dist/src/legacy_crtc.c			patch
xsrc/external/mit/xf86-video-ati/dist/src/legacy_output.c		patch
xsrc/external/mit/xf86-video-ati/dist/src/local_xf86Rename.h		patch
xsrc/external/mit/xf86-video-ati/dist/src/r600_exa.c			patch
xsrc/external/mit/xf86-video-ati/dist/src/r600_reg_r6xx.h		patch
xsrc/external/mit/xf86-video-ati/dist/src/r600_shader.c			patch
xsrc/external/mit/xf86-video-ati/dist/src/r600_shader.h			patch
xsrc/external/mit/xf86-video-ati/dist/src/r600_state.h			patch
xsrc/external/mit/xf86-video-ati/dist/src/r600_textured_videofuncs.c	patch
xsrc/external/mit/xf86-video-ati/dist/src/r6xx_accel.c			patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon.h			patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_accel.c		patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_accelfuncs.c		patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_atombios.c		patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_atombios.h		patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_bios.c			patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_chipinfo_gen.h		patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_chipset_gen.h		patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_commonfuncs.c		patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_crtc.c			patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_cursor.c		patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_dga.c			patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_dri.c			patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_dri.h			patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_dri2.c			patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_dri2.h			patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_driver.c		patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_drm.h			patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_dummy_bufmgr.h		patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa.c			patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa_funcs.c		patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa_render.c		patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa_shared.c		patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa_shared.h		patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_kms.c			patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_legacy_memory.c	patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_macros.h		patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_modes.c		patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_output.c		patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_pci_chipset_gen.h	patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_pci_device_match_gen.h	patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_pm.c			patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_probe.c		patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_probe.h		patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_reg.h			patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_render.c		patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_textured_video.c	patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_textured_videofuncs.c	patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_tv.c			patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_tv.h			patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_vbo.c			patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_vbo.h			patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_version.h		patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_video.c		patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_video.h		patch
xsrc/external/mit/xf86-video-ati/dist/src/radeon_vip.c			patch
xsrc/external/mit/xf86-video-ati/dist/src/simple_list.h			patch
xsrc/external/mit/xf86-video-ati/dist/src/theatre200.c			patch
xsrc/external/mit/xf86-video-ati/dist/src/theatre_detect.c		patch
xsrc/external/mit/xf86-video-ati/dist/src/AtomBios/CD_Operations.c	patch
xsrc/external/mit/xf86-video-ati/dist/src/AtomBios/includes/Decoder.h	patch
xsrc/external/mit/xf86-video-ati/dist/src/AtomBios/includes/ObjectID.h	patch
xsrc/external/mit/xf86-video-ati/dist/src/AtomBios/includes/atombios.h	patch
xsrc/external/mit/xf86-video-ati/dist/src/modes/xf86Crtc.c		patch
xsrc/external/mit/xf86-video-ati/dist/src/modes/xf86Crtc.h		patch
xsrc/external/mit/xf86-video-ati/dist/src/modes/xf86Cursors.c		patch
xsrc/external/mit/xf86-video-ati/dist/src/modes/xf86DiDGA.c		patch
xsrc/external/mit/xf86-video-ati/dist/src/modes/xf86EdidModes.c		patch
xsrc/external/mit/xf86-video-ati/dist/src/modes/xf86Modes.c		patch
xsrc/external/mit/xf86-video-ati/dist/src/modes/xf86Modes.h		patch
xsrc/external/mit/xf86-video-ati/dist/src/modes/xf86RandR12.c		patch
xsrc/external/mit/xf86-video-ati/dist/src/modes/xf86RandR12.h		patch
xsrc/external/mit/xf86-video-ati/dist/src/modes/xf86Rename.h		patch
xsrc/external/mit/xf86-video-ati/dist/src/modes/xf86Rotate.c		patch
xsrc/external/mit/xf86-video-ati/dist/src/modes/xf86cvt.c		patch
xsrc/external/mit/xf86-video-ati/dist/src/parser/xf86Optrec.h		patch
xsrc/external/mit/xf86-video-ati/dist/src/parser/xf86Parser.h		patch
xsrc/external/mit/xf86-video-ati/dist/src/pcidb/ati_pciids.csv		patch
xsrc/external/mit/xf86-video-ati/dist/src/pcidb/parse_pci_ids.pl	patch
xsrc/external/mit/xf86-video-ati/include/config.h			patch
xsrc/external/mit/xf86-video-ati/dist/src/local_xf86Rename.h		remove
xsrc/external/mit/xf86-video-ati/dist/src/radeon_dga.c			remove
xsrc/external/mit/xf86-video-ati/dist/src/modes/xf86Crtc.c		remove
xsrc/external/mit/xf86-video-ati/dist/src/modes/xf86Crtc.h		remove
xsrc/external/mit/xf86-video-ati/dist/src/modes/xf86Cursors.c		remove
xsrc/external/mit/xf86-video-ati/dist/src/modes/xf86DiDGA.c		remove
xsrc/external/mit/xf86-video-ati/dist/src/modes/xf86EdidModes.c		remove
xsrc/external/mit/xf86-video-ati/dist/src/modes/xf86Modes.c		remove
xsrc/external/mit/xf86-video-ati/dist/src/modes/xf86Modes.h		remove
xsrc/external/mit/xf86-video-ati/dist/src/modes/xf86RandR12.c		remove
xsrc/external/mit/xf86-video-ati/dist/src/modes/xf86RandR12.h		remove
xsrc/external/mit/xf86-video-ati/dist/src/modes/xf86Rename.h		remove
xsrc/external/mit/xf86-video-ati/dist/src/modes/xf86Rotate.c		remove
xsrc/external/mit/xf86-video-ati/dist/src/modes/xf86cvt.c		remove
xsrc/external/mit/xf86-video-ati/dist/src/parser/xf86Optrec.h		remove
xsrc/external/mit/xf86-video-ati/dist/src/parser/xf86Parser.h		remove

add more support for hd3000/4000 and some for hd5000
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.1.8.2 2009/10/10 19:53:23 sborrill Exp $
d19 1
a19 2
SRCS.EXA=	radeon_exa.c r600_exa.c radeon_exa_shared.c \
		r6xx_accel.c \
d22 1
a22 1
SRCS=	radeon_accel.c radeon_cursor.c \
d27 1
a27 1
	radeon_legacy_memory.c radeon_pm.c \
@


1.1.10.1
log
@Sync with HEAD.

Second commit. See http://mail-index.netbsd.org/source-changes/2009/05/13/msg221222.html
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.2 2009/03/30 02:01:11 mrg Exp $
a15 1
CPPFLAGS+=	${X11FLAGS.DRI}
@


1.1.6.1
log
@file Makefile was added on branch haad-dm on 2008-10-19 22:41:16 +0000
@
text
@d1 40
@


1.1.6.2
log
@Sync with HEAD.
@
text
@a0 40
#	$NetBSD: Makefile,v 1.1 2008/08/28 07:49:05 mrg Exp $

.include <bsd.own.mk>

DRIVER=		xf86-video-ati
DRIVER_NAME=	radeon_drv

.PATH:  ${X11SRCDIR.${DRIVER}}/src/AtomBios
SRCS.ATOMBIOS= \
        CD_Operations.c \
        Decoder.c \
        hwserv_drv.c

.if ${X11DRI} != "no"
SRCS.DRI=	radeon_dri.c
.endif

SRCS.EXA=	radeon_exa.c

SRCS=	radeon_accel.c radeon_cursor.c radeon_dga.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 \
	$(SRCS.ATOMBIOS) radeon_atombios.c radeon_atomwrapper.c \
	$(SRCS.DRI) $(SRCS.EXA) atombios_output.c atombios_crtc.c
MAN=	radeon.4

CPPFLAGS+=	-DDISABLE_EASF -DENABLE_ALL_SERVICE_FUNCTIONS \
		-DATOM_BIOS -DATOM_BIOS_PARSER -DDRIVER_PARSER
CPPFLAGS+=	-I${X11SRCDIR.${DRIVER}}/src/AtomBios/includes \
		-I${DESTDIR}${X11INCDIR}/X11 \
		-I${DESTDIR}${X11INCDIR}/X11/dri \
		-I${DESTDIR}${X11INCDIR}/X11/drm \
		-I${X11SRCDIR.${DRIVER}}/../include

# XXX
COPTS=	-Wno-error

.include "../Makefile.xf86-driver"
@


1.1.2.1
log
@file Makefile was added on branch wrstuden-revivesa on 2008-09-18 05:18:42 +0000
@
text
@d1 40
@


1.1.2.2
log
@Sync with wrstuden-revivesa-base-2.
@
text
@a0 40
#	$NetBSD: Makefile,v 1.1 2008/08/28 07:49:05 mrg Exp $

.include <bsd.own.mk>

DRIVER=		xf86-video-ati
DRIVER_NAME=	radeon_drv

.PATH:  ${X11SRCDIR.${DRIVER}}/src/AtomBios
SRCS.ATOMBIOS= \
        CD_Operations.c \
        Decoder.c \
        hwserv_drv.c

.if ${X11DRI} != "no"
SRCS.DRI=	radeon_dri.c
.endif

SRCS.EXA=	radeon_exa.c

SRCS=	radeon_accel.c radeon_cursor.c radeon_dga.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 \
	$(SRCS.ATOMBIOS) radeon_atombios.c radeon_atomwrapper.c \
	$(SRCS.DRI) $(SRCS.EXA) atombios_output.c atombios_crtc.c
MAN=	radeon.4

CPPFLAGS+=	-DDISABLE_EASF -DENABLE_ALL_SERVICE_FUNCTIONS \
		-DATOM_BIOS -DATOM_BIOS_PARSER -DDRIVER_PARSER
CPPFLAGS+=	-I${X11SRCDIR.${DRIVER}}/src/AtomBios/includes \
		-I${DESTDIR}${X11INCDIR}/X11 \
		-I${DESTDIR}${X11INCDIR}/X11/dri \
		-I${DESTDIR}${X11INCDIR}/X11/drm \
		-I${X11SRCDIR.${DRIVER}}/../include

# XXX
COPTS=	-Wno-error

.include "../Makefile.xf86-driver"
@