head	1.9;
access;
symbols
	RELENG_8_4:1.9.0.2
	RELENG_9_1_0_RELEASE:1.7.2.2.2.2
	RELENG_9_1:1.7.2.2.0.2
	RELENG_9_1_BP:1.7.2.2
	RELENG_8_3_0_RELEASE:1.6.10.1.8.1
	RELENG_8_3:1.6.10.1.0.8
	RELENG_8_3_BP:1.6.10.1
	RELENG_9_0_0_RELEASE:1.7.2.1.2.1
	RELENG_9_0:1.7.2.1.0.2
	RELENG_9_0_BP:1.7.2.1
	RELENG_9:1.7.0.2
	RELENG_9_BP:1.7
	RELENG_7_4_0_RELEASE:1.6.14.1
	RELENG_8_2_0_RELEASE:1.6.10.1.6.1
	RELENG_7_4:1.6.0.14
	RELENG_7_4_BP:1.6
	RELENG_8_2:1.6.10.1.0.6
	RELENG_8_2_BP:1.6.10.1
	RELENG_8_1_0_RELEASE:1.6.10.1.4.1
	RELENG_8_1:1.6.10.1.0.4
	RELENG_8_1_BP:1.6.10.1
	RELENG_7_3_0_RELEASE:1.6.12.1
	RELENG_7_3:1.6.0.12
	RELENG_7_3_BP:1.6
	RELENG_8_0_0_RELEASE:1.6.10.1.2.1
	RELENG_8_0:1.6.10.1.0.2
	RELENG_8_0_BP:1.6.10.1
	RELENG_8:1.6.0.10
	RELENG_8_BP:1.6
	RELENG_7_2_0_RELEASE:1.6.8.1
	RELENG_7_2:1.6.0.8
	RELENG_7_2_BP:1.6
	RELENG_7_1_0_RELEASE:1.6.6.1
	RELENG_6_4_0_RELEASE:1.4.2.1.8.1
	RELENG_7_1:1.6.0.6
	RELENG_7_1_BP:1.6
	RELENG_6_4:1.4.2.1.0.8
	RELENG_6_4_BP:1.4.2.1
	RELENG_7_0_0_RELEASE:1.6
	RELENG_6_3_0_RELEASE:1.4.2.1
	RELENG_7_0:1.6.0.4
	RELENG_7_0_BP:1.6
	RELENG_6_3:1.4.2.1.0.6
	RELENG_6_3_BP:1.4.2.1
	RELENG_7:1.6.0.2
	RELENG_7_BP:1.6
	RELENG_6_2_0_RELEASE:1.4.2.1
	RELENG_6_2:1.4.2.1.0.4
	RELENG_6_2_BP:1.4.2.1
	RELENG_5_5_0_RELEASE:1.3
	RELENG_5_5:1.3.0.10
	RELENG_5_5_BP:1.3
	RELENG_6_1_0_RELEASE:1.4.2.1
	RELENG_6_1:1.4.2.1.0.2
	RELENG_6_1_BP:1.4.2.1
	RELENG_6_0_0_RELEASE:1.4
	RELENG_6_0:1.4.0.4
	RELENG_6_0_BP:1.4
	RELENG_6:1.4.0.2
	RELENG_6_BP:1.4
	RELENG_5_4_0_RELEASE:1.3
	RELENG_5_4:1.3.0.8
	RELENG_5_4_BP:1.3
	RELENG_4_11_0_RELEASE:1.2.2.1
	RELENG_4_11:1.2.2.1.0.6
	RELENG_4_11_BP:1.2.2.1
	RELENG_5_3_0_RELEASE:1.3
	RELENG_5_3:1.3.0.6
	RELENG_5_3_BP:1.3
	RELENG_5:1.3.0.4
	RELENG_5_BP:1.3
	RELENG_4_10_0_RELEASE:1.2.2.1
	RELENG_4_10:1.2.2.1.0.4
	RELENG_4_10_BP:1.2.2.1
	RELENG_5_2_1_RELEASE:1.3
	RELENG_5_2_0_RELEASE:1.3
	RELENG_5_2:1.3.0.2
	RELENG_5_2_BP:1.3
	RELENG_4_9_0_RELEASE:1.2.2.1
	RELENG_4_9:1.2.2.1.0.2
	RELENG_4_9_BP:1.2.2.1
	RELENG_5_1_0_RELEASE:1.2
	RELENG_5_1:1.2.0.4
	RELENG_5_1_BP:1.2
	RELENG_4:1.2.0.2
	RELENG_5_0_0_RELEASE:1.1
	RELENG_5_0:1.1.0.2
	RELENG_5_0_BP:1.1;
locks; strict;
comment	@# @;


1.9
date	2012.11.17.01.52.54;	author svnexp;	state Exp;
branches
	1.9.2.1;
next	1.8;

1.8
date	2012.02.04.00.54.43;	author rmh;	state Exp;
branches;
next	1.7;

1.7
date	2010.01.31.14.30.39;	author rnoland;	state Exp;
branches
	1.7.2.1;
next	1.6;

1.6
date	2005.12.03.01.23.50;	author anholt;	state Exp;
branches
	1.6.2.1
	1.6.6.1
	1.6.8.1
	1.6.10.1
	1.6.12.1
	1.6.14.1;
next	1.5;

1.5
date	2005.11.28.23.13.56;	author anholt;	state Exp;
branches;
next	1.4;

1.4
date	2005.04.16.03.44.46;	author anholt;	state Exp;
branches
	1.4.2.1;
next	1.3;

1.3
date	2003.09.09.00.29.02;	author anholt;	state Exp;
branches;
next	1.2;

1.2
date	2003.03.09.02.08.29;	author anholt;	state Exp;
branches
	1.2.2.1;
next	1.1;

1.1
date	2002.04.27.20.54.49;	author anholt;	state Exp;
branches;
next	;

1.9.2.1
date	2012.11.17.01.52.54;	author svnexp;	state dead;
branches;
next	1.9.2.2;

1.9.2.2
date	2013.03.28.13.05.19;	author svnexp;	state Exp;
branches;
next	;

1.7.2.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.7.2.1.2.1;
next	1.7.2.2;

1.7.2.2
date	2012.02.19.07.44.38;	author rmh;	state Exp;
branches
	1.7.2.2.2.1;
next	1.7.2.3;

1.7.2.3
date	2012.11.17.11.37.16;	author svnexp;	state Exp;
branches;
next	;

1.7.2.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.7.2.1.2.2;

1.7.2.1.2.2
date	2012.11.17.08.37.13;	author svnexp;	state Exp;
branches;
next	;

1.7.2.2.2.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.7.2.2.2.2;

1.7.2.2.2.2
date	2012.11.17.08.48.04;	author svnexp;	state Exp;
branches;
next	;

1.6.2.1
date	2012.11.17.08.06.46;	author svnexp;	state Exp;
branches;
next	;

1.6.6.1
date	2008.11.25.02.59.29;	author kensmith;	state Exp;
branches;
next	;

1.6.8.1
date	2009.04.15.03.14.26;	author kensmith;	state Exp;
branches;
next	;

1.6.10.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.6.10.1.2.1
	1.6.10.1.4.1
	1.6.10.1.6.1
	1.6.10.1.8.1;
next	1.6.10.2;

1.6.10.2
date	2012.11.17.10.36.56;	author svnexp;	state Exp;
branches;
next	;

1.6.10.1.2.1
date	2009.10.25.01.10.29;	author kensmith;	state Exp;
branches;
next	;

1.6.10.1.4.1
date	2010.06.14.02.09.06;	author kensmith;	state Exp;
branches;
next	;

1.6.10.1.6.1
date	2010.12.21.17.09.25;	author kensmith;	state Exp;
branches;
next	;

1.6.10.1.8.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.6.10.1.8.2;

1.6.10.1.8.2
date	2012.11.17.08.25.32;	author svnexp;	state Exp;
branches;
next	;

1.6.12.1
date	2010.02.10.00.26.20;	author kensmith;	state Exp;
branches;
next	;

1.6.14.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.6.14.2;

1.6.14.2
date	2012.11.17.08.17.26;	author svnexp;	state Exp;
branches;
next	;

1.4.2.1
date	2005.12.14.00.52.58;	author anholt;	state Exp;
branches
	1.4.2.1.8.1;
next	1.4.2.2;

1.4.2.2
date	2012.11.17.07.44.17;	author svnexp;	state Exp;
branches;
next	;

1.4.2.1.8.1
date	2008.10.02.02.57.24;	author kensmith;	state Exp;
branches;
next	;

1.2.2.1
date	2003.04.26.07.31.06;	author anholt;	state Exp;
branches;
next	1.2.2.2;

1.2.2.2
date	2012.11.17.07.26.30;	author svnexp;	state Exp;
branches;
next	;


desc
@@


1.9
log
@Switching exporter and resync
@
text
@# $FreeBSD: head/sys/modules/drm/Makefile 230972 2012-02-04 00:54:43Z rmh $

.include <bsd.own.mk>

# Modules that include binary-only blobs of microcode should be selectable by
# MK_SOURCELESS_UCODE option (see below).

SUBDIR = \
	drm \
	i915 \
	mach64 \
	${_mga} \
	${_r128} \
	${_radeon} \
	savage \
	sis \
	tdfx \
	via

.if ${MK_SOURCELESS_UCODE} != "no"
_mga=		mga
_r128=		r128
_radeon=	radeon
.endif

.include <bsd.subdir.mk>
@


1.9.2.1
log
@file Makefile was added on branch RELENG_8_4 on 2013-03-28 13:05:19 +0000
@
text
@d1 26
@


1.9.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 14
# $FreeBSD: releng/8.4/sys/modules/drm/Makefile 153033 2005-12-03 01:23:50Z anholt $

SUBDIR = \
	drm \
	i915 \
	mach64 \
	mga \
	r128 \
	radeon \
	savage \
	sis \
	tdfx

.include <bsd.subdir.mk>
@


1.8
log
@SVN rev 230972 on 2012-02-04 00:54:43Z by rmh

Add MK_SOURCELESS build option. Setting MK_SOURCELESS to "no" will disable
kernel modules that include binary-only code.

More fine-grained control is provided via MK_SOURCELESS_HOST (for native code
that runs on host CPU) and MK_SOURCELESS_UCODE (for microcode).

Reviewed by:	julian, delphij, freebsd-arch
Approved by:	kib (mentor)
MFC after:	2 weeks
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.7
log
@SVN rev 203288 on 2010-01-31 14:30:39Z by rnoland

Welcome drm support for VIA unichrome chips.

MFC after:	2 weeks
@
text
@d3 5
d12 3
a14 3
	mga \
	r128 \
	radeon \
d20 6
@


1.7.2.1
log
@SVN rev 225736 on 2011-09-23 00:51:37Z by kensmith

Copy head to stable/9 as part of 9.0-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.7.2.2
log
@SVN rev 231905 on 2012-02-19 07:44:38Z by rmh

MFC r230972,r230980,r231559,r231565: Add MK_SOURCELESS build option, and
associated fixes.

Approved by:	kib (mentor)
@
text
@a2 5
.include <bsd.own.mk>

# Modules that include binary-only blobs of microcode should be selectable by
# MK_SOURCELESS_UCODE option (see below).

d7 3
a9 3
	${_mga} \
	${_r128} \
	${_radeon} \
a14 6
.if ${MK_SOURCELESS_UCODE} != "no"
_mga=		mga
_r128=		r128
_radeon=	radeon
.endif

@


1.7.2.3
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242902
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242902 | dteske | 2012-11-11 23:29:45 +0000 (Sun, 11 Nov 2012) | 10 lines
## SVN ##
## SVN ## Fix a regression introduced by SVN r211417 that saw the breakage of a feature
## SVN ## documented in usr.sbin/sysinstall/help/shortcuts.hlp (reproduced below):
## SVN ##
## SVN ## If /usr/sbin/sysinstall is linked to another filename, say
## SVN ## `/usr/local/bin/configPackages', then the basename will be used
## SVN ## as an implicit command name.
## SVN ##
## SVN ## Reviewed by:	adrian (co-mentor)
## SVN ## Approved by:	adrian (co-mentor)
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
# $FreeBSD: stable/9/sys/modules/drm/Makefile 231905 2012-02-19 07:44:38Z rmh $
@


1.7.2.2.2.1
log
@SVN rev 239080 on 2012-08-05 23:54:33Z by kensmith

Copy stable/9 to releng/9.1 as part of the 9.1-RELEASE release process.

Approved by:	re (implicit)
@
text
@@


1.7.2.2.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.1/sys/modules/drm/Makefile 231905 2012-02-19 07:44:38Z rmh $
@


1.7.2.1.2.1
log
@SVN rev 227445 on 2011-11-11 04:20:22Z by kensmith

Copy stable/9 to releng/9.0 as part of the FreeBSD 9.0-RELEASE release
cycle.

Approved by:	re (implicit)
@
text
@@


1.7.2.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.0/sys/modules/drm/Makefile 203288 2010-01-31 14:30:39Z rnoland $
@


1.6
log
@Merge DRM CVS as of 2005-12-02, adding i915 DRM support thanks to Alexey Popov,
and a new r300 PCI ID.
@
text
@d12 2
a13 1
	tdfx
@


1.6.2.1
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/7/sys/modules/drm/Makefile 153033 2005-12-03 01:23:50Z anholt $
@


1.6.14.1
log
@SVN rev 216618 on 2010-12-21 17:10:29Z by kensmith

Copy stable/7 to releng/7.4 in preparation for FreeBSD-7.4 release.

Approved by:	re (implicit)
@
text
@@


1.6.14.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/7.4/sys/modules/drm/Makefile 153033 2005-12-03 01:23:50Z anholt $
@


1.6.12.1
log
@SVN rev 203736 on 2010-02-10 00:26:20Z by kensmith

Copy stable/7 to releng/7.3 as part of the 7.3-RELEASE process.

Approved by:	re (implicit)
@
text
@@


1.6.10.1
log
@SVN rev 196045 on 2009-08-03 08:13:06Z by kensmith

Copy head to stable/8 as part of 8.0 Release cycle.

Approved by:	re (Implicit)
@
text
@@


1.6.10.2
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242909
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242909 | dim | 2012-11-12 07:47:19 +0000 (Mon, 12 Nov 2012) | 20 lines
## SVN ##
## SVN ## MFC r242625:
## SVN ##
## SVN ## Remove duplicate const specifiers in many drivers (I hope I got all of
## SVN ## them, please let me know if not).  Most of these are of the form:
## SVN ##
## SVN ## static const struct bzzt_type {
## SVN ##       [...list of members...]
## SVN ## } const bzzt_devs[] = {
## SVN ##       [...list of initializers...]
## SVN ## };
## SVN ##
## SVN ## The second const is unnecessary, as arrays cannot be modified anyway,
## SVN ## and if the elements are const, the whole thing is const automatically
## SVN ## (e.g. it is placed in .rodata).
## SVN ##
## SVN ## I have verified this does not change the binary output of a full kernel
## SVN ## build (except for build timestamps embedded in the object files).
## SVN ##
## SVN ## Reviewed by:	yongari, marius
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
# $FreeBSD: stable/8/sys/modules/drm/Makefile 153033 2005-12-03 01:23:50Z anholt $
@


1.6.10.1.8.1
log
@SVN rev 232438 on 2012-03-03 06:15:13Z by kensmith

Copy stable/8 to releng/8.3 as part of 8.3-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.6.10.1.8.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/8.3/sys/modules/drm/Makefile 153033 2005-12-03 01:23:50Z anholt $
@


1.6.10.1.6.1
log
@SVN rev 216617 on 2010-12-21 17:09:25Z by kensmith

Copy stable/8 to releng/8.2 in preparation for FreeBSD-8.2 release.

Approved by:	re (implicit)
@
text
@@


1.6.10.1.4.1
log
@SVN rev 209145 on 2010-06-14 02:09:06Z by kensmith

Copy stable/8 to releng/8.1 in preparation for 8.1-RC1.

Approved by:	re (implicit)
@
text
@@


1.6.10.1.2.1
log
@SVN rev 198460 on 2009-10-25 01:10:29Z by kensmith

Copy stable/8 to releng/8.0 as part of 8.0-RELEASE release procedure.

Approved by:	re (implicit)
@
text
@@


1.6.8.1
log
@SVN rev 191087 on 2009-04-15 03:14:26Z by kensmith

Create releng/7.2 from stable/7 in preparation for 7.2-RELEASE.

Approved by:	re (implicit)
@
text
@@


1.6.6.1
log
@SVN rev 185281 on 2008-11-25 02:59:29Z by kensmith

Create releng/7.1 in preparation for moving into RC phase of 7.1 release
cycle.

Approved by:	re (implicit)
@
text
@@


1.5
log
@Update DRM to CVS snapshot as of 2005-11-28.  Notable changes:
- S3 Savage driver ported.
- Added support for ATI_fragment_shader registers for r200.
- Improved r300 support, needed for latest r300 DRI driver.
- (possibly) r300 PCIE support, needs X.Org server from CVS.
- Added support for PCI Matrox cards.
- Software fallbacks fixed for Rage 128, which used to render badly or hang.
- Some issues reported by WITNESS are fixed.
- i915 module Makefile added, as the driver may now be working, but is untested.
- Added scripts for copying and preprocessing DRM CVS for inclusion in the
  kernel.  Thanks to Daniel Stone for getting me started on that.
@
text
@d5 1
@


1.4
log
@Update to DRM CVS as of 2005-04-12, bringing many changes:
- Split core DRM routines back into their own module, rather than using the
  nasty templated system like before.
- Development-class R300 support in radeon driver (requires userland pieces, of
  course).
- Mach64 driver (haven't tested in a while -- my mach64s no longer fit in the
  testbox).  Covers Rage Pros, Rage Mobility P/M, Rage XL, and some others.
- i915 driver files, which just need to get drm_drv.c fixed to allow attachment
  to the drmsub device.  Covers i830 through i915 integrated graphics.
- savage driver files, which should require minimal changes to work.  Covers the
  Savage3D, Savage IX/MX, Savage 4, ProSavage.
- Support for color and texture tiling and HyperZ features of Radeon.

Thanks to:	scottl (much p4 handholding)
		Jung-uk Kim (helpful prodding)
PR:		[1] kern/76879, [2] kern/72548
Submitted by:	[1] Alex, lesha at intercaf dot ru
		[2] Shaun Jurrens, shaun at shamz dot net
@
text
@d9 1
@


1.4.2.1
log
@MFC DRM.  Notable changes:
- i915 (i830-i915) driver ported.
- S3 Savage driver ported.
- Added support for ATI_fragment_shader registers for r200.
- Improved r300 support, needed for latest r300 DRI driver.
- (possibly) r300 PCIE support, needs X.Org server from CVS.
- Added support for PCI Matrox cards.
- Software fallbacks fixed for Rage 128, which used to render badly or hang.
- Some issues reported by WITNESS are fixed.
@
text
@a4 1
	i915 \
a8 1
	savage \
@


1.4.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/6/sys/modules/drm/Makefile 153401 2005-12-14 00:52:59Z anholt $
@


1.4.2.1.8.1
log
@SVN rev 183531 on 2008-10-02 02:57:24Z by kensmith

Create releng/6.4 from stable/6 in preparation for 6.4-RC1.

Approved by:	re (implicit)
@
text
@@


1.3
log
@Hook the SiS DRM up to the build

Sponsored by:	LinuxFund
@
text
@d3 8
a10 1
SUBDIR = mga r128 radeon sis tdfx
@


1.2
log
@Update the DRM to latest from DRI CVS.  This is approximately the version
included in XFree86 4.3, but includes some fixes.  Notable changes include
Radeon 8500-9100 support, PCI Radeon/Rage 128 support, transform & lighting
support for Radeons, and vblank syncing support for r128, radeon, and mga.
The gamma driver was removed due to lack of any users.
@
text
@d3 1
a3 1
SUBDIR = mga r128 radeon tdfx
@


1.2.2.1
log
@Add DRM modules, but leave them disconnected from the build until all
previously reported problems are confirmed to be resolved.
@
text
@@


1.2.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/4/sys/modules/drm/Makefile 114058 2003-04-26 07:31:06Z anholt $
@


1.1
log
@Add makefiles for DRM modules

Approved by:	des
@
text
@d3 1
a3 1
SUBDIR = gamma mga r128 radeon tdfx
@

