head	1.83;
access;
symbols
	netbsd-11-0-RC4:1.83
	netbsd-11-0-RC3:1.83
	netbsd-11-0-RC2:1.83
	netbsd-11-0-RC1:1.83
	perseant-exfatfs-base-20250801:1.83
	netbsd-11:1.83.0.12
	netbsd-11-base:1.83
	netbsd-10-1-RELEASE:1.83
	perseant-exfatfs-base-20240630:1.83
	perseant-exfatfs:1.83.0.10
	perseant-exfatfs-base:1.83
	netbsd-8-3-RELEASE:1.13
	netbsd-9-4-RELEASE:1.30.4.1
	netbsd-10-0-RELEASE:1.83
	netbsd-10-0-RC6:1.83
	netbsd-10-0-RC5:1.83
	netbsd-10-0-RC4:1.83
	netbsd-10-0-RC3:1.83
	netbsd-10-0-RC2:1.83
	thorpej-ifq:1.83.0.8
	thorpej-ifq-base:1.83
	thorpej-altq-separation:1.83.0.6
	thorpej-altq-separation-base:1.83
	netbsd-10-0-RC1:1.83
	netbsd-10:1.83.0.4
	netbsd-10-base:1.83
	bouyer-sunxi-drm:1.83.0.2
	bouyer-sunxi-drm-base:1.83
	netbsd-9-3-RELEASE:1.30.4.1
	thorpej-i2c-spi-conf2:1.35.0.6
	thorpej-i2c-spi-conf2-base:1.35
	thorpej-futex2:1.35.0.4
	thorpej-futex2-base:1.35
	thorpej-cfargs2:1.35.0.2
	thorpej-cfargs2-base:1.35
	cjep_sun2x-base1:1.35
	cjep_sun2x:1.34.0.14
	cjep_sun2x-base:1.34
	cjep_staticlib_x-base1:1.34
	netbsd-9-2-RELEASE:1.30.4.1
	cjep_staticlib_x:1.34.0.12
	cjep_staticlib_x-base:1.34
	thorpej-i2c-spi-conf:1.34.0.10
	thorpej-i2c-spi-conf-base:1.35
	thorpej-cfargs:1.34.0.8
	thorpej-cfargs-base:1.34
	thorpej-futex:1.34.0.6
	thorpej-futex-base:1.34
	netbsd-9-1-RELEASE:1.30.4.1
	bouyer-xenpvh-base2:1.34
	phil-wifi-20200421:1.34
	bouyer-xenpvh-base1:1.34
	phil-wifi-20200411:1.34
	bouyer-xenpvh:1.34.0.4
	bouyer-xenpvh-base:1.34
	is-mlppp:1.34.0.2
	is-mlppp-base:1.34
	phil-wifi-20200406:1.34
	netbsd-8-2-RELEASE:1.13
	ad-namecache-base3:1.34
	netbsd-9-0-RELEASE:1.30.4.1
	netbsd-9-0-RC2:1.30.4.1
	ad-namecache-base2:1.33
	ad-namecache-base1:1.33
	ad-namecache:1.33.0.2
	ad-namecache-base:1.33
	netbsd-9-0-RC1:1.30
	phil-wifi-20191119:1.32
	netbsd-9:1.30.0.4
	netbsd-9-base:1.30
	phil-wifi-20190609:1.30
	netbsd-8-1-RELEASE:1.13
	netbsd-8-1-RC1:1.13
	isaki-audio2:1.30.0.2
	isaki-audio2-base:1.30
	pgoyette-compat-merge-20190127:1.14.2.1
	pgoyette-compat-20190127:1.30
	pgoyette-compat-20190118:1.30
	pgoyette-compat-1226:1.30
	pgoyette-compat-1126:1.30
	pgoyette-compat-1020:1.30
	pgoyette-compat-0930:1.30
	pgoyette-compat-0906:1.30
	netbsd-7-2-RELEASE:1.7.2.3
	pgoyette-compat-0728:1.14
	netbsd-8-0-RELEASE:1.13
	phil-wifi:1.14.0.4
	phil-wifi-base:1.14
	pgoyette-compat-0625:1.14
	netbsd-8-0-RC2:1.13
	pgoyette-compat-0521:1.14
	pgoyette-compat-0502:1.14
	pgoyette-compat-0422:1.14
	netbsd-8-0-RC1:1.13
	pgoyette-compat-0415:1.14
	pgoyette-compat-0407:1.14
	pgoyette-compat-0330:1.14
	pgoyette-compat-0322:1.14
	pgoyette-compat-0315:1.14
	netbsd-7-1-2-RELEASE:1.7.2.2
	pgoyette-compat:1.14.0.2
	pgoyette-compat-base:1.14
	netbsd-7-1-1-RELEASE:1.7.2.2
	tls-maxphys-base-20171202:1.13
	matt-nb8-mediatek:1.13.0.14
	matt-nb8-mediatek-base:1.13
	nick-nhusb-base-20170825:1.13
	perseant-stdc-iso10646:1.13.0.12
	perseant-stdc-iso10646-base:1.13
	netbsd-8:1.13.0.10
	netbsd-8-base:1.13
	prg-localcount2-base3:1.13
	prg-localcount2-base2:1.13
	prg-localcount2-base1:1.13
	prg-localcount2:1.13.0.8
	prg-localcount2-base:1.13
	pgoyette-localcount-20170426:1.13
	bouyer-socketcan-base1:1.13
	jdolecek-ncq:1.13.0.6
	jdolecek-ncq-base:1.13
	pgoyette-localcount-20170320:1.13
	netbsd-7-1:1.7.2.2.0.6
	netbsd-7-1-RELEASE:1.7.2.2
	netbsd-7-1-RC2:1.7.2.2
	nick-nhusb-base-20170204:1.13
	netbsd-7-nhusb-base-20170116:1.7.2.2
	bouyer-socketcan:1.13.0.4
	bouyer-socketcan-base:1.13
	pgoyette-localcount-20170107:1.13
	netbsd-7-1-RC1:1.7.2.2
	nick-nhusb-base-20161204:1.13
	pgoyette-localcount-20161104:1.13
	netbsd-7-0-2-RELEASE:1.7.2.2
	nick-nhusb-base-20161004:1.13
	localcount-20160914:1.13
	netbsd-7-nhusb:1.7.2.2.0.4
	netbsd-7-nhusb-base:1.7.2.2
	pgoyette-localcount-20160806:1.13
	pgoyette-localcount-20160726:1.13
	pgoyette-localcount:1.13.0.2
	pgoyette-localcount-base:1.13
	nick-nhusb-base-20160907:1.13
	nick-nhusb-base-20160529:1.13
	netbsd-7-0-1-RELEASE:1.7.2.2
	nick-nhusb-base-20160422:1.13
	nick-nhusb-base-20160319:1.13
	nick-nhusb-base-20151226:1.12
	netbsd-7-0:1.7.2.2.0.2
	netbsd-7-0-RELEASE:1.7.2.2
	nick-nhusb-base-20150921:1.12
	netbsd-7-0-RC3:1.7.2.2
	netbsd-7-0-RC2:1.7.2.2
	netbsd-7-0-RC1:1.7.2.2
	nick-nhusb-base-20150606:1.11
	nick-nhusb-base-20150406:1.11
	nick-nhusb:1.9.0.2
	nick-nhusb-base:1.9
	tls-maxphys-base:1.7
	tls-maxphys:1.7.0.4
	netbsd-7:1.7.0.2
	netbsd-7-base:1.7
	yamt-pagecache:1.5.0.6
	rmind-smpnet-base:1.5
	rmind-smpnet:1.5.0.4
	rmind-smpnet-nbase:1.5
	yamt-pagecache-base9:1.5
	tls-earlyentropy:1.5.0.2
	tls-earlyentropy-base:1.7
	riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.5
	riastradh-drm2-base3:1.1
	riastradh-drm2:1.1.0.2;
locks; strict;
comment	@# @;


1.83
date	2022.07.28.21.52.36;	author riastradh;	state Exp;
branches;
next	1.82;
commitid	16sxox4MmweD4IND;

1.82
date	2022.07.28.10.43.35;	author riastradh;	state Exp;
branches;
next	1.81;
commitid	Bq0QjPtuf2X6nEND;

1.81
date	2022.07.24.19.23.59;	author riastradh;	state Exp;
branches;
next	1.80;
commitid	R1t2t4bSvgeCnbND;

1.80
date	2022.07.23.12.52.10;	author riastradh;	state Exp;
branches;
next	1.79;
commitid	Mni1Y9WZsQYaf1ND;

1.79
date	2022.07.20.10.01.01;	author riastradh;	state Exp;
branches;
next	1.78;
commitid	tJ5WfCCzCySroCMD;

1.78
date	2022.07.20.01.38.24;	author riastradh;	state Exp;
branches;
next	1.77;
commitid	wA7LK6gS6Cs1CzMD;

1.77
date	2022.07.19.23.19.35;	author riastradh;	state Exp;
branches;
next	1.76;
commitid	lHNwQd6GnuXoQyMD;

1.76
date	2022.07.19.23.19.17;	author riastradh;	state Exp;
branches;
next	1.75;
commitid	BX77HSjnliyiQyMD;

1.75
date	2022.07.19.23.19.06;	author riastradh;	state Exp;
branches;
next	1.74;
commitid	Oq0gjTUKm8GeQyMD;

1.74
date	2022.07.19.22.24.47;	author riastradh;	state Exp;
branches;
next	1.73;
commitid	8D1eL0k4B9HBxyMD;

1.73
date	2022.05.22.00.10.56;	author tnn;	state Exp;
branches;
next	1.72;
commitid	ydjfTIpodz2t1ZED;

1.72
date	2021.12.21.12.55.23;	author tnn;	state Exp;
branches;
next	1.71;
commitid	Tc3QEz357kWK8wlD;

1.71
date	2021.12.19.12.39.48;	author riastradh;	state Exp;
branches;
next	1.70;
commitid	1aMuiBpANlmp7glD;

1.70
date	2021.12.19.12.30.05;	author riastradh;	state Exp;
branches;
next	1.69;
commitid	yUJymXozYfD44glD;

1.69
date	2021.12.19.12.23.16;	author riastradh;	state Exp;
branches;
next	1.68;
commitid	j7DWx3GsCrmJ1glD;

1.68
date	2021.12.19.11.53.41;	author riastradh;	state Exp;
branches;
next	1.67;
commitid	VrQ9VcKhTsZARflD;

1.67
date	2021.12.19.11.49.35;	author riastradh;	state Exp;
branches;
next	1.66;
commitid	SuYQdWL7dZybQflD;

1.66
date	2021.12.19.11.09.47;	author riastradh;	state Exp;
branches;
next	1.65;
commitid	rGc5o9YdvCpwCflD;

1.65
date	2021.12.19.11.03.09;	author riastradh;	state Exp;
branches;
next	1.64;
commitid	K7Lv8zQl10JfAflD;

1.64
date	2021.12.19.10.55.37;	author riastradh;	state Exp;
branches;
next	1.63;
commitid	UWP3CiIpOfkFxflD;

1.63
date	2021.12.19.10.55.27;	author riastradh;	state Exp;
branches;
next	1.62;
commitid	VWKaCxdkzhzBxflD;

1.62
date	2021.12.19.10.46.35;	author riastradh;	state Exp;
branches;
next	1.61;
commitid	tBYtOHHSbBrzuflD;

1.61
date	2021.12.19.10.46.24;	author riastradh;	state Exp;
branches;
next	1.60;
commitid	YeX4FYloxHyvuflD;

1.60
date	2021.12.19.10.46.02;	author riastradh;	state Exp;
branches;
next	1.59;
commitid	KYZjFa0fon9ouflD;

1.59
date	2021.12.19.10.45.33;	author riastradh;	state Exp;
branches;
next	1.58;
commitid	IsC3bK5dl9GcuflD;

1.58
date	2021.12.19.10.39.57;	author riastradh;	state Exp;
branches;
next	1.57;
commitid	xm0gTsMKh4misflD;

1.57
date	2021.12.19.10.32.47;	author riastradh;	state Exp;
branches;
next	1.56;
commitid	tT6w0XhHOlOOpflD;

1.56
date	2021.12.19.10.21.18;	author riastradh;	state Exp;
branches;
next	1.55;
commitid	2vER9iVdhRKTlflD;

1.55
date	2021.12.19.10.21.09;	author riastradh;	state Exp;
branches;
next	1.54;
commitid	JfyCTPI1BHVQlflD;

1.54
date	2021.12.19.09.53.14;	author riastradh;	state Exp;
branches;
next	1.53;
commitid	7zrtfq0inFDgcflD;

1.53
date	2021.12.19.09.50.50;	author riastradh;	state Exp;
branches;
next	1.52;
commitid	mTzcYrvxP1ArbflD;

1.52
date	2021.12.19.09.46.55;	author riastradh;	state Exp;
branches;
next	1.51;
commitid	9luquQpdbDu6aflD;

1.51
date	2021.12.19.09.46.48;	author riastradh;	state Exp;
branches;
next	1.50;
commitid	m7wgVzogAuX3aflD;

1.50
date	2021.12.19.01.59.48;	author riastradh;	state Exp;
branches;
next	1.49;
commitid	lO9UNjcf5bcRzclD;

1.49
date	2021.12.19.01.59.27;	author riastradh;	state Exp;
branches;
next	1.48;
commitid	nYlWvLkka7WIzclD;

1.48
date	2021.12.19.01.51.37;	author riastradh;	state Exp;
branches;
next	1.47;
commitid	XdTBZNuu9fL2xclD;

1.47
date	2021.12.19.01.51.27;	author riastradh;	state Exp;
branches;
next	1.46;
commitid	zpZCIVZeSFyYwclD;

1.46
date	2021.12.19.01.46.39;	author riastradh;	state Exp;
branches;
next	1.45;
commitid	WbHRYBG8EEwlvclD;

1.45
date	2021.12.19.01.03.13;	author riastradh;	state Exp;
branches;
next	1.44;
commitid	71Ve3WsYQDrrgclD;

1.44
date	2021.12.19.00.57.55;	author riastradh;	state Exp;
branches;
next	1.43;
commitid	96HxwLJLRB9DeclD;

1.43
date	2021.12.19.00.54.15;	author riastradh;	state Exp;
branches;
next	1.42;
commitid	iIVB5GcovxKmdclD;

1.42
date	2021.12.19.00.31.35;	author riastradh;	state Exp;
branches;
next	1.41;
commitid	ASrNRefkSPEA5clD;

1.41
date	2021.12.19.00.30.18;	author riastradh;	state Exp;
branches;
next	1.40;
commitid	mxQDE14do8l95clD;

1.40
date	2021.12.19.00.27.52;	author riastradh;	state Exp;
branches;
next	1.39;
commitid	7Uwu2AsFOHVj4clD;

1.39
date	2021.12.19.00.26.16;	author riastradh;	state Exp;
branches;
next	1.38;
commitid	9gcboVo1rWuL3clD;

1.38
date	2021.12.19.00.26.09;	author riastradh;	state Exp;
branches;
next	1.37;
commitid	kzcdC3GO01QI3clD;

1.37
date	2021.12.19.00.25.53;	author riastradh;	state Exp;
branches;
next	1.36;
commitid	E6D7Eo4q6nqD3clD;

1.36
date	2021.12.19.00.25.34;	author riastradh;	state Exp;
branches;
next	1.35;
commitid	CShfcSH9R2xw3clD;

1.35
date	2021.06.02.15.45.28;	author nia;	state Exp;
branches;
next	1.34;
commitid	S7Gn5wvpCiZkzzVC;

1.34
date	2020.02.14.04.30.05;	author riastradh;	state Exp;
branches
	1.34.10.1
	1.34.14.1;
next	1.33;
commitid	5wuY9dm4tghA4BWB;

1.33
date	2019.12.09.15.37.26;	author jakllsch;	state Exp;
branches
	1.33.2.1;
next	1.32;
commitid	DjGy1x1OUzvZU2OB;

1.32
date	2019.11.18.20.02.09;	author christos;	state Exp;
branches;
next	1.31;
commitid	R2BbGzgwB3MD3nLB;

1.31
date	2019.11.16.04.10.33;	author christos;	state Exp;
branches;
next	1.30;
commitid	ZRmCEW6uoOY7R1LB;

1.30
date	2018.08.28.03.41.39;	author riastradh;	state Exp;
branches
	1.30.4.1;
next	1.29;
commitid	UCntbWD2hrp00QPA;

1.29
date	2018.08.27.15.29.42;	author riastradh;	state Exp;
branches;
next	1.28;
commitid	sfnFxJ2UEIu6XLPA;

1.28
date	2018.08.27.15.22.54;	author riastradh;	state Exp;
branches;
next	1.27;
commitid	TG4FInsbQWnDULPA;

1.27
date	2018.08.27.13.53.32;	author riastradh;	state Exp;
branches;
next	1.26;
commitid	X24sCTA7NEe7qLPA;

1.26
date	2018.08.27.13.53.20;	author riastradh;	state Exp;
branches;
next	1.25;
commitid	b5h5GlRun7O2qLPA;

1.25
date	2018.08.27.07.54.28;	author riastradh;	state Exp;
branches;
next	1.24;
commitid	i1iunniekH2WqJPA;

1.24
date	2018.08.27.06.50.58;	author riastradh;	state Exp;
branches;
next	1.23;
commitid	ECDrjkTPIe195JPA;

1.23
date	2018.08.27.06.50.45;	author riastradh;	state Exp;
branches;
next	1.22;
commitid	bhBKv7UCw8D35JPA;

1.22
date	2018.08.27.06.47.51;	author riastradh;	state Exp;
branches;
next	1.21;
commitid	JuFWYTRT7qS44JPA;

1.21
date	2018.08.27.06.37.41;	author riastradh;	state Exp;
branches;
next	1.20;
commitid	hPmDnD94oKNA0JPA;

1.20
date	2018.08.27.06.33.08;	author riastradh;	state Exp;
branches;
next	1.19;
commitid	4WoN92cFgCt2ZIPA;

1.19
date	2018.08.27.06.31.41;	author riastradh;	state Exp;
branches;
next	1.18;
commitid	xGU6l6sbCzyoYIPA;

1.18
date	2018.08.27.06.25.59;	author riastradh;	state Exp;
branches;
next	1.17;
commitid	MIyJao9eCF2AWIPA;

1.17
date	2018.08.27.06.25.48;	author riastradh;	state Exp;
branches;
next	1.16;
commitid	lEBd9gg4Kr7wWIPA;

1.16
date	2018.08.27.06.25.37;	author riastradh;	state Exp;
branches;
next	1.15;
commitid	45OL2r8wK8qsWIPA;

1.15
date	2018.08.27.06.25.28;	author riastradh;	state Exp;
branches;
next	1.14;
commitid	suunwg0f8PKoWIPA;

1.14
date	2017.12.26.14.53.12;	author jmcneill;	state Exp;
branches
	1.14.2.1
	1.14.4.1;
next	1.13;
commitid	qxcSxX8Iv2dvApkA;

1.13
date	2016.02.24.22.04.15;	author skrll;	state Exp;
branches;
next	1.12;
commitid	JYP6fljR7INfxdWy;

1.12
date	2015.08.20.21.41.12;	author skrll;	state Exp;
branches;
next	1.11;
commitid	V3IsbqjVjOO8s3yy;

1.11
date	2015.03.05.17.50.41;	author riastradh;	state Exp;
branches;
next	1.10;
commitid	DAvH2wkoIE72Arcy;

1.10
date	2015.03.05.17.42.48;	author riastradh;	state Exp;
branches;
next	1.9;
commitid	G0GQdnJBV9GJxrcy;

1.9
date	2014.11.12.02.24.40;	author christos;	state Exp;
branches
	1.9.2.1;
next	1.8;
commitid	8FoWKourWRFP5QXx;

1.8
date	2014.09.14.19.06.00;	author riastradh;	state Exp;
branches;
next	1.7;
commitid	fPkkVXAxMT24xlQx;

1.7
date	2014.07.16.20.59.57;	author riastradh;	state Exp;
branches
	1.7.2.1
	1.7.4.1;
next	1.6;
commitid	2Jdpp0Mx9j7G5EIx;

1.6
date	2014.07.16.20.56.25;	author riastradh;	state Exp;
branches;
next	1.5;
commitid	HSaGIfvEpvYt4EIx;

1.5
date	2014.04.01.15.08.58;	author riastradh;	state Exp;
branches
	1.5.2.1
	1.5.4.1
	1.5.6.1;
next	1.4;
commitid	NDIypNPrys9zyZux;

1.4
date	2014.03.31.13.38.44;	author riastradh;	state Exp;
branches;
next	1.3;
commitid	EJymLo49u4vB5Rux;

1.3
date	2014.03.27.21.21.47;	author christos;	state Exp;
branches;
next	1.2;
commitid	pKk22Km9WVOnMnux;

1.2
date	2014.03.18.18.20.42;	author riastradh;	state Exp;
branches;
next	1.1;
commitid	YersUbOm2SKa4dtx;

1.1
date	2014.03.04.20.45.16;	author riastradh;	state dead;
branches
	1.1.2.1;
next	;
commitid	JIh80eY5xBsJjqrx;

1.34.10.1
date	2021.06.17.04.46.32;	author thorpej;	state Exp;
branches;
next	;
commitid	d7CrUzY34skBrrXC;

1.34.14.1
date	2021.06.06.20.30.52;	author cjep;	state Exp;
branches;
next	;
commitid	XNEGuB48YPLw17WC;

1.33.2.1
date	2020.02.29.20.20.17;	author ad;	state Exp;
branches;
next	;
commitid	Q4NqviurSHICQBYB;

1.30.4.1
date	2020.01.05.11.05.53;	author martin;	state Exp;
branches;
next	;
commitid	6nyR3LliU098yuRB;

1.14.2.1
date	2018.09.06.06.56.35;	author pgoyette;	state Exp;
branches;
next	;
commitid	HCi1bXD317XIK0RA;

1.14.4.1
date	2019.06.10.22.08.30;	author christos;	state Exp;
branches;
next	1.14.4.2;
commitid	jtc8rnCzWiEEHGqB;

1.14.4.2
date	2020.04.08.14.08.27;	author martin;	state Exp;
branches;
next	1.14.4.3;
commitid	Qli2aW9E74UFuA3C;

1.14.4.3
date	2020.04.13.08.04.59;	author martin;	state Exp;
branches;
next	;
commitid	X01YhRUPVUDaec4C;

1.9.2.1
date	2015.04.06.15.18.17;	author skrll;	state Exp;
branches;
next	1.9.2.2;
commitid	pz01Zhy7RP6iGxgy;

1.9.2.2
date	2015.09.22.12.06.05;	author skrll;	state Exp;
branches;
next	1.9.2.3;
commitid	CpNWKp3ozVNTafCy;

1.9.2.3
date	2016.03.19.11.30.30;	author skrll;	state Exp;
branches;
next	;
commitid	2PHKtPSg1vDV9fZy;

1.7.2.1
date	2015.01.11.05.59.17;	author snj;	state Exp;
branches;
next	1.7.2.2;
commitid	tIqDrPTMaOaMlz5y;

1.7.2.2
date	2015.03.06.21.39.10;	author snj;	state Exp;
branches
	1.7.2.2.4.1;
next	1.7.2.3;
commitid	pSdtnqChR7iEOAcy;

1.7.2.3
date	2017.04.05.19.54.22;	author snj;	state Exp;
branches;
next	;
commitid	WGkDlkAJ2Mi4MnMz;

1.7.2.2.4.1
date	2016.09.06.20.33.10;	author skrll;	state Exp;
branches;
next	;
commitid	CX54FkJY7PJHKglz;

1.7.4.1
date	2014.07.16.20.59.57;	author tls;	state dead;
branches;
next	1.7.4.2;
commitid	jTnpym9Qu0o4R1Nx;

1.7.4.2
date	2014.08.20.00.04.20;	author tls;	state Exp;
branches;
next	1.7.4.3;
commitid	jTnpym9Qu0o4R1Nx;

1.7.4.3
date	2017.12.03.11.37.58;	author jdolecek;	state Exp;
branches;
next	;
commitid	XcIYRZTAh1LmerhA;

1.5.2.1
date	2014.08.10.06.55.39;	author tls;	state Exp;
branches;
next	;
commitid	oVzXby2Mw1D8CMLx;

1.5.4.1
date	2014.04.01.15.08.58;	author rmind;	state dead;
branches;
next	1.5.4.2;
commitid	mL5ZYSzpqK6QS2Bx;

1.5.4.2
date	2014.05.18.17.46.00;	author rmind;	state Exp;
branches;
next	;
commitid	mL5ZYSzpqK6QS2Bx;

1.5.6.1
date	2014.04.01.15.08.58;	author yamt;	state dead;
branches;
next	1.5.6.2;
commitid	VUUXuyNWnt3AKwBx;

1.5.6.2
date	2014.05.22.11.40.55;	author yamt;	state Exp;
branches;
next	;
commitid	VUUXuyNWnt3AKwBx;

1.1.2.1
date	2014.03.04.20.45.16;	author riastradh;	state Exp;
branches;
next	;
commitid	JIh80eY5xBsJjqrx;


desc
@@


1.83
log
@drm: New option DRM_LEGACY.

This brings in the `drmums' components, which are the parts of the
current drm code base (sys/external/bsd/drm2) needed by legacy
user-mode-setting drivers (currently just viadrmums), in contrast to
the old drm code base (sys/external/bsd/drm).

This way, viadrmums.kmod can be loaded into GENERIC i386 kernels, but
platforms without any relevant legacy UMS drivers don't get the
legacy goo statically baked in.
@
text
@#	$NetBSD: files.drmkms,v 1.82 2022/07/28 10:43:35 riastradh Exp $

version	20180827

include "external/bsd/drm2/linux/files.drmkms_linux"

# i2c code is not separated out, but it is marked so that it could be
# if we wanted.  Not clear that this provides as much advantage as
# separating out PCI code, which will be necessary for, e.g., PCIless
# ARM SoC graphics drivers.
define	drmkms_i2c: drmkms_linux

define	drmkms: drmkms_linux, drmkms_i2c, linux, sysmon_power

# This code comes from the Linux kernel, which assumes signed
# overflow is OK.
makeoptions 	drmkms	"COPTS.drmkms"+="-fwrapv"

# Overrides first.
makeoptions 	drmkms	"CPPFLAGS.drmkms"+="-I$S/external/bsd/drm2/include"
makeoptions 	drmkms	"CPPFLAGS.drmkms"+="-I$S/external/bsd/drm2/include/drm"

makeoptions 	drmkms	"CPPFLAGS.drmkms"+="-I$S/external/bsd/common/include"

# Then upstream.
makeoptions 	drmkms	"CPPFLAGS.drmkms"+="-I$S/external/bsd/drm2/dist/include"
makeoptions 	drmkms	"CPPFLAGS.drmkms"+="-I$S/external/bsd/drm2/dist/include/drm"
makeoptions 	drmkms	"CPPFLAGS.drmkms"+="-I$S/external/bsd/drm2/dist/include/uapi"

makeoptions	drmkms	"CPPFLAGS.drmkms"+="-D__KERNEL__"

ifdef i386
makeoptions	drmkms	"CPPFLAGS.drmkms"+="-DCONFIG_X86"
makeoptions	drmkms	"CPPFLAGS.drmkms"+="-DCONFIG_X86_PAT"
elifdef amd64
makeoptions	drmkms	"CPPFLAGS.drmkms"+="-DCONFIG_X86"
makeoptions	drmkms	"CPPFLAGS.drmkms"+="-DCONFIG_X86_64"
makeoptions	drmkms	"CPPFLAGS.drmkms"+="-DCONFIG_X86_PAT"
elifdef arm
makeoptions	drmkms	"CPPFLAGS.drmkms"+="-DCONFIG_ARM"
elifdef aarch64
makeoptions	drmkms	"CPPFLAGS.drmkms"+="-DCONFIG_ARM64"
elifdef alpha
makeoptions	drmkms	"CPPFLAGS.drmkms"+="-Ualpha"
endif

makeoptions	drmkms	"CPPFLAGS.drmkms"+="-DCONFIG_BACKLIGHT_CLASS_DEVICE=0"
makeoptions	drmkms	"CPPFLAGS.drmkms"+="-DCONFIG_BACKLIGHT_CLASS_DEVICE_MODULE=0"
makeoptions	drmkms	"CPPFLAGS.drmkms"+="-DCONFIG_DRM_FBDEV_EMULATION=1"
makeoptions	drmkms	"CPPFLAGS.drmkms"+="-DCONFIG_DRM_FBDEV_OVERALLOC=100"
makeoptions	drmkms	"CPPFLAGS.drmkms"+="-DCONFIG_FB=0"
makeoptions	drmkms	"CPPFLAGS.drmkms"+="-DCONFIG_LOCKDEP=0"
makeoptions	drmkms	"CPPFLAGS.drmkms"+="-DCONFIG_PCI=1"

makeoptions	drmkms	"CWARNFLAGS.drmkms"+="-Wno-missing-field-initializers"

# NetBSD additions.
file	external/bsd/drm2/drm/drm_agp_hook.c		drmkms
file	external/bsd/drm2/drm/drm_cdevsw.c		drmkms
file	external/bsd/drm2/drm/drm_gem_vm.c		drmkms
file	external/bsd/drm2/drm/drm_module.c		drmkms
file	external/bsd/drm2/drm/drm_stub.c		!drmkms & !drmbase
file	external/bsd/drm2/drm/drm_sysctl.c		drmkms

# pci bus ids -- doesn't depend on all of pci, just the header files
file	external/bsd/drm2/pci/drm_pci_busid.c		drmkms

# Generic, unaccelerated kms framebuffer.
define	drmfb: genfb
file	external/bsd/drm2/drm/drmfb.c			drmfb

makeoptions	drmfb	"CPPFLAGS.drmfb"+="${CPPFLAGS.drmkms}"

include "external/bsd/drm2/ttm/files.ttm"

makeoptions 	drmkms 	"CWARNFLAGS.drm_atomic_helper.c"+="-Wno-shadow"
makeoptions 	drmkms 	"CWARNFLAGS.drm_bufs.c"+="-Wno-pointer-arith"
makeoptions 	drmkms 	"CWARNFLAGS.drm_crtc.c"+="-Wno-missing-field-initializers"
makeoptions 	drmkms 	"CWARNFLAGS.drm_crtc.c"+="-Wno-pointer-arith"
makeoptions 	drmkms 	"CWARNFLAGS.drm_crtc.c"+="-Wno-shadow"
makeoptions 	drmkms 	"CWARNFLAGS.drm_client_modeset.c"+="-Wno-shadow"
makeoptions 	drmkms 	"CWARNFLAGS.drm_dp_helper.c"+="-Wno-pointer-arith"
makeoptions 	drmkms 	"CWARNFLAGS.drm_fb_helper.c"+="-Wno-shadow"
makeoptions 	drmkms 	"CWARNFLAGS.drm_edid.c"+="-Wno-shadow"
makeoptions 	drmkms 	"CWARNFLAGS.drm_ioctl.c"+="-Wno-shadow"
makeoptions	drmkms	"CWARNFLAGS.drm_mm.c"+="${${ACTIVE_CC} == clang :? -Wno-unused-function :}"
makeoptions 	drmkms 	"CWARNFLAGS.drm_modes.c"+="-Wno-shadow"

# Legacy user-mode setting -- for the following legacy drivers:
#
#       mach64*
#       mga*
#       savage*
#       sis*
#       tdfx*
#       via
#
# * not yet adapted to current drm code base
#
define	drmums: drmkms
makeoptions	drmums	"CPPFLAGS.drmkms"+="-DCONFIG_DRM_LEGACY"
makeoptions	drmums	"CPPFLAGS.drmums"+="${CPPFLAGS.drmkms}"
file	external/bsd/drm2/dist/drm/drm_bufs.c		drmums
file	external/bsd/drm2/dist/drm/drm_context.c	drmums
file	external/bsd/drm2/dist/drm/drm_dma.c		drmums
file	external/bsd/drm2/dist/drm/drm_legacy_misc.c	drmums
file	external/bsd/drm2/drm/drm_lock.c		drmums
file	external/bsd/drm2/drm/drm_scatter.c		drmums

# Set `options DRM_LEGACY' to allow loading modules requiring drmums
# even if none are statically linked into the kernel.
defflag		DRM_LEGACY: drmums

# GPU scheduler
define	drmkms_sched: drmkms
makeoptions	drmkms_sched	"CPPFLAGS.drmkms_sched"+="${CPPFLAGS.drmkms}"

file	external/bsd/drm2/dist/drm/scheduler/sched_entity.c	drmkms_sched
file	external/bsd/drm2/dist/drm/scheduler/sched_fence.c	drmkms_sched
file	external/bsd/drm2/dist/drm/scheduler/sched_main.c	drmkms_sched

# Generated from drm2netbsd.
#file	external/bsd/drm2/dist/drm/drm_agpsupport.c	drmkms	# drmkms_pci
file	external/bsd/drm2/dist/drm/drm_atomic.c	drmkms
file	external/bsd/drm2/dist/drm/drm_atomic_helper.c	drmkms
file	external/bsd/drm2/dist/drm/drm_atomic_state_helper.c	drmkms
file	external/bsd/drm2/dist/drm/drm_atomic_uapi.c	drmkms
file	external/bsd/drm2/dist/drm/drm_auth.c	drmkms
file	external/bsd/drm2/dist/drm/drm_blend.c	drmkms
file	external/bsd/drm2/dist/drm/drm_bridge.c	drmkms
file	external/bsd/drm2/drm/drm_cache.c	drmkms
file	external/bsd/drm2/drm/drm_client.c	drmkms
file	external/bsd/drm2/dist/drm/drm_client_modeset.c	drmkms
file	external/bsd/drm2/dist/drm/drm_color_mgmt.c	drmkms
file	external/bsd/drm2/dist/drm/drm_connector.c	drmkms
file	external/bsd/drm2/dist/drm/drm_crtc.c	drmkms
file	external/bsd/drm2/dist/drm/drm_crtc_helper.c	drmkms
file	external/bsd/drm2/dist/drm/drm_damage_helper.c	drmkms
file	external/bsd/drm2/dist/drm/drm_dp_dual_mode_helper.c	drmkms
file	external/bsd/drm2/dist/drm/drm_dp_helper.c	drmkms
file	external/bsd/drm2/dist/drm/drm_dp_mst_topology.c	drmkms
file	external/bsd/drm2/dist/drm/drm_drv.c	drmkms
file	external/bsd/drm2/dist/drm/drm_dsc.c	drmkms
file	external/bsd/drm2/dist/drm/drm_dumb_buffers.c	drmkms
file	external/bsd/drm2/dist/drm/drm_edid.c	drmkms
file	external/bsd/drm2/dist/drm/drm_encoder.c	drmkms
file	external/bsd/drm2/i2c/drm_encoder_slave.c	drmkms
file	external/bsd/drm2/dist/drm/drm_fb_helper.c	drmkms
file	external/bsd/drm2/dist/drm/drm_file.c	drmkms
file	external/bsd/drm2/dist/drm/drm_flip_work.c	drmkms
#file	external/bsd/drm2/dist/drm/drm_format_helper.c	drmkms
file	external/bsd/drm2/dist/drm/drm_fourcc.c	drmkms
file	external/bsd/drm2/dist/drm/drm_framebuffer.c	drmkms
file	external/bsd/drm2/dist/drm/drm_gem.c	drmkms
file	external/bsd/drm2/drm/drm_gem_cma_helper.c	drmkms
file	external/bsd/drm2/drm/drm_gem_framebuffer_helper.c	drmkms
file	external/bsd/drm2/dist/drm/drm_hashtab.c	drmkms
file	external/bsd/drm2/drm/drm_hdcp.c	drmkms
file	external/bsd/drm2/dist/drm/drm_ioctl.c	drmkms
file	external/bsd/drm2/dist/drm/drm_irq.c	drmkms
#file	external/bsd/drm2/dist/drm/drm_kms_helper_common.c	drmkms
file	external/bsd/drm2/drm/drm_lease.c	drmkms
file	external/bsd/drm2/drm/drm_memory.c	drmkms
file	external/bsd/drm2/dist/drm/drm_mm.c	drmkms
file	external/bsd/drm2/dist/drm/drm_mode_config.c	drmkms
file	external/bsd/drm2/dist/drm/drm_mode_object.c	drmkms
file	external/bsd/drm2/dist/drm/drm_modes.c	drmkms
file	external/bsd/drm2/dist/drm/drm_modeset_helper.c	drmkms
file	external/bsd/drm2/dist/drm/drm_modeset_lock.c	drmkms
file	external/bsd/drm2/dist/drm/drm_panel.c	drmkms
file	external/bsd/drm2/dist/drm/drm_panel_orientation_quirks.c	drmkms
#file	external/bsd/drm2/dist/drm/drm_pci.c	drmkms	# drmkms_pci
file	external/bsd/drm2/dist/drm/drm_plane.c	drmkms
file	external/bsd/drm2/dist/drm/drm_plane_helper.c	drmkms
file	external/bsd/drm2/dist/drm/drm_prime.c	drmkms
file	external/bsd/drm2/dist/drm/drm_print.c	drmkms
file	external/bsd/drm2/dist/drm/drm_probe_helper.c	drmkms
file	external/bsd/drm2/dist/drm/drm_property.c	drmkms
file	external/bsd/drm2/dist/drm/drm_rect.c	drmkms
file	external/bsd/drm2/dist/drm/drm_scdc_helper.c	drmkms
file	external/bsd/drm2/dist/drm/drm_self_refresh_helper.c	drmkms
#file	external/bsd/drm2/dist/drm/drm_simple_kms_helper.c	drmkms
file	external/bsd/drm2/dist/drm/drm_syncobj.c	drmkms
file	external/bsd/drm2/drm/drm_sysfs.c	drmkms
file	external/bsd/drm2/dist/drm/drm_trace_points.c	drmkms
file	external/bsd/drm2/dist/drm/drm_vblank.c	drmkms
file	external/bsd/drm2/drm/drm_vm.c	drmkms
file	external/bsd/drm2/drm/drm_vma_manager.c	drmkms
file	external/bsd/drm2/drm/drm_writeback.c	drmkms
@


1.82
log
@drmkms_sched: Remove duplicate module definition.
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.81 2022/07/24 19:23:59 riastradh Exp $
d89 11
a99 1
# Legacy user-mode setting
d110 4
@


1.81
log
@drm: Fix CPPFLAGS for drm scheduler code.
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.80 2022/07/23 12:52:10 riastradh Exp $
a106 1
file	external/bsd/drm2/drm/sched_module.c			drmkms_sched
@


1.80
log
@drm: Split scheduler into separate module.

Used only by amdgpu, and it uses something that is currently broken
from the gcc update on aarch64, so let's make it a little more
optional.
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.79 2022/07/20 10:01:01 riastradh Exp $
d102 1
a102 1
makeoptions	drmkms_sched	"CPPFLAGS.drmsched"+="${CPPFLAGS.drmkms}"
@


1.79
log
@drm: Keep drm include flags in CPPFLAGS.drmkms after all.

Failures from this are much more obvious to debug than files with
missing #ifdefs, which sometimes lead to build failures but could
also just lead to silent miscompilation.
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.78 2022/07/20 01:38:24 riastradh Exp $
d101 7
a107 3
file	external/bsd/drm2/dist/drm/scheduler/sched_entity.c	drmkms
file	external/bsd/drm2/dist/drm/scheduler/sched_fence.c	drmkms
file	external/bsd/drm2/dist/drm/scheduler/sched_main.c	drmkms
@


1.78
log
@drm: Restore pollution of CPPFLAGS with include directories.

Too much trouble to make this fine-grained.
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.77 2022/07/19 23:19:35 riastradh Exp $
d20 2
a21 2
makeoptions 	drmkms	CPPFLAGS+="-I$S/external/bsd/drm2/include"
makeoptions 	drmkms	CPPFLAGS+="-I$S/external/bsd/drm2/include/drm"
d23 1
a23 1
makeoptions 	drmkms	CPPFLAGS+="-I$S/external/bsd/common/include"
d26 3
a28 3
makeoptions 	drmkms	CPPFLAGS+="-I$S/external/bsd/drm2/dist/include"
makeoptions 	drmkms	CPPFLAGS+="-I$S/external/bsd/drm2/dist/include/drm"
makeoptions 	drmkms	CPPFLAGS+="-I$S/external/bsd/drm2/dist/include/uapi"
@


1.77
log
@drm: Undefine `alpha' in CPPFLAGS.  Causes lotsa trouble!

But don't undefine it outside drmkms; `#ifdef alpha' or equivalent is
used elsewhere in-tree.  (Maybe it should be replaced by __alpha__.)
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.76 2022/07/19 23:19:17 riastradh Exp $
d20 2
a21 2
makeoptions 	drmkms	"CPPFLAGS.drmkms"+="-I$S/external/bsd/drm2/include"
makeoptions 	drmkms	"CPPFLAGS.drmkms"+="-I$S/external/bsd/drm2/include/drm"
d23 1
a23 1
makeoptions 	drmkms	"CPPFLAGS.drmkms"+="-I$S/external/bsd/common/include"
d26 3
a28 3
makeoptions 	drmkms	"CPPFLAGS.drmkms"+="-I$S/external/bsd/drm2/dist/include"
makeoptions 	drmkms	"CPPFLAGS.drmkms"+="-I$S/external/bsd/drm2/dist/include/drm"
makeoptions 	drmkms	"CPPFLAGS.drmkms"+="-I$S/external/bsd/drm2/dist/include/uapi"
@


1.76
log
@drm: Narrow scope of drm CPPLAGS just to drm files.

No need for various Linux compat definitions elsewhere in the kernel.
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.75 2022/07/19 23:19:06 riastradh Exp $
d43 2
@


1.75
log
@drm: Propagate CPPFLAGS.drmkms into all the drm drivers.
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.74 2022/07/19 22:24:47 riastradh Exp $
d20 2
a21 2
makeoptions 	drmkms	CPPFLAGS+="-I$S/external/bsd/drm2/include"
makeoptions 	drmkms	CPPFLAGS+="-I$S/external/bsd/drm2/include/drm"
d23 1
a23 1
makeoptions 	drmkms	CPPFLAGS+="-I$S/external/bsd/common/include"
d26 3
a28 3
makeoptions 	drmkms	CPPFLAGS+="-I$S/external/bsd/drm2/dist/include"
makeoptions 	drmkms	CPPFLAGS+="-I$S/external/bsd/drm2/dist/include/drm"
makeoptions 	drmkms	CPPFLAGS+="-I$S/external/bsd/drm2/dist/include/uapi"
d30 1
a30 1
makeoptions	drmkms	CPPFLAGS+="-D__KERNEL__"
d33 2
a34 2
makeoptions	drmkms	CPPFLAGS+="-DCONFIG_X86"
makeoptions	drmkms	CPPFLAGS+="-DCONFIG_X86_PAT"
d36 3
a38 3
makeoptions	drmkms	CPPFLAGS+="-DCONFIG_X86"
makeoptions	drmkms	CPPFLAGS+="-DCONFIG_X86_64"
makeoptions	drmkms	CPPFLAGS+="-DCONFIG_X86_PAT"
d40 1
a40 1
makeoptions	drmkms	CPPFLAGS+="-DCONFIG_ARM"
d42 1
a42 1
makeoptions	drmkms	CPPFLAGS+="-DCONFIG_ARM64"
d45 7
a51 7
makeoptions	drmkms	CPPFLAGS+="-DCONFIG_BACKLIGHT_CLASS_DEVICE=0"
makeoptions	drmkms	CPPFLAGS+="-DCONFIG_BACKLIGHT_CLASS_DEVICE_MODULE=0"
makeoptions	drmkms	CPPFLAGS+="-DCONFIG_DRM_FBDEV_EMULATION=1"
makeoptions	drmkms	CPPFLAGS+="-DCONFIG_DRM_FBDEV_OVERALLOC=100"
makeoptions	drmkms	CPPFLAGS+="-DCONFIG_FB=0"
makeoptions	drmkms	CPPFLAGS+="-DCONFIG_LOCKDEP=0"
makeoptions	drmkms	CPPFLAGS+="-DCONFIG_PCI=1"
@


1.74
log
@drm: Note dependency on sysmon_power.

drm uses this for pswitch events to notify of hotplug.
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.73 2022/05/22 00:10:56 tnn Exp $
d70 2
d89 2
a90 1
makeoptions	drmums	CPPFLAGS+="-DCONFIG_DRM_LEGACY"
@


1.73
log
@rename CONFIG_AARCH64 to CONFIG_ARM64 which is what upstream code expects
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.72 2021/12/21 12:55:23 tnn Exp $
d13 1
a13 1
define	drmkms: drmkms_linux, drmkms_i2c, linux
@


1.72
log
@drm: sprinkle some -Wno-unused-function for clang

915_sw_fence.c: for debug_fence_init_onstack
drm_mm.c: for rb_hole_size_to_node
intel_hdmi.c: for intel_hdmi_hdcp2_protocol
intel_guc_submission.c: for rq_prio
nouveau_nvkm_subdev_instmem_base.c: for fake_ioread32_native
nouveau_nvkm_subdev_mmu_vmmnv04.c: for nv04_vmm_pgt_pte
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.71 2021/12/19 12:39:48 riastradh Exp $
d42 1
a42 1
makeoptions	drmkms	CPPFLAGS+="-DCONFIG_AARCH64"
@


1.71
log
@drm: Make scheduler mandatory to make amdgpu module simpler.
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.70 2021/12/19 12:30:05 riastradh Exp $
d82 1
@


1.70
log
@drm: Make some legacy UMS crap build.
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.69 2021/12/19 12:23:16 riastradh Exp $
d95 3
a97 4
define	drmsched: drmkms
file	external/bsd/drm2/dist/drm/scheduler/sched_entity.c	drmkms & drmsched
file	external/bsd/drm2/dist/drm/scheduler/sched_fence.c	drmkms & drmsched
file	external/bsd/drm2/dist/drm/scheduler/sched_main.c	drmkms & drmsched
@


1.69
log
@amdgpu: Stub out irq domain stuff with a finer grain.
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.68 2021/12/19 11:53:41 riastradh Exp $
d91 1
a91 1
file	external/bsd/drm2/dist/drm/drm_lock.c		drmums
@


1.68
log
@drm: Place drm_hdcp.c like other overrides in files.drmkms.
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.67 2021/12/19 11:49:35 riastradh Exp $
d94 6
@


1.67
log
@drm: Stub out drm_hdcp.c
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.66 2021/12/19 11:09:47 riastradh Exp $
a58 1
file	external/bsd/drm2/drm/drm_hdcp.c		drmkms
d130 1
a130 1
#file	external/bsd/drm2/dist/drm/drm_hdcp.c	drmkms
@


1.66
log
@drm: Remove local diffs for drm_pci_set_busid.

Instead, move it to its own file that can be safely used without
bringing in a link/run-time dependency on pci.
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.65 2021/12/19 11:03:09 riastradh Exp $
d59 1
@


1.65
log
@Get drm_mm.c building.

Just replace the interval tree lookup by a linear search for now.
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.64 2021/12/19 10:55:37 riastradh Exp $
d63 3
@


1.64
log
@Revert part of previous: no separate CPPFLAGS.drmkms.

There are too many drms users outside sys/external/bsd/drm2 for now;
will hold off on this until we find a better way to keep the drm
includes modularized.
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.63 2021/12/19 10:55:27 riastradh Exp $
d133 1
a133 1
#file	external/bsd/drm2/dist/drm/drm_mm.c	drmkms
@


1.63
log
@Narrow the CPPFLAGS for drm subsystems.

No need for the whole kernel to be built with -I flags for the drm
header files.
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.62 2021/12/19 10:46:35 riastradh Exp $
d20 2
a21 2
makeoptions 	drmkms	"CPPFLAGS.drmkms"+="-I$S/external/bsd/drm2/include"
makeoptions 	drmkms	"CPPFLAGS.drmkms"+="-I$S/external/bsd/drm2/include/drm"
d23 1
a23 1
makeoptions 	drmkms	"CPPFLAGS.drmkms"+="-I$S/external/bsd/common/include"
d26 3
a28 3
makeoptions 	drmkms	"CPPFLAGS.drmkms"+="-I$S/external/bsd/drm2/dist/include"
makeoptions 	drmkms	"CPPFLAGS.drmkms"+="-I$S/external/bsd/drm2/dist/include/drm"
makeoptions 	drmkms	"CPPFLAGS.drmkms"+="-I$S/external/bsd/drm2/dist/include/uapi"
d30 1
a30 1
makeoptions	drmkms	"CPPFLAGS.drmkms"+="-D__KERNEL__"
d33 2
a34 2
makeoptions	drmkms	"CPPFLAGS.drmkms"+="-DCONFIG_X86"
makeoptions	drmkms	"CPPFLAGS.drmkms"+="-DCONFIG_X86_PAT"
d36 3
a38 3
makeoptions	drmkms	"CPPFLAGS.drmkms"+="-DCONFIG_X86"
makeoptions	drmkms	"CPPFLAGS.drmkms"+="-DCONFIG_X86_64"
makeoptions	drmkms	"CPPFLAGS.drmkms"+="-DCONFIG_X86_PAT"
d40 1
a40 1
makeoptions	drmkms	"CPPFLAGS.drmkms"+="-DCONFIG_ARM"
d42 1
a42 1
makeoptions	drmkms	"CPPFLAGS.drmkms"+="-DCONFIG_AARCH64"
d45 7
a51 7
makeoptions	drmkms	"CPPFLAGS.drmkms"+="-DCONFIG_BACKLIGHT_CLASS_DEVICE=0"
makeoptions	drmkms	"CPPFLAGS.drmkms"+="-DCONFIG_BACKLIGHT_CLASS_DEVICE_MODULE=0"
makeoptions	drmkms	"CPPFLAGS.drmkms"+="-DCONFIG_DRM_FBDEV_EMULATION=1"
makeoptions	drmkms	"CPPFLAGS.drmkms"+="-DCONFIG_DRM_FBDEV_OVERALLOC=100"
makeoptions	drmkms	"CPPFLAGS.drmkms"+="-DCONFIG_FB=0"
makeoptions	drmkms	"CPPFLAGS.drmkms"+="-DCONFIG_LOCKDEP=0"
makeoptions	drmkms	"CPPFLAGS.drmkms"+="-DCONFIG_PCI=1"
a65 1
makeoptions	drmfb	"CPPFLAGS.drmfb"+="${CPPFLAGS.drmkms}"
d83 1
a83 2
makeoptions	drmums	"CPPFLAGS.drmkms"+="-DCONFIG_DRM_LEGACY"
makeoptions	drmums	"CPPFLAGS.drmums"+="-DCONFIG_DRM_LEGACY"
@


1.62
log
@drm_client stubs
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.61 2021/12/19 10:46:24 riastradh Exp $
d20 2
a21 2
makeoptions 	drmkms	CPPFLAGS+="-I$S/external/bsd/drm2/include"
makeoptions	drmkms_ttm	CPPFLAGS+="-I$S/external/bsd/drm2/include/drm"
d23 1
a23 1
makeoptions 	drmkms	CPPFLAGS+="-I$S/external/bsd/common/include"
d26 3
a28 3
makeoptions 	drmkms	CPPFLAGS+="-I$S/external/bsd/drm2/dist/include"
makeoptions 	drmkms	CPPFLAGS+="-I$S/external/bsd/drm2/dist/include/drm"
makeoptions 	drmkms	CPPFLAGS+="-I$S/external/bsd/drm2/dist/include/uapi"
d30 1
a30 1
makeoptions	drmkms	CPPFLAGS+="-D__KERNEL__"
d33 2
a34 2
makeoptions	drmkms	CPPFLAGS+="-DCONFIG_X86"
makeoptions	drmkms	CPPFLAGS+="-DCONFIG_X86_PAT"
d36 3
a38 3
makeoptions	drmkms	CPPFLAGS+="-DCONFIG_X86"
makeoptions	drmkms	CPPFLAGS+="-DCONFIG_X86_64"
makeoptions	drmkms	CPPFLAGS+="-DCONFIG_X86_PAT"
d40 1
a40 1
makeoptions	drmkms	CPPFLAGS+="-DCONFIG_ARM"
d42 1
a42 1
makeoptions	drmkms	CPPFLAGS+="-DCONFIG_AARCH64"
d45 7
a51 7
makeoptions	drmkms	CPPFLAGS+="-DCONFIG_BACKLIGHT_CLASS_DEVICE=0"
makeoptions	drmkms	CPPFLAGS+="-DCONFIG_BACKLIGHT_CLASS_DEVICE_MODULE=0"
makeoptions	drmkms	CPPFLAGS+="-DCONFIG_DRM_FBDEV_EMULATION=1"
makeoptions	drmkms	CPPFLAGS+="-DCONFIG_DRM_FBDEV_OVERALLOC=100"
makeoptions	drmkms	CPPFLAGS+="-DCONFIG_FB=0"
makeoptions	drmkms	CPPFLAGS+="-DCONFIG_LOCKDEP=0"
makeoptions	drmkms	CPPFLAGS+="-DCONFIG_PCI=1"
d66 1
d84 2
a85 1
makeoptions	drmums	CPPFLAGS+="-DCONFIG_DRM_LEGACY"
@


1.61
log
@Regen and remerge.
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.60 2021/12/19 10:46:02 riastradh Exp $
d101 1
a101 1
#file	external/bsd/drm2/dist/drm/drm_client.c	drmkms
@


1.60
log
@drm_writeback stubs
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.59 2021/12/19 10:45:33 riastradh Exp $
d140 1
@


1.59
log
@Eliminate drm_file.c copypasta.
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.58 2021/12/19 10:39:57 riastradh Exp $
d157 1
a157 1
#file	external/bsd/drm2/dist/drm/drm_writeback.c	drmkms
@


1.58
log
@Rerun drm2netbsd and merge.

New tag drmums for the legacy stuff; to deal with later for via.
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.57 2021/12/19 10:32:47 riastradh Exp $
d118 1
a118 1
file	external/bsd/drm2/drm/drm_file.c	drmkms
@


1.57
log
@Empty out drm_os_netbsd.h.
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.56 2021/12/19 10:21:18 riastradh Exp $
a57 1
file	external/bsd/drm2/drm/drm_gem_cma_helper.c	drmkms
d60 1
a61 9
file	external/bsd/drm2/drm/drm_cache.c	drmkms
file	external/bsd/drm2/drm/drm_file.c	drmkms
file	external/bsd/drm2/drm/drm_gem_framebuffer_helper.c	drmkms
file	external/bsd/drm2/drm/drm_scatter.c	drmkms
file	external/bsd/drm2/drm/drm_stub.c	!drmkms & !drmbase
file	external/bsd/drm2/drm/drm_sysfs.c	drmkms
file	external/bsd/drm2/drm/drm_vm.c	drmkms
file	external/bsd/drm2/drm/drm_vma_manager.c	drmkms
file	external/bsd/drm2/i2c/drm_encoder_slave.c	drmkms
d81 10
d100 1
a100 1
#file	external/bsd/drm2/dist/drm/drm_cache.c	drmkms
d116 1
a116 1
#file	external/bsd/drm2/dist/drm/drm_encoder_slave.c	drmkms
d118 1
a118 1
#file	external/bsd/drm2/dist/drm/drm_file.c	drmkms
d124 2
a125 1
#file	external/bsd/drm2/dist/drm/drm_gem_framebuffer_helper.c	drmkms
d139 1
d152 1
a152 1
#file	external/bsd/drm2/dist/drm/drm_sysfs.c	drmkms
d155 2
a156 2
#file	external/bsd/drm2/dist/drm/drm_vm.c	drmkms
#file	external/bsd/drm2/dist/drm/drm_vma_manager.c	drmkms
@


1.56
log
@Disable missing files for now.
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.55 2021/12/19 10:21:09 riastradh Exp $
a14 2
defflag		opt_drmkms.h	DRMKMS_DEBUG

a29 1
# XXX Should probably be in a header file.  opt_drmkms.h?
d32 13
d50 2
@


1.55
log
@Merge updated drm2netbsd output.
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.54 2021/12/19 09:53:14 riastradh Exp $
d88 1
a88 1
file	external/bsd/drm2/dist/drm/drm_client.c	drmkms
d107 1
a107 1
file	external/bsd/drm2/dist/drm/drm_format_helper.c	drmkms
d111 1
a111 1
file	external/bsd/drm2/dist/drm/drm_gem_framebuffer_helper.c	drmkms
d113 1
a113 1
file	external/bsd/drm2/dist/drm/drm_hdcp.c	drmkms
d135 1
a135 1
file	external/bsd/drm2/dist/drm/drm_simple_kms_helper.c	drmkms
@


1.54
log
@Remove these two files from the list.

We have our own copies of the same name. Since we don't support
building two files with the same name, it's pretty clear the
intention was to build just our copy of the file.


Author: Maya Rashish <maya@@NetBSD.org>
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.53 2021/12/19 09:50:50 riastradh Exp $
d78 1
d88 1
d107 1
d111 1
d113 1
a117 1
file	external/bsd/drm2/drm/drm_lock.c	drmkms
d135 1
d137 2
a138 1
#file	external/bsd/drm2/dist/drm/drm_trace_points.c	drmkms
d140 1
d142 1
a142 1
#file	external/bsd/drm2/dist/drm/drm_vm.c	drmkms
@


1.53
log
@upstream shadows, disable warning


Author: Maya Rashish <maya@@NetBSD.org>
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.52 2021/12/19 09:46:55 riastradh Exp $
d134 2
a135 2
file	external/bsd/drm2/dist/drm/drm_vma_manager.c	drmkms
file	external/bsd/drm2/dist/drm/drm_vm.c	drmkms
@


1.52
log
@We have local versions of these files, don't use upstream ones


Author: Maya Rashish <maya@@NetBSD.org>
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.51 2021/12/19 09:46:48 riastradh Exp $
d76 1
@


1.51
log
@Upstream uses shadowing, disable warning


Author: Maya Rashish <maya@@NetBSD.org>
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.50 2021/12/19 01:59:48 riastradh Exp $
d100 1
a100 1
file	external/bsd/drm2/dist/drm/drm_encoder_slave.c	drmkms
d102 1
a102 1
file	external/bsd/drm2/dist/drm/drm_file.c	drmkms
@


1.50
log
@Disable warnings about shadowing.

Upstream does shadowing here, I'm feeling uncomfortable changing their
code.


Author: Maya Rashish <maya@@NetBSD.org>
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.49 2021/12/19 01:59:27 riastradh Exp $
d73 1
@


1.49
log
@skip upstream drm_cache.c, we have our own


Author: Maya Rashish <maya@@NetBSD.org>
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.48 2021/12/19 01:51:37 riastradh Exp $
d71 1
@


1.48
log
@Remove duplicates and non-existent files.


Author: Maya Rashish <maya@@NetBSD.org>
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.47 2021/12/19 01:51:27 riastradh Exp $
d83 1
a83 1
file	external/bsd/drm2/dist/drm/drm_cache.c	drmkms
@


1.47
log
@misc drm hacks
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.46 2021/12/19 01:46:39 riastradh Exp $
d50 9
a83 1
file	external/bsd/drm2/dist/drm/drm_client.c	drmkms
a101 1
file	external/bsd/drm2/dist/drm/drm_format_helper.c	drmkms
a105 1
file	external/bsd/drm2/dist/drm/drm_hdcp.c	drmkms
a128 1
file	external/bsd/drm2/dist/drm/drm_sysfs.c	drmkms
a132 13
file	external/bsd/drm2/dist/drm/drm_writeback.c	drmkms
file	external/bsd/drm2/drm/drm_cache.c	drmkms
file	external/bsd/drm2/drm/drm_file.c	drmkms
file	external/bsd/drm2/drm/drm_gem_framebuffer_helper.c	drmkms
file	external/bsd/drm2/drm/drm_lease.c	drmkms
file	external/bsd/drm2/drm/drm_lock.c	drmkms
file	external/bsd/drm2/drm/drm_memory.c	drmkms
file	external/bsd/drm2/drm/drm_scatter.c	drmkms
file	external/bsd/drm2/drm/drm_stub.c	!drmkms & !drmbase
file	external/bsd/drm2/drm/drm_sysfs.c	drmkms
file	external/bsd/drm2/drm/drm_vm.c	drmkms
file	external/bsd/drm2/drm/drm_vma_manager.c	drmkms
file	external/bsd/drm2/i2c/drm_encoder_slave.c	drmkms
@


1.46
log
@Unhook drm_kms_helper_common.c from build.
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.45 2021/12/19 01:03:13 riastradh Exp $
d106 1
a106 1
file	external/bsd/drm2/dist/drm/drm_mm.c	drmkms
@


1.45
log
@Define CONFIG_DRM_FBDEV_OVERALLOC=100 to match upstream.
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.44 2021/12/19 00:57:55 riastradh Exp $
d102 1
a102 1
file	external/bsd/drm2/dist/drm/drm_kms_helper_common.c	drmkms
@


1.44
log
@Rename drm_fops.c -> drm_file.c
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.43 2021/12/19 00:54:15 riastradh Exp $
d38 1
@


1.43
log
@Use -Wno-missing-field-initializers for drm to reduce diffs.
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.42 2021/12/19 00:31:35 riastradh Exp $
d129 1
a129 1
file	external/bsd/drm2/drm/drm_fops.c	drmkms
@


1.42
log
@Move IS_REACHABLE to <linux/kernel.h> to avoid double definition.
@
text
@d1 3
a3 1
#	$NetBSD: files.drmkms,v 1.41 2021/12/19 00:30:18 riastradh Exp $
d40 2
@


1.41
log
@Define IS_ENABLED and IS_REACHABLE on the command line.

Header file is too late for it, apparently.

XXX Find a way to put this into a header file; command-line -D
arguments are ugly.
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.40 2021/12/19 00:27:52 riastradh Exp $
a37 3
makeoptions	drmkms	CPPFLAGS+="-DIS_ENABLED\(X\)=X"
makeoptions	drmkms	CPPFLAGS+="-DIS_REACHABLE\(X\)=X"

@


1.40
log
@No more hacks for dist/uapi -- got moved to dist/include/uapi.
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.39 2021/12/19 00:26:16 riastradh Exp $
d38 3
@


1.39
log
@Disable *_trace_points.c.

I accidentally deleted these in the import, because the *_trace.h
files got in the way and I forgot the *_trace_points.c files were
fine.

There's nothing important in them anyway, so nothing of value is
lost.  Maybe next time I will remember to delete the *_trace.h files
on import but not the *_trace_points.c to reduce diffs, but that's
too much trouble at this point.
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.38 2021/12/19 00:26:09 riastradh Exp $
d28 1
a28 7
makeoptions 	drmkms	CPPFLAGS+="-I$S/external/bsd/drm2/dist/uapi"

# Must come last because some header file names are repeated in
# dist/drm (I'm looking ta you, drm_legacy.h), while others sometimes
# explicitly write <uapi/...>.  (Maybe that should have been imported
# under dist/include/uapi rather than dist/uapi.)
makeoptions 	drmkms	CPPFLAGS+="-I$S/external/bsd/drm2/dist"
@


1.38
log
@Unfinished local implementation of GPL drm_lease.c.
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.37 2021/12/19 00:25:53 riastradh Exp $
d125 1
a125 1
file	external/bsd/drm2/dist/drm/drm_trace_points.c	drmkms
@


1.37
log
@Local reimplementation of GPL drm_gem_framebuffer_helper.c.
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.36 2021/12/19 00:25:34 riastradh Exp $
d104 3
a106 2
file	external/bsd/drm2/dist/drm/drm_lease.c	drmkms
file	external/bsd/drm2/dist/drm/drm_memory.c	drmkms
d133 1
@


1.36
log
@Generate files.* using the 2netbsd scripts.


Author: Maya Rashish <maya@@NetBSD.org>
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.35 2021/06/02 15:45:28 nia Exp $
a98 1
file	external/bsd/drm2/dist/drm/drm_gem_framebuffer_helper.c	drmkms
d131 1
@


1.35
log
@drm2: build with -fwrapv, since the Linux kernel does and we don't
want to spend too much time fixing their code. silences a lot of
KUBSAN warnings.

we need to use COPTS to have per-option compiler flags. help from
Riastradh.
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.34 2020/02/14 04:30:05 riastradh Exp $
d67 1
a67 2
#file	external/bsd/drm2/dist/drm/ati_pcigart.c	drmkms  # drmkms_pci
#file	external/bsd/drm2/dist/drm/drm_agpsupport.c	drmkms  # drmkms_pci
d70 2
d73 1
d75 5
a79 3
file	external/bsd/drm2/dist/drm/drm_bufs.c	drmkms
file	external/bsd/drm2/drm/drm_cache.c	drmkms
file	external/bsd/drm2/dist/drm/drm_context.c	drmkms
d82 2
a83 2
file	external/bsd/drm2/dist/drm/drm_debugfs.c	drmkms
file	external/bsd/drm2/dist/drm/drm_dma.c	drmkms
d87 2
d90 2
a91 1
file	external/bsd/drm2/i2c/drm_encoder_slave.c	drmkms
d93 1
d95 3
a97 1
file	external/bsd/drm2/drm/drm_fops.c	drmkms
d99 1
a99 1
file	external/bsd/drm2/dist/drm/drm_global.c	drmkms
d101 1
a101 1
#file	external/bsd/drm2/dist/drm/drm_info.c	drmkms
d104 3
a106 2
file	external/bsd/drm2/drm/drm_lock.c	drmkms
file	external/bsd/drm2/drm/drm_memory.c	drmkms
d108 2
d111 1
a112 1
file	external/bsd/drm2/dist/drm/drm_panel.c	drmkms
d114 1
a115 1
#file	external/bsd/drm2/dist/drm/drm_platform.c	drmkms
d117 1
d119 1
d121 13
d135 1
a136 1
file	external/bsd/drm2/dist/drm/drm_trace_points.c	drmkms
d139 1
a139 1
file	external/bsd/drm2/drm/drm_stub.c	!drmkms & !drmbase
@


1.34
log
@Eliminate -Wpointer-arith patches; use -Wno-pointer-arith instead.
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.33 2019/12/09 15:37:26 jakllsch Exp $
d15 4
@


1.34.10.1
log
@Sync w/ HEAD.
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.35 2021/06/02 15:45:28 nia Exp $
a14 4
# This code comes from the Linux kernel, which assumes signed
# overflow is OK.
makeoptions 	drmkms	"COPTS.drmkms"+="-fwrapv"

@


1.34.14.1
log
@sync with head
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.35 2021/06/02 15:45:28 nia Exp $
a14 4
# This code comes from the Linux kernel, which assumes signed
# overflow is OK.
makeoptions 	drmkms	"COPTS.drmkms"+="-fwrapv"

@


1.33
log
@build drm_panel.c w/ drmkms
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.32 2019/11/18 20:02:09 christos Exp $
d55 1
d57 1
d59 1
@


1.33.2.1
log
@Sync with head.
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.34 2020/02/14 04:30:05 riastradh Exp $
a54 1
makeoptions 	drmkms 	"CWARNFLAGS.drm_bufs.c"+="-Wno-pointer-arith"
a55 1
makeoptions 	drmkms 	"CWARNFLAGS.drm_crtc.c"+="-Wno-pointer-arith"
a56 1
makeoptions 	drmkms 	"CWARNFLAGS.drm_dp_helper.c"+="-Wno-pointer-arith"
@


1.32
log
@don't build stub if legacy drm is present too.
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.31 2019/11/16 04:10:33 christos Exp $
d92 1
@


1.31
log
@Add a stub for drm_ioctl() so that compat32 links with kernels without drmkms.
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.30 2018/08/28 03:41:39 riastradh Exp $
d103 1
a103 1
file	external/bsd/drm2/drm/drm_stub.c	!drmkms
@


1.30
log
@Rework PCI and AGP conditionalization.

- Push drm_pci_set_unique into driver callback.
- Eliminate drm_pci_set_unique_hook.
- Gather all drm_agp_* functions into struct drm_agp_hooks.
- Replace the nonsensical old atomic garbage by serious locking.
- Make drm_agpsupport.c its own module.
- Eliminate NDRMKMS_PCI.
- Use NAGP from "agp.h" only in drm_module.c for horrible hack.
  => See comment in file for rationale.
- Always define CONFIG_PCI=1 and CONFIG_AGP=1.
- Always go through the drm_agp_* function hooks.
- Ifdef out nouveau agp stuff that doesn't go through drm_agp_*
  for reasons that I'm too frustrated to figure out tonight.
- pci_iomap no longer automagically does agp_i810_borrow.
  => Use drm_agp_borrow instead.
@
text
@d1 1
a1 1
#	$NetBSD$
d103 1
@


1.30.4.1
log
@Pull up following revision(s) (requested by jmcneill in ticket #607):

	sys/external/bsd/drm2/drm/files.drmkms: revision 1.33
	sys/external/bsd/drm2/dist/drm/drm_panel.c: revision 1.3

workaround netbsd incompatible LIST_HEAD
adapted from drm_bridge.c r1.3

build drm_panel.c w/ drmkms
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.30 2018/08/28 03:41:39 riastradh Exp $
a91 1
file	external/bsd/drm2/dist/drm/drm_panel.c	drmkms
@


1.29
log
@Unhook upstream drm_pci.c, apparently overridden by files.drmkms_pci.
@
text
@d41 1
@


1.28
log
@Draft support for drm prime.
@
text
@d91 1
a91 1
file	external/bsd/drm2/dist/drm/drm_pci.c	drmkms
@


1.27
log
@Define CONFIG_DRM_FBDEV_EMULATION=1 in generic drmkms code.

This was accidentally pulled in by i915drmkms, but we need it
generically or else we need to patch upstream differently.
@
text
@d94 1
a94 1
#file	external/bsd/drm2/dist/drm/drm_prime.c	drmkms  # XXX drm prime
@


1.26
log
@Sort.  Put CWARNFLAGS next to source lists.
@
text
@d37 1
@


1.25
log
@drm_fb_helper.c got lost in the merge, restore it.
@
text
@d14 2
d18 1
d20 2
a31 6
makeoptions 	drmkms 	"CWARNFLAGS.drm_atomic_helper.c"+="-Wno-shadow"
makeoptions 	drmkms 	"CWARNFLAGS.drm_crtc.c"+="-Wno-shadow"
makeoptions 	drmkms 	"CWARNFLAGS.drm_crtc.c"+="-Wno-missing-field-initializers"
makeoptions 	drmkms 	"CWARNFLAGS.drm_edid.c"+="-Wno-shadow"
makeoptions 	drmkms 	"CWARNFLAGS.drm_ioctl.c"+="-Wno-shadow"

a34 1
makeoptions	drmkms	CPPFLAGS+="-DCONFIG_FB=0"
d37 1
d39 1
d41 1
a42 1
file	external/bsd/drm2/drm/drm_gem_cma_helper.c	drmkms
d46 1
a46 1
# Generic, unaccelerated drm-based framebuffer.
d52 6
@


1.24
log
@Move drm_ioctl to drm_ioctl.c.

Previously it was in drm_drv.c upstream, which we overrode; then it
got moved to drm_ioctl.c and drm_drv.c got deleted, so we no longer
need to maintain a separate copy of the table in what we now call
drm_cdevsw.c.
@
text
@d70 1
@


1.23
log
@Patch up drm_atomic_helper.c.

- Mark unused variables as such.
  . Mistakes in local patches are likely to lead to unused variables,
    so keep this warning enabled.
- Build with -Wno-shadow.
  . Local patches aren't likely to cause this, so just suppress it.
- static plane_crtc_active
@
text
@d31 1
@


1.22
log
@We have a local override for drm_encoder_slave.c.
@
text
@d27 1
@


1.21
log
@Reorder header files to avoid drm_legacy.h lossage.
@
text
@d67 1
a67 1
file	external/bsd/drm2/dist/drm/drm_encoder_slave.c	drmkms
@


1.20
log
@Restore more locally overridden files.
@
text
@d16 1
a16 1
makeoptions 	drmkms	CPPFLAGS+="-I$S/external/bsd/drm2/dist"
d20 6
a25 1
makeoptions 	drmkms	CPPFLAGS+="-I$S/external/bsd/common/include"
@


1.19
log
@Rename drm_drv.c to drm_cdevsw.c.

Previously we overrode upstream's drm_drv.c altogether, and used
upstream's drm_stub.c subroutines.

But upstream deleted drm_drv.c and renamed drm_stub.c to drm_drv.c,
so we have to cope with that reshuffle.
@
text
@d64 1
a64 1
file	external/bsd/drm2/dist/drm/drm_fops.c	drmkms
d71 2
a72 2
file	external/bsd/drm2/dist/drm/drm_lock.c	drmkms
file	external/bsd/drm2/dist/drm/drm_memory.c	drmkms
d82 1
a82 1
file	external/bsd/drm2/dist/drm/drm_scatter.c	drmkms
d85 2
a86 2
file	external/bsd/drm2/dist/drm/drm_vm.c	drmkms
file	external/bsd/drm2/dist/drm/drm_vma_manager.c	drmkms
@


1.18
log
@Apply locally overridden files.
@
text
@d33 1
@


1.17
log
@Omit PCI files from files.drmkms.
@
text
@d51 1
a51 1
file	external/bsd/drm2/dist/drm/drm_cache.c	drmkms
d82 1
a82 1
file	external/bsd/drm2/dist/drm/drm_sysfs.c	drmkms
@


1.16
log
@regen files.drmkms
@
text
@d44 2
a45 2
file	external/bsd/drm2/dist/drm/ati_pcigart.c	drmkms
file	external/bsd/drm2/dist/drm/drm_agpsupport.c	drmkms
@


1.15
log
@Move local files to the top to make them more visible.
@
text
@d44 8
a51 4
file	external/bsd/drm2/dist/drm/drm_auth.c		drmkms
file	external/bsd/drm2/dist/drm/drm_buffer.c		drmkms
file	external/bsd/drm2/dist/drm/drm_bufs.c		drmkms
file	external/bsd/drm2/drm/drm_cache.c		drmkms
d53 1
a53 1
file	external/bsd/drm2/dist/drm/drm_crtc.c		drmkms
d55 7
a61 6
file	external/bsd/drm2/dist/drm/drm_dma.c		drmkms
file	external/bsd/drm2/dist/drm/drm_dp_helper.c	drmkms_i2c
file	external/bsd/drm2/drm/drm_drv.c			drmkms
file	external/bsd/drm2/dist/drm/drm_edid.c		drmkms_i2c
file	external/bsd/drm2/i2c/drm_encoder_slave.c	drmkms_i2c
file	external/bsd/drm2/dist/drm/drm_fb_helper.c	drmkms
d63 3
a65 3
file	external/bsd/drm2/drm/drm_fops.c		drmkms
file	external/bsd/drm2/dist/drm/drm_gem.c		drmkms
file	external/bsd/drm2/dist/drm/drm_global.c		drmkms
d67 9
a75 8
#file	external/bsd/drm2/dist/drm/drm_info.c		drmkms
#file	external/bsd/drm2/dist/drm/drm_ioc32.c		drmkms
file	external/bsd/drm2/dist/drm/drm_ioctl.c		drmkms
file	external/bsd/drm2/dist/drm/drm_irq.c		drmkms
file	external/bsd/drm2/drm/drm_lock.c		drmkms
file	external/bsd/drm2/drm/drm_memory.c		drmkms
file	external/bsd/drm2/dist/drm/drm_mm.c		drmkms
file	external/bsd/drm2/dist/drm/drm_modes.c		drmkms
d78 1
a78 1
#file	external/bsd/drm2/dist/drm/drm_prime.c		drmkms
d80 6
a85 6
file	external/bsd/drm2/dist/drm/drm_rect.c		drmkms
file	external/bsd/drm2/drm/drm_scatter.c		drmkms
file	external/bsd/drm2/dist/drm/drm_stub.c		drmkms
file	external/bsd/drm2/drm/drm_sysfs.c		drmkms
file	external/bsd/drm2/drm/drm_vm.c			drmkms
file	external/bsd/drm2/drm/drm_vma_manager.c		drmkms
@


1.14
log
@Implement the DRM GEM/CMA helpers. The implementation has been extracted
from our tegra DRM driver, but generalized for use with other drivers.
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.13 2016/02/24 22:04:15 skrll Exp $
d33 11
a79 11

file	external/bsd/drm2/drm/drm_gem_vm.c		drmkms
file	external/bsd/drm2/drm/drm_gem_cma_helper.c	drmkms
file	external/bsd/drm2/drm/drm_module.c		drmkms
file	external/bsd/drm2/drm/drm_sysctl.c		drmkms

# Generic, unaccelerated drm-based framebuffer.
define	drmfb: genfb
file	external/bsd/drm2/drm/drmfb.c			drmfb

include "external/bsd/drm2/ttm/files.ttm"	
@


1.14.4.1
log
@Sync with HEAD
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.30 2018/08/28 03:41:39 riastradh Exp $
a13 2

# Overrides first.
d16 1
a16 4

makeoptions 	drmkms	CPPFLAGS+="-I$S/external/bsd/common/include"

# Then upstream.
d20 1
d22 3
a24 5
# Must come last because some header file names are repeated in
# dist/drm (I'm looking ta you, drm_legacy.h), while others sometimes
# explicitly write <uapi/...>.  (Maybe that should have been imported
# under dist/include/uapi rather than dist/uapi.)
makeoptions 	drmkms	CPPFLAGS+="-I$S/external/bsd/drm2/dist"
d29 1
a31 10
makeoptions	drmkms	CPPFLAGS+="-DCONFIG_DRM_FBDEV_EMULATION=1"
makeoptions	drmkms	CPPFLAGS+="-DCONFIG_FB=0"

# NetBSD additions.
file	external/bsd/drm2/drm/drm_agp_hook.c		drmkms
file	external/bsd/drm2/drm/drm_cdevsw.c		drmkms
file	external/bsd/drm2/drm/drm_gem_cma_helper.c	drmkms
file	external/bsd/drm2/drm/drm_gem_vm.c		drmkms
file	external/bsd/drm2/drm/drm_module.c		drmkms
file	external/bsd/drm2/drm/drm_sysctl.c		drmkms
d33 4
a36 20
# Generic, unaccelerated kms framebuffer.
define	drmfb: genfb
file	external/bsd/drm2/drm/drmfb.c			drmfb

include "external/bsd/drm2/ttm/files.ttm"

makeoptions 	drmkms 	"CWARNFLAGS.drm_atomic_helper.c"+="-Wno-shadow"
makeoptions 	drmkms 	"CWARNFLAGS.drm_crtc.c"+="-Wno-missing-field-initializers"
makeoptions 	drmkms 	"CWARNFLAGS.drm_crtc.c"+="-Wno-shadow"
makeoptions 	drmkms 	"CWARNFLAGS.drm_edid.c"+="-Wno-shadow"
makeoptions 	drmkms 	"CWARNFLAGS.drm_ioctl.c"+="-Wno-shadow"

#file	external/bsd/drm2/dist/drm/ati_pcigart.c	drmkms  # drmkms_pci
#file	external/bsd/drm2/dist/drm/drm_agpsupport.c	drmkms  # drmkms_pci
file	external/bsd/drm2/dist/drm/drm_atomic.c	drmkms
file	external/bsd/drm2/dist/drm/drm_atomic_helper.c	drmkms
file	external/bsd/drm2/dist/drm/drm_auth.c	drmkms
file	external/bsd/drm2/dist/drm/drm_bridge.c	drmkms
file	external/bsd/drm2/dist/drm/drm_bufs.c	drmkms
file	external/bsd/drm2/drm/drm_cache.c	drmkms
d38 1
a38 1
file	external/bsd/drm2/dist/drm/drm_crtc.c	drmkms
d40 5
a44 7
file	external/bsd/drm2/dist/drm/drm_debugfs.c	drmkms
file	external/bsd/drm2/dist/drm/drm_dma.c	drmkms
file	external/bsd/drm2/dist/drm/drm_dp_helper.c	drmkms
file	external/bsd/drm2/dist/drm/drm_dp_mst_topology.c	drmkms
file	external/bsd/drm2/dist/drm/drm_drv.c	drmkms
file	external/bsd/drm2/dist/drm/drm_edid.c	drmkms
file	external/bsd/drm2/i2c/drm_encoder_slave.c	drmkms
d47 3
a49 3
file	external/bsd/drm2/drm/drm_fops.c	drmkms
file	external/bsd/drm2/dist/drm/drm_gem.c	drmkms
file	external/bsd/drm2/dist/drm/drm_global.c	drmkms
d51 8
a58 9
#file	external/bsd/drm2/dist/drm/drm_info.c	drmkms
file	external/bsd/drm2/dist/drm/drm_ioctl.c	drmkms
file	external/bsd/drm2/dist/drm/drm_irq.c	drmkms
file	external/bsd/drm2/drm/drm_lock.c	drmkms
file	external/bsd/drm2/drm/drm_memory.c	drmkms
file	external/bsd/drm2/dist/drm/drm_mm.c	drmkms
file	external/bsd/drm2/dist/drm/drm_modes.c	drmkms
file	external/bsd/drm2/dist/drm/drm_modeset_lock.c	drmkms
#file	external/bsd/drm2/dist/drm/drm_pci.c	drmkms	# drmkms_pci
d61 1
a61 1
file	external/bsd/drm2/dist/drm/drm_prime.c	drmkms
d63 17
a79 6
file	external/bsd/drm2/dist/drm/drm_rect.c	drmkms
file	external/bsd/drm2/drm/drm_scatter.c	drmkms
file	external/bsd/drm2/drm/drm_sysfs.c	drmkms
file	external/bsd/drm2/dist/drm/drm_trace_points.c	drmkms
file	external/bsd/drm2/drm/drm_vm.c	drmkms
file	external/bsd/drm2/drm/drm_vma_manager.c	drmkms
@


1.14.4.2
log
@Merge changes from current as of 20200406
@
text
@d1 1
a1 1
#	$NetBSD$
a54 1
makeoptions 	drmkms 	"CWARNFLAGS.drm_bufs.c"+="-Wno-pointer-arith"
a55 1
makeoptions 	drmkms 	"CWARNFLAGS.drm_crtc.c"+="-Wno-pointer-arith"
a56 1
makeoptions 	drmkms 	"CWARNFLAGS.drm_dp_helper.c"+="-Wno-pointer-arith"
a91 1
file	external/bsd/drm2/dist/drm/drm_panel.c	drmkms
@


1.14.4.3
log
@Mostly merge changes from HEAD upto 20200411
@
text
@a106 1
file	external/bsd/drm2/drm/drm_stub.c	!drmkms & !drmbase
@


1.14.2.1
log
@Sync with HEAD

Resolve a couple of conflicts (result of the uimin/uimax changes)
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.30 2018/08/28 03:41:39 riastradh Exp $
a13 2

# Overrides first.
d16 1
a16 4

makeoptions 	drmkms	CPPFLAGS+="-I$S/external/bsd/common/include"

# Then upstream.
d20 1
d22 3
a24 5
# Must come last because some header file names are repeated in
# dist/drm (I'm looking ta you, drm_legacy.h), while others sometimes
# explicitly write <uapi/...>.  (Maybe that should have been imported
# under dist/include/uapi rather than dist/uapi.)
makeoptions 	drmkms	CPPFLAGS+="-I$S/external/bsd/drm2/dist"
d29 1
a31 10
makeoptions	drmkms	CPPFLAGS+="-DCONFIG_DRM_FBDEV_EMULATION=1"
makeoptions	drmkms	CPPFLAGS+="-DCONFIG_FB=0"

# NetBSD additions.
file	external/bsd/drm2/drm/drm_agp_hook.c		drmkms
file	external/bsd/drm2/drm/drm_cdevsw.c		drmkms
file	external/bsd/drm2/drm/drm_gem_cma_helper.c	drmkms
file	external/bsd/drm2/drm/drm_gem_vm.c		drmkms
file	external/bsd/drm2/drm/drm_module.c		drmkms
file	external/bsd/drm2/drm/drm_sysctl.c		drmkms
d33 4
a36 20
# Generic, unaccelerated kms framebuffer.
define	drmfb: genfb
file	external/bsd/drm2/drm/drmfb.c			drmfb

include "external/bsd/drm2/ttm/files.ttm"

makeoptions 	drmkms 	"CWARNFLAGS.drm_atomic_helper.c"+="-Wno-shadow"
makeoptions 	drmkms 	"CWARNFLAGS.drm_crtc.c"+="-Wno-missing-field-initializers"
makeoptions 	drmkms 	"CWARNFLAGS.drm_crtc.c"+="-Wno-shadow"
makeoptions 	drmkms 	"CWARNFLAGS.drm_edid.c"+="-Wno-shadow"
makeoptions 	drmkms 	"CWARNFLAGS.drm_ioctl.c"+="-Wno-shadow"

#file	external/bsd/drm2/dist/drm/ati_pcigart.c	drmkms  # drmkms_pci
#file	external/bsd/drm2/dist/drm/drm_agpsupport.c	drmkms  # drmkms_pci
file	external/bsd/drm2/dist/drm/drm_atomic.c	drmkms
file	external/bsd/drm2/dist/drm/drm_atomic_helper.c	drmkms
file	external/bsd/drm2/dist/drm/drm_auth.c	drmkms
file	external/bsd/drm2/dist/drm/drm_bridge.c	drmkms
file	external/bsd/drm2/dist/drm/drm_bufs.c	drmkms
file	external/bsd/drm2/drm/drm_cache.c	drmkms
d38 1
a38 1
file	external/bsd/drm2/dist/drm/drm_crtc.c	drmkms
d40 5
a44 7
file	external/bsd/drm2/dist/drm/drm_debugfs.c	drmkms
file	external/bsd/drm2/dist/drm/drm_dma.c	drmkms
file	external/bsd/drm2/dist/drm/drm_dp_helper.c	drmkms
file	external/bsd/drm2/dist/drm/drm_dp_mst_topology.c	drmkms
file	external/bsd/drm2/dist/drm/drm_drv.c	drmkms
file	external/bsd/drm2/dist/drm/drm_edid.c	drmkms
file	external/bsd/drm2/i2c/drm_encoder_slave.c	drmkms
d47 3
a49 3
file	external/bsd/drm2/drm/drm_fops.c	drmkms
file	external/bsd/drm2/dist/drm/drm_gem.c	drmkms
file	external/bsd/drm2/dist/drm/drm_global.c	drmkms
d51 8
a58 9
#file	external/bsd/drm2/dist/drm/drm_info.c	drmkms
file	external/bsd/drm2/dist/drm/drm_ioctl.c	drmkms
file	external/bsd/drm2/dist/drm/drm_irq.c	drmkms
file	external/bsd/drm2/drm/drm_lock.c	drmkms
file	external/bsd/drm2/drm/drm_memory.c	drmkms
file	external/bsd/drm2/dist/drm/drm_mm.c	drmkms
file	external/bsd/drm2/dist/drm/drm_modes.c	drmkms
file	external/bsd/drm2/dist/drm/drm_modeset_lock.c	drmkms
#file	external/bsd/drm2/dist/drm/drm_pci.c	drmkms	# drmkms_pci
d61 1
a61 1
file	external/bsd/drm2/dist/drm/drm_prime.c	drmkms
d63 17
a79 6
file	external/bsd/drm2/dist/drm/drm_rect.c	drmkms
file	external/bsd/drm2/drm/drm_scatter.c	drmkms
file	external/bsd/drm2/drm/drm_sysfs.c	drmkms
file	external/bsd/drm2/dist/drm/drm_trace_points.c	drmkms
file	external/bsd/drm2/drm/drm_vm.c	drmkms
file	external/bsd/drm2/drm/drm_vma_manager.c	drmkms
@


1.13
log
@Move linux_work.c and workqueue.h from sys/external/bsd/drm2 to
sys/external/common so that they can be used by others.

LGTM from riastradh@@

These should really live outside sys/external, but that can be decided
later
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.12 2015/08/20 21:41:12 skrll Exp $
d71 1
d79 1
a79 1
include "external/bsd/drm2/ttm/files.ttm"
@


1.12
log
@Tweak IS_ENABLED to allow CONFIG_FOO values.

No functional change to drm2.

LGTM from riastradh@@
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.11 2015/03/05 17:50:41 riastradh Exp $
d11 1
a11 1
define	drmkms: drmkms_linux, drmkms_i2c
@


1.11
log
@Factor generic parts of intelfb out into a drmfb.

Adapting radeondrmkmsfb should not be hard.

This will make nouveaufb easier too.
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.10 2015/03/05 17:42:48 riastradh Exp $
d29 4
@


1.10
log
@Rewrite drm_encoder_slave.c, as nouveau will need.
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.9 2014/11/12 02:24:40 christos Exp $
d70 4
@


1.9
log
@Add __link_set based code to automatically convert the linux module parameters
into sysctls.
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.8 2014/09/14 19:06:00 riastradh Exp $
d40 1
a40 1
#file	external/bsd/drm2/dist/drm/drm_encoder_slave.c	drmkms_i2c
@


1.9.2.1
log
@Sync with HEAD
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.11 2015/03/05 17:50:41 riastradh Exp $
d40 1
a40 1
file	external/bsd/drm2/i2c/drm_encoder_slave.c	drmkms_i2c
a69 4
# Generic, unaccelerated drm-based framebuffer.
define	drmfb: genfb
file	external/bsd/drm2/drm/drmfb.c			drmfb

@


1.9.2.2
log
@Sync with HEAD
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.9.2.1 2015/04/06 15:18:17 skrll Exp $
a28 4
makeoptions	drmkms	CPPFLAGS+="-DCONFIG_FB=0"
makeoptions	drmkms	CPPFLAGS+="-DCONFIG_BACKLIGHT_CLASS_DEVICE=0"
makeoptions	drmkms	CPPFLAGS+="-DCONFIG_BACKLIGHT_CLASS_DEVICE_MODULE=0"

@


1.9.2.3
log
@Sync with HEAD
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.9.2.2 2015/09/22 12:06:05 skrll Exp $
d11 1
a11 1
define	drmkms: drmkms_linux, drmkms_i2c, linux
@


1.8
log
@Split drm ttm config into a separate file.
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.7 2014/07/16 20:59:57 riastradh Exp $
d68 1
@


1.7
log
@First whack at radeon driver.

No hardware to test yet, but it builds.
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.6 2014/07/16 20:56:25 riastradh Exp $
d69 1
a69 24
# TTM, the texture and tiling manager.

define	drmkms_ttm: drmkms

file	external/bsd/drm2/ttm/ttm_agp_backend.c			drmkms_ttm
file	external/bsd/drm2/dist/drm/ttm/ttm_memory.c		drmkms_ttm
file	external/bsd/drm2/dist/drm/ttm/ttm_tt.c			drmkms_ttm
file	external/bsd/drm2/dist/drm/ttm/ttm_bo.c			drmkms_ttm
file	external/bsd/drm2/dist/drm/ttm/ttm_bo_util.c		drmkms_ttm
file	external/bsd/drm2/ttm/ttm_bo_vm.c			drmkms_ttm
# Linux module goo.
#file	external/bsd/drm2/dist/drm/ttm/ttm_module.c		drmkms_ttm
# Used only by vmwgfx.  Needs porting for rcu -> pserialize.
#file	external/bsd/drm2/dist/drm/ttm/ttm_object.c		drmkms_ttm
# Used only by vmwgfx.  Needs porting.  Does silly things like SIGKILL.
#file	external/bsd/drm2/dist/drm/ttm/ttm_lock.c		drmkms_ttm
file	external/bsd/drm2/dist/drm/ttm/ttm_execbuf_util.c	drmkms_ttm
# Replaced locally by ttm_bus_dma.c.
#file	external/bsd/drm2/dist/drm/ttm/ttm_page_alloc.c		drmkms_ttm
file	external/bsd/drm2/dist/drm/ttm/ttm_bo_manager.c		drmkms_ttm
# Replaced locally by ttm_bus_dma.c.
#file	external/bsd/drm2/dist/drm/ttm/ttm_page_alloc_dma.c	drmkms_ttm

file	external/bsd/drm2/ttm/ttm_bus_dma.c			drmkms_ttm
@


1.7.2.1
log
@Pull up following revision(s) (requested by chs in ticket #401):
	distrib/sets/lists/modules/md.amd64: revisions 1.46, 1.47 via patch
	distrib/sets/lists/modules/md.i386: revisions 1.49, 1.50
	sys/dev/ic/pcdisplayvar.h: revision 1.20
	sys/dev/ic/vgavar.h: revision 1.32
	sys/external/bsd/drm/dist/bsd-core/drm_drv.c: revision 1.26
	sys/external/bsd/drm2/dist/drm/drm_agpsupport.c: revisions 1.5, 1.6
	sys/external/bsd/drm2/dist/drm/drm_pci.c: revisions 1.4, 1.5
	sys/external/bsd/drm2/dist/drm/drm_stub.c: revisions 1.6-1.8
	sys/external/bsd/drm2/dist/drm/i915/i915_drv.h: revision 1.11
	sys/external/bsd/drm2/dist/drm/radeon/cik.c: revision 1.3
	sys/external/bsd/drm2/dist/drm/radeon/ni.c: revision 1.3
	sys/external/bsd/drm2/dist/drm/radeon/si.c: revision 1.3
	sys/external/bsd/drm2/dist/include/drm/drmP.h: revisions 1.8, 1.9
	sys/external/bsd/drm2/dist/include/drm/drm_agpsupport.h: revisions 1.3, 1.4
	sys/external/bsd/drm2/drm/drm_drv.c: revision 1.11
	sys/external/bsd/drm2/drm/drm_module.c: revision 1.9
	sys/external/bsd/drm2/drm/drm_sysctl.c: revisions 1.1-1.4
	sys/external/bsd/drm2/drm/drm_vm.c: revision 1.7
	sys/external/bsd/drm2/drm/files.drmkms: revisions 1.8, 1.9
	sys/external/bsd/drm2/i915drm/files.i915drmkms: revision 1.9
	sys/external/bsd/drm2/i915drm/i915_module.c: revisions 1.4, 1.5
	sys/external/bsd/drm2/include/drm/drm_sysctl.h: revisions 1.1, 1.2
	sys/external/bsd/drm2/include/linux/hdmi.h: revisions 1.3-1.5
	sys/external/bsd/drm2/include/linux/module.h: revision 1.5
	sys/external/bsd/drm2/include/linux/moduleparam.h: revisions 1.3, 1.4
	sys/external/bsd/drm2/include/linux/pci.h: revision 1.11
	sys/external/bsd/drm2/linux/linux_module.c: revision 1.5
	sys/external/bsd/drm2/nouveau/files.nouveau: revision 1.4
	sys/external/bsd/drm2/nouveau/nouveau_module.c: revision 1.3
	sys/external/bsd/drm2/pci/drm_pci.c: revision 1.8
	sys/external/bsd/drm2/pci/drm_pci_module.c: revision 1.3
	sys/external/bsd/drm2/radeon/radeon_module.c: revision 1.3
	sys/external/bsd/drm2/ttm/files.ttm: revision 1.1
	sys/modules/drm2pci/Makefile: file removal
	sys/modules/drmkms/Makefile: revisions 1.4-1.7
	sys/modules/drmkms_linux/Makefile: revision 1.5
	sys/modules/drmkms_pci/Makefile: revisions 1.3, 1.4
	sys/modules/i915drmkms/Makefile: revisions 1.5-1.7
Split drm ttm config into a separate file.
--
Fix module build of drmkms_linux.
--
Remove vestigial drm2pci module, replaced by drmkms_pci.
--
fix the module class.
--
add the drmkms modules
--
make a drm_agp_destroy() function to resolve the circular dependency between
drmkms and drmkms_pci
--
finalize the idr code.
--
add drm_agp_destroy
--
fix drmkms module path for xen.
--
fix build failure.
/tmp/bracket/build/2014.11.10.22.43.46-i386/src/sys/external/bsd/drm2/include/linux/pci.h:36:20: fatal error: acpica.h: No such file or directory
--
make this work: add agpsupport and sysctl code
--
move agpsupport to drmkms to avoid circular dependencies.
--
turn on dynamic ldscript creation to handle link set symbol definitions
used in the automatic sysctl creation.
--
Add __link_set based code to automatically convert the linux module parameters
into sysctls.
--
this module needs MKLDSCRIPT too now
--
more _KERNEL_OPT
--
prettify and add to all the modules that have it.
--
fix description setting.
--
Adjust flags to allow building with clang.
--
Fix build with clang.
--
Drop casts in favour of expressions that actually give the right
pointer.
--
Move all PCI/AGP code back to drmkms_pci module where it belongs.
--
Use correct length for hdmi_infoframe_header_pack in <linux/hdmi.h>.
Fixes PR kern/49411.
--
Back out previous, fix PR kern/49411 correctly.
frame->header.length is not initialized in the vendor packet case.
Instead, make hdmi_infoframe_header_pack take the packet length and
subtract the size of the header when packing the header.
(Could make it take the payload length instead, but for callers it is
more convenient to have a name for the whole packet length.)
--
Fix bounds checking in hdmi_infoframe_header_pack (PR kern/49411).
--
Trivial build fix for no options SYSCTL_INCLUDE_DESCR case, to
avoid -Werror.
OK christos@@ and riastradh@@
--
fix debugging compilation (ALL kernel)
--
nouveau_nv50_fence.c needs -Wno-shadow.
--
fix a confusion between dev_t and devmajor_t, and include the primary
minor when calling makedev().
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.7 2014/07/16 20:59:57 riastradh Exp $
a67 1
file	external/bsd/drm2/drm/drm_sysctl.c		drmkms
d69 24
a92 1
include "external/bsd/drm2/ttm/files.ttm"
@


1.7.2.2
log
@Pull up following revision(s) (requested by mrg in ticket #573):
	sys/external/bsd/common/include/linux/kernel.h: 1.5, 1.6
	sys/external/bsd/drm2/dist/drm/drm_ioctl.c: 1.4
	sys/external/bsd/drm2/dist/drm/drm_irq.c: 1.6-1.8
	sys/external/bsd/drm2/dist/drm/i915/i915_dma.c: 1.13-1.15
	sys/external/bsd/drm2/dist/drm/i915/i915_gem.c: 1.23-1.27
	sys/external/bsd/drm2/dist/drm/i915/i915_gem_execbuffer.c: 1.5
	sys/external/bsd/drm2/dist/drm/i915/intel_display.c: 1.14, 1.15
	sys/external/bsd/drm2/dist/drm/i915/intel_dp.c: 1.10
	sys/external/bsd/drm2/dist/drm/i915/intel_drv.h: 1.8
	sys/external/bsd/drm2/dist/drm/i915/intel_i2c.c: 1.8-1.13
	sys/external/bsd/drm2/dist/drm/i915/intel_pm.c: 1.6
	sys/external/bsd/drm2/dist/drm/i915/intel_ringbuffer.c: 1.5, 1.6
	sys/external/bsd/drm2/dist/drm/nouveau/core/engine/device/nouveau_engine_device_base.c: 1.4
	sys/external/bsd/drm2/dist/drm/nouveau/core/engine/fifo/nouveau_engine_fifo_nvc0.c: 1.3, 1.4
	sys/external/bsd/drm2/dist/drm/nouveau/core/engine/fifo/nouveau_engine_fifo_nve0.c: 1.3, 1.4
	sys/external/bsd/drm2/dist/drm/nouveau/core/include/core/device.h: 1.4
	sys/external/bsd/drm2/dist/drm/nouveau/core/include/subdev/mc.h: 1.2
	sys/external/bsd/drm2/dist/drm/nouveau/core/include/subdev/pwr.h: 1.3, 1.4
	sys/external/bsd/drm2/dist/drm/nouveau/core/os.h: 1.4, 1.5
	sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/bios/nouveau_subdev_bios_base.c: 1.2
	sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/bios/nouveau_subdev_bios_pll.c: 1.2
	sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/clock/nouveau_subdev_clock_base.c: 1.2
	sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/clock/nouveau_subdev_clock_nv50.c: 1.2
	sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/devinit/fbmem.h: 1.2
	sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/devinit/nouveau_subdev_devinit_nv04.c: 1.2
	sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/fb/nouveau_subdev_fb_nv50.c: 1.2
	sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/fb/nouveau_subdev_fb_nvc0.c: 1.2
	sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/fb/nv50.h: 1.2
	sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/fb/nvc0.h: 1.2
	sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/mc/nouveau_subdev_mc_base.c: 1.2, 1.3
	sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/mxm/nouveau_subdev_mxm_nv50.c: 1.2
	sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/pwr/nouveau_subdev_pwr_base.c: 1.3, 1.4
	sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/therm/nouveau_subdev_therm_ic.c: 1.2
	sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/timer/nouveau_subdev_timer_nv04.c: 1.2
	sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/vm/nouveau_subdev_vm_base.c: 1.2
	sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/vm/nouveau_subdev_vm_nv04.c: 1.2
	sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/vm/nouveau_subdev_vm_nv44.c: 1.2
	sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/vm/nv04.h: 1.2
	sys/external/bsd/drm2/dist/drm/nouveau/nouveau_bo.h: 1.3
	sys/external/bsd/drm2/dist/drm/nouveau/nouveau_drm.c: 1.4, 1.5
	sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fbcon.c: 1.2
	sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nv50_display.c: 1.3
	sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nv84_fence.c: 1.2
	sys/external/bsd/drm2/dist/drm/nouveau/nouveau_ttm.c: 1.3
	sys/external/bsd/drm2/dist/drm/nouveau/nouveau_ttm.h: 1.2
	sys/external/bsd/drm2/dist/drm/nouveau/nouveau_vga.h: 1.2
	sys/external/bsd/drm2/dist/drm/radeon/radeon_fence.c: 1.6-1.8
	sys/external/bsd/drm2/dist/drm/radeon/radeon_pm.c: 1.3
	sys/external/bsd/drm2/dist/drm/radeon/rs400.c: 1.3
	sys/external/bsd/drm2/dist/drm/via/via_dmablit.c: 1.3, 1.4
	sys/external/bsd/drm2/dist/drm/via/via_drv.h: 1.3
	sys/external/bsd/drm2/dist/drm/via/via_irq.c: 1.3, 1.4
	sys/external/bsd/drm2/dist/drm/via/via_video.c: 1.3, 1.4
	sys/external/bsd/drm2/dist/include/drm/drmP.h: 1.10
	sys/external/bsd/drm2/dist/include/drm/drm_crtc.h: 1.4
	sys/external/bsd/drm2/dist/include/drm/drm_modes.h: 1.3
	sys/external/bsd/drm2/dist/uapi/drm/i915_drm.h: 1.2
	sys/external/bsd/drm2/drm/drm_cache.c: 1.4-1.6
	sys/external/bsd/drm2/drm/drm_drv.c: 1.14
	sys/external/bsd/drm2/drm/drm_module.c: 1.10
	sys/external/bsd/drm2/drm/drm_sysctl.c: 1.5
	sys/external/bsd/drm2/drm/drm_vma_manager.c: 1.2
	sys/external/bsd/drm2/drm/drmfb.c: 1.1
	sys/external/bsd/drm2/drm/files.drmkms: 1.10, 1.11
	sys/external/bsd/drm2/i2c/drm_encoder_slave.c: 1.1
	sys/external/bsd/drm2/i915drm/files.i915drmkms: 1.7, 1.10
	sys/external/bsd/drm2/i915drm/intelfb.c: 1.11, 1.12
	sys/external/bsd/drm2/include/asm/io.h: 1.4
	sys/external/bsd/drm2/include/asm/unaligned.h: 1.2, 1.3
	sys/external/bsd/drm2/include/drm/drm_encoder_slave.h: 1.1
	sys/external/bsd/drm2/include/drm/drm_wait_netbsd.h: 1.7-1.11
	sys/external/bsd/drm2/include/drm/drmfb.h: 1.1
	sys/external/bsd/drm2/include/drm/drmfb_pci.h: 1.1, 1.2
	sys/external/bsd/drm2/include/linux/bitops.h: 1.9
	sys/external/bsd/drm2/include/linux/i2c.h: 1.7, 1.8
	sys/external/bsd/drm2/include/linux/io-mapping.h: 1.5
	sys/external/bsd/drm2/include/linux/moduleparam.h: 1.5
	sys/external/bsd/drm2/include/linux/pci.h: 1.12-1.15
	sys/external/bsd/drm2/include/linux/pm.h: 1.4
	sys/external/bsd/drm2/include/linux/reboot.h: 1.2
	sys/external/bsd/drm2/include/linux/slab.h: 1.5
	sys/external/bsd/drm2/include/linux/string.h: 1.4
	sys/external/bsd/drm2/include/linux/vgaarb.h: 1.3
	sys/external/bsd/drm2/include/linux/ww_mutex.h: 1.10
	sys/external/bsd/drm2/linux/files.drmkms_linux: 1.8
	sys/external/bsd/drm2/linux/linux_i2c.c: 1.3
	sys/external/bsd/drm2/linux/linux_ww_mutex.c: 1.1
	sys/external/bsd/drm2/nouveau/files.nouveau: 1.5-1.8
	sys/external/bsd/drm2/nouveau/nouveau_pci.c: 1.1-1.3
	sys/external/bsd/drm2/nouveau/nouveau_pci.h: 1.1
	sys/external/bsd/drm2/nouveau/nouveau_sysfs.c: 1.1
	sys/external/bsd/drm2/nouveau/nouveau_vga.c: 1.1
	sys/external/bsd/drm2/nouveau/nouveaufb.c: 1.1
	sys/external/bsd/drm2/nouveau/nouveaufb.h: 1.1
	sys/external/bsd/drm2/pci/drm_pci.c: 1.10-1.12
	sys/external/bsd/drm2/pci/drm_pci_module.c: 1.4
	sys/external/bsd/drm2/pci/drmfb_pci.c: 1.1-1.3
	sys/external/bsd/drm2/pci/files.drmkms_pci: 1.5
	sys/external/bsd/drm2/radeon/radeon_pci.c: 1.5-1.7
	sys/modules/drmkms/Makefile: 1.8, 1.9
	sys/modules/drmkms_linux/Makefile: 1.6
	sys/modules/drmkms_pci/Makefile: 1.5
sync drm2 with HEAD.
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.7.2.1 2015/01/11 05:59:17 snj Exp $
d40 1
a40 1
file	external/bsd/drm2/i2c/drm_encoder_slave.c	drmkms_i2c
a69 4
# Generic, unaccelerated drm-based framebuffer.
define	drmfb: genfb
file	external/bsd/drm2/drm/drmfb.c			drmfb

@


1.7.2.3
log
@Pull up following revision(s) (requested by skrll in ticket #1395):
	share/man/man4/axe.4: netbsd-7-nhusb
	share/man/man4/axen.4: netbsd-7-nhusb
	share/man/man4/cdce.4: netbsd-7-nhusb
	share/man/man4/uaudio.4: netbsd-7-nhusb
	share/man/man4/ucom.4: netbsd-7-nhusb
	share/man/man4/uep.4: netbsd-7-nhusb
	share/man/man4/urtw.4: netbsd-7-nhusb
	share/man/man4/usb.4: netbsd-7-nhusb
	share/man/man4/uyap.4: netbsd-7-nhusb
	share/man/man4/xhci.4: netbsd-7-nhusb
	share/man/man9/usbdi.9: netbsd-7-nhusb
	sys/arch/amd64/conf/ALL: netbsd-7-nhusb
	sys/arch/amd64/conf/GENERIC: netbsd-7-nhusb
	sys/arch/amiga/dev/slhci_zbus.c: netbsd-7-nhusb
	sys/arch/arm/allwinner/awin_otg.c: netbsd-7-nhusb
	sys/arch/arm/allwinner/awin_usb.c: netbsd-7-nhusb
	sys/arch/arm/amlogic/amlogic_dwctwo.c: netbsd-7-nhusb
	sys/arch/arm/at91/at91ohci.c: netbsd-7-nhusb
	sys/arch/arm/broadcom/bcm2835_dwctwo.c: netbsd-7-nhusb
	sys/arch/arm/broadcom/bcm53xx_usb.c: netbsd-7-nhusb
	sys/arch/arm/ep93xx/epohci.c: netbsd-7-nhusb
	sys/arch/arm/gemini/obio_ehci.c: netbsd-7-nhusb
	sys/arch/arm/imx/files.imx23: netbsd-7-nhusb
	sys/arch/arm/imx/imxusb.c: netbsd-7-nhusb
	sys/arch/arm/imx/imxusbreg.h: netbsd-7-nhusb
	sys/arch/arm/omap/obio_ohci.c: netbsd-7-nhusb
	sys/arch/arm/omap/omap3_ehci.c: netbsd-7-nhusb
	sys/arch/arm/omap/omapl1x_ohci.c: netbsd-7-nhusb
	sys/arch/arm/omap/tiotg.c: netbsd-7-nhusb
	sys/arch/arm/s3c2xx0/ohci_s3c24x0.c: netbsd-7-nhusb
	sys/arch/arm/samsung/exynos_usb.c: netbsd-7-nhusb
	sys/arch/arm/xscale/pxa2x0_ohci.c: netbsd-7-nhusb
	sys/arch/arm/zynq/zynq_usb.c: netbsd-7-nhusb
	sys/arch/hpcarm/dev/nbp_slhci.c: netbsd-7-nhusb
	sys/arch/hpcmips/dev/plumohci.c: netbsd-7-nhusb
	sys/arch/i386/conf/ALL: netbsd-7-nhusb
	sys/arch/i386/conf/GENERIC: netbsd-7-nhusb
	sys/arch/i386/pci/gcscehci.c: netbsd-7-nhusb
	sys/arch/luna68k/conf/GENERIC: netbsd-7-nhusb
	sys/arch/mips/adm5120/dev/ahci.c: netbsd-7-nhusb
	sys/arch/mips/adm5120/dev/ahcivar.h: netbsd-7-nhusb
	sys/arch/mips/alchemy/dev/ohci_aubus.c: netbsd-7-nhusb
	sys/arch/mips/atheros/dev/ehci_arbus.c: netbsd-7-nhusb
	sys/arch/mips/atheros/dev/ohci_arbus.c: netbsd-7-nhusb
	sys/arch/mips/conf/files.adm5120: netbsd-7-nhusb
	sys/arch/mips/ralink/ralink_ehci.c: netbsd-7-nhusb
	sys/arch/mips/ralink/ralink_ohci.c: netbsd-7-nhusb
	sys/arch/mips/rmi/rmixl_ehci.c: netbsd-7-nhusb
	sys/arch/mips/rmi/rmixl_ohci.c: netbsd-7-nhusb
	sys/arch/playstation2/dev/ohci_sbus.c: netbsd-7-nhusb
	sys/arch/powerpc/booke/dev/pq3ehci.c: netbsd-7-nhusb
	sys/arch/powerpc/ibm4xx/dev/dwctwo_plb.c: netbsd-7-nhusb
	sys/arch/x68k/dev/slhci_intio.c: netbsd-7-nhusb
	sys/conf/files: netbsd-7-nhusb
	sys/dev/cardbus/ehci_cardbus.c: netbsd-7-nhusb
	sys/dev/cardbus/ohci_cardbus.c: netbsd-7-nhusb
	sys/dev/cardbus/uhci_cardbus.c: netbsd-7-nhusb
	sys/dev/ic/sl811hs.c: netbsd-7-nhusb
	sys/dev/ic/sl811hsvar.h: netbsd-7-nhusb
	sys/dev/isa/slhci_isa.c: netbsd-7-nhusb
	sys/dev/marvell/ehci_mv.c: netbsd-7-nhusb
	sys/dev/pci/ehci_pci.c: netbsd-7-nhusb
	sys/dev/pci/ohci_pci.c: netbsd-7-nhusb
	sys/dev/pci/uhci_pci.c: netbsd-7-nhusb
	sys/dev/pci/xhci_pci.c: netbsd-7-nhusb
	sys/dev/pcmcia/slhci_pcmcia.c: netbsd-7-nhusb
	sys/dev/usb/Makefile.usbdevs: netbsd-7-nhusb
	sys/dev/usb/TODO: netbsd-7-nhusb
	sys/dev/usb/TODO.usbmp: netbsd-7-nhusb
	sys/dev/usb/aubtfwl.c: netbsd-7-nhusb
	sys/dev/usb/auvitek.c: netbsd-7-nhusb
	sys/dev/usb/auvitek_audio.c: netbsd-7-nhusb
	sys/dev/usb/auvitek_dtv.c: netbsd-7-nhusb
	sys/dev/usb/auvitek_i2c.c: netbsd-7-nhusb
	sys/dev/usb/auvitek_video.c: netbsd-7-nhusb
	sys/dev/usb/auvitekvar.h: netbsd-7-nhusb
	sys/dev/usb/ehci.c: netbsd-7-nhusb
	sys/dev/usb/ehcireg.h: netbsd-7-nhusb
	sys/dev/usb/ehcivar.h: netbsd-7-nhusb
	sys/dev/usb/emdtv.c: netbsd-7-nhusb
	sys/dev/usb/emdtv_dtv.c: netbsd-7-nhusb
	sys/dev/usb/emdtv_ir.c: netbsd-7-nhusb
	sys/dev/usb/emdtvvar.h: netbsd-7-nhusb
	sys/dev/usb/ezload.c: netbsd-7-nhusb
	sys/dev/usb/ezload.h: netbsd-7-nhusb
	sys/dev/usb/files.usb: netbsd-7-nhusb
	sys/dev/usb/hid.c: netbsd-7-nhusb
	sys/dev/usb/hid.h: netbsd-7-nhusb
	sys/dev/usb/if_athn_usb.c: netbsd-7-nhusb
	sys/dev/usb/if_athn_usb.h: netbsd-7-nhusb
	sys/dev/usb/if_atu.c: netbsd-7-nhusb
	sys/dev/usb/if_atureg.h: netbsd-7-nhusb
	sys/dev/usb/if_aue.c: netbsd-7-nhusb
	sys/dev/usb/if_auereg.h: netbsd-7-nhusb
	sys/dev/usb/if_axe.c: netbsd-7-nhusb
	sys/dev/usb/if_axen.c: netbsd-7-nhusb
	sys/dev/usb/if_axenreg.h: netbsd-7-nhusb
	sys/dev/usb/if_axereg.h: netbsd-7-nhusb
	sys/dev/usb/if_cdce.c: netbsd-7-nhusb
	sys/dev/usb/if_cdcereg.h: netbsd-7-nhusb
	sys/dev/usb/if_cue.c: netbsd-7-nhusb
	sys/dev/usb/if_cuereg.h: netbsd-7-nhusb
	sys/dev/usb/if_kue.c: netbsd-7-nhusb
	sys/dev/usb/if_kuereg.h: netbsd-7-nhusb
	sys/dev/usb/if_otus.c: netbsd-7-nhusb
	sys/dev/usb/if_otusvar.h: netbsd-7-nhusb
	sys/dev/usb/if_rum.c: netbsd-7-nhusb
	sys/dev/usb/if_rumreg.h: netbsd-7-nhusb
	sys/dev/usb/if_rumvar.h: netbsd-7-nhusb
	sys/dev/usb/if_run.c: netbsd-7-nhusb
	sys/dev/usb/if_runvar.h: netbsd-7-nhusb
	sys/dev/usb/if_smsc.c: netbsd-7-nhusb
	sys/dev/usb/if_smscreg.h: netbsd-7-nhusb
	sys/dev/usb/if_smscvar.h: netbsd-7-nhusb
	sys/dev/usb/if_udav.c: netbsd-7-nhusb
	sys/dev/usb/if_udavreg.h: netbsd-7-nhusb
	sys/dev/usb/if_upgt.c: netbsd-7-nhusb
	sys/dev/usb/if_upgtvar.h: netbsd-7-nhusb
	sys/dev/usb/if_upl.c: netbsd-7-nhusb
	sys/dev/usb/if_ural.c: netbsd-7-nhusb
	sys/dev/usb/if_uralreg.h: netbsd-7-nhusb
	sys/dev/usb/if_uralvar.h: netbsd-7-nhusb
	sys/dev/usb/if_url.c: netbsd-7-nhusb
	sys/dev/usb/if_urlreg.h: netbsd-7-nhusb
	sys/dev/usb/if_urndis.c: netbsd-7-nhusb
	sys/dev/usb/if_urndisreg.h: netbsd-7-nhusb
	sys/dev/usb/if_urtw.c: netbsd-7-nhusb
	sys/dev/usb/if_urtwn.c: netbsd-7-nhusb
	sys/dev/usb/if_urtwn_data.h: netbsd-7-nhusb
	sys/dev/usb/if_urtwnreg.h: netbsd-7-nhusb
	sys/dev/usb/if_urtwnvar.h: netbsd-7-nhusb
	sys/dev/usb/if_urtwreg.h: netbsd-7-nhusb
	sys/dev/usb/if_zyd.c: netbsd-7-nhusb
	sys/dev/usb/if_zydreg.h: netbsd-7-nhusb
	sys/dev/usb/irmce.c: netbsd-7-nhusb
	sys/dev/usb/moscom.c: netbsd-7-nhusb
	sys/dev/usb/motg.c: netbsd-7-nhusb
	sys/dev/usb/motgvar.h: netbsd-7-nhusb
	sys/dev/usb/ohci.c: netbsd-7-nhusb
	sys/dev/usb/ohcireg.h: netbsd-7-nhusb
	sys/dev/usb/ohcivar.h: netbsd-7-nhusb
	sys/dev/usb/pseye.c: netbsd-7-nhusb
	sys/dev/usb/slurm.c: netbsd-7-nhusb
	sys/dev/usb/stuirda.c: netbsd-7-nhusb
	sys/dev/usb/u3g.c: netbsd-7-nhusb
	sys/dev/usb/uark.c: netbsd-7-nhusb
	sys/dev/usb/uatp.c: netbsd-7-nhusb
	sys/dev/usb/uaudio.c: netbsd-7-nhusb
	sys/dev/usb/uberry.c: netbsd-7-nhusb
	sys/dev/usb/ubsa.c: netbsd-7-nhusb
	sys/dev/usb/ubsa_common.c: netbsd-7-nhusb
	sys/dev/usb/ubsavar.h: netbsd-7-nhusb
	sys/dev/usb/ubt.c: netbsd-7-nhusb
	sys/dev/usb/uchcom.c: netbsd-7-nhusb
	sys/dev/usb/ucom.c: netbsd-7-nhusb
	sys/dev/usb/ucomvar.h: netbsd-7-nhusb
	sys/dev/usb/ucycom.c: netbsd-7-nhusb
	sys/dev/usb/udl.c: netbsd-7-nhusb
	sys/dev/usb/udl.h: netbsd-7-nhusb
	sys/dev/usb/udsbr.c: netbsd-7-nhusb
	sys/dev/usb/udsir.c: netbsd-7-nhusb
	sys/dev/usb/uep.c: netbsd-7-nhusb
	sys/dev/usb/uftdi.c: netbsd-7-nhusb
	sys/dev/usb/uftdireg.h: netbsd-7-nhusb
	sys/dev/usb/ugen.c: netbsd-7-nhusb
	sys/dev/usb/ugensa.c: netbsd-7-nhusb
	sys/dev/usb/uhci.c: netbsd-7-nhusb
	sys/dev/usb/uhcireg.h: netbsd-7-nhusb
	sys/dev/usb/uhcivar.h: netbsd-7-nhusb
	sys/dev/usb/uhid.c: netbsd-7-nhusb
	sys/dev/usb/uhidev.c: netbsd-7-nhusb
	sys/dev/usb/uhidev.h: netbsd-7-nhusb
	sys/dev/usb/uhmodem.c: netbsd-7-nhusb
	sys/dev/usb/uhso.c: netbsd-7-nhusb
	sys/dev/usb/uhub.c: netbsd-7-nhusb
	sys/dev/usb/uipad.c: netbsd-7-nhusb
	sys/dev/usb/uipaq.c: netbsd-7-nhusb
	sys/dev/usb/uirda.c: netbsd-7-nhusb
	sys/dev/usb/uirdavar.h: netbsd-7-nhusb
	sys/dev/usb/ukbd.c: netbsd-7-nhusb
	sys/dev/usb/ukbdmap.c: netbsd-7-nhusb
	sys/dev/usb/ukyopon.c: netbsd-7-nhusb
	sys/dev/usb/ukyopon.h: netbsd-7-nhusb
	sys/dev/usb/ulpt.c: netbsd-7-nhusb
	sys/dev/usb/umass.c: netbsd-7-nhusb
	sys/dev/usb/umass_isdata.c: netbsd-7-nhusb
	sys/dev/usb/umass_isdata.h: netbsd-7-nhusb
	sys/dev/usb/umass_quirks.c: netbsd-7-nhusb
	sys/dev/usb/umass_quirks.h: netbsd-7-nhusb
	sys/dev/usb/umass_scsipi.c: netbsd-7-nhusb
	sys/dev/usb/umass_scsipi.h: netbsd-7-nhusb
	sys/dev/usb/umassvar.h: netbsd-7-nhusb
	sys/dev/usb/umcs.c: netbsd-7-nhusb
	sys/dev/usb/umct.c: netbsd-7-nhusb
	sys/dev/usb/umidi.c: netbsd-7-nhusb
	sys/dev/usb/umidi_quirks.c: netbsd-7-nhusb
	sys/dev/usb/umidi_quirks.h: netbsd-7-nhusb
	sys/dev/usb/umodem.c: netbsd-7-nhusb
	sys/dev/usb/umodem_common.c: netbsd-7-nhusb
	sys/dev/usb/umodemvar.h: netbsd-7-nhusb
	sys/dev/usb/ums.c: netbsd-7-nhusb
	sys/dev/usb/uplcom.c: netbsd-7-nhusb
	sys/dev/usb/urio.c: netbsd-7-nhusb
	sys/dev/usb/urio.h: netbsd-7-nhusb
	sys/dev/usb/usb.c: netbsd-7-nhusb
	sys/dev/usb/usb.h: netbsd-7-nhusb
	sys/dev/usb/usb_mem.c: netbsd-7-nhusb
	sys/dev/usb/usb_mem.h: netbsd-7-nhusb
	sys/dev/usb/usb_quirks.c: netbsd-7-nhusb
	sys/dev/usb/usb_quirks.h: netbsd-7-nhusb
	sys/dev/usb/usb_subr.c: netbsd-7-nhusb
	sys/dev/usb/usbdevices.config: netbsd-7-nhusb
	sys/dev/usb/usbdevs: netbsd-7-nhusb
	sys/dev/usb/usbdevs.h: netbsd-7-nhusb
	sys/dev/usb/usbdevs_data.h: netbsd-7-nhusb
	sys/dev/usb/usbdi.c: netbsd-7-nhusb
	sys/dev/usb/usbdi.h: netbsd-7-nhusb
	sys/dev/usb/usbdi_util.c: netbsd-7-nhusb
	sys/dev/usb/usbdi_util.h: netbsd-7-nhusb
	sys/dev/usb/usbdivar.h: netbsd-7-nhusb
	sys/dev/usb/usbhid.h: netbsd-7-nhusb
	sys/dev/usb/usbhist.h: netbsd-7-nhusb
	sys/dev/usb/usbroothub.c: netbsd-7-nhusb
	sys/dev/usb/usbroothub.h: netbsd-7-nhusb
	sys/dev/usb/usbroothub_subr.c: delete
	sys/dev/usb/usbroothub_subr.h: delete
	sys/dev/usb/uscanner.c: netbsd-7-nhusb
	sys/dev/usb/uslsa.c: netbsd-7-nhusb
	sys/dev/usb/usscanner.c: netbsd-7-nhusb
	sys/dev/usb/ustir.c: netbsd-7-nhusb
	sys/dev/usb/uthum.c: netbsd-7-nhusb
	sys/dev/usb/utoppy.c: netbsd-7-nhusb
	sys/dev/usb/uts.c: netbsd-7-nhusb
	sys/dev/usb/uvideo.c: netbsd-7-nhusb
	sys/dev/usb/uvisor.c: netbsd-7-nhusb
	sys/dev/usb/uvscom.c: netbsd-7-nhusb
	sys/dev/usb/uyap.c: netbsd-7-nhusb
	sys/dev/usb/uyap_firmware.h: netbsd-7-nhusb
	sys/dev/usb/uyurex.c: netbsd-7-nhusb
	sys/dev/usb/x1input_rdesc.h: netbsd-7-nhusb
	sys/dev/usb/xhci.c: netbsd-7-nhusb
	sys/dev/usb/xhcireg.h: netbsd-7-nhusb
	sys/dev/usb/xhcivar.h: netbsd-7-nhusb
	sys/dev/usb/xinput_rdesc.h: netbsd-7-nhusb
	sys/external/bsd/common/conf/files.linux: netbsd-7-nhusb
	sys/external/bsd/common/include/linux/err.h: netbsd-7-nhusb
	sys/external/bsd/common/include/linux/kernel.h: netbsd-7-nhusb
	sys/external/bsd/common/include/linux/workqueue.h: netbsd-7-nhusb
	sys/external/bsd/common/linux/linux_work.c: netbsd-7-nhusb
	sys/external/bsd/drm2/dist/drm/radeon/atombios_encoders.c: netbsd-7-nhusb
	sys/external/bsd/drm2/dist/drm/radeon/radeon_legacy_encoders.c: netbsd-7-nhusb
	sys/external/bsd/drm2/drm/files.drmkms: netbsd-7-nhusb
	sys/external/bsd/drm2/i915drm/files.i915drmkms: netbsd-7-nhusb
	sys/external/bsd/drm2/include/linux/err.h: delete
	sys/external/bsd/drm2/include/linux/workqueue.h: delete
	sys/external/bsd/drm2/linux/files.drmkms_linux: netbsd-7-nhusb
	sys/external/bsd/drm2/linux/linux_work.c: delete
	sys/external/bsd/dwc2/dwc2.c: netbsd-7-nhusb
	sys/external/bsd/dwc2/dwc2.h: netbsd-7-nhusb
	sys/external/bsd/dwc2/dwc2var.h: netbsd-7-nhusb
	sys/external/bsd/dwc2/dwctwo2netbsd: netbsd-7-nhusb
	sys/external/bsd/dwc2/conf/files.dwc2: netbsd-7-nhusb
	sys/external/bsd/dwc2/dist/dwc2_core.c: netbsd-7-nhusb
	sys/external/bsd/dwc2/dist/dwc2_core.h: netbsd-7-nhusb
	sys/external/bsd/dwc2/dist/dwc2_coreintr.c: netbsd-7-nhusb
	sys/external/bsd/dwc2/dist/dwc2_hcd.c: netbsd-7-nhusb
	sys/external/bsd/dwc2/dist/dwc2_hcd.h: netbsd-7-nhusb
	sys/external/bsd/dwc2/dist/dwc2_hcdddma.c: netbsd-7-nhusb
	sys/external/bsd/dwc2/dist/dwc2_hcdintr.c: netbsd-7-nhusb
	sys/external/bsd/dwc2/dist/dwc2_hcdqueue.c: netbsd-7-nhusb
	sys/external/bsd/dwc2/dist/dwc2_hw.h: netbsd-7-nhusb
	sys/modules/drmkms_linux/Makefile: netbsd-7-nhusb
	sys/modules/i915drmkms/Makefile: netbsd-7-nhusb
	sys/rump/dev/lib/libugenhc/ugenhc.c: netbsd-7-nhusb
	sys/rump/dev/lib/libusb/Makefile: netbsd-7-nhusb
	sys/rump/dev/lib/libusb/USB.ioconf: netbsd-7-nhusb
	sys/rump/dev/lib/libusb/usb_at_ugenhc.c: delete
	sys/rump/dev/lib/libusb/opt/opt_usb.h: delete
	sys/rump/dev/lib/libusb/opt/opt_usbverbose.h: delete
	sys/sys/mbuf.h: netbsd-7-nhusb
	usr.sbin/usbdevs/usbdevs.8: netbsd-7-nhusb
	usr.sbin/usbdevs/usbdevs.c: netbsd-7-nhusb
Merge netbsd-7-nhusb:
- API / infrastructure changes to support memory management changes.
- Memory management improvements and bug fixes.
- HCDs should now be MP safe
- conversion to KERNHIST based debug
- FS/LS isoc support on ehci(4).
- conversion to kmem(9)
- Some USB 3 support - mostly from Takahiro HAYASHI (t-hash).
- interrupt transfers now get proper DMA operations
- general bug fixes
     - kern/48308
     - uhub status notification improvements
     - umass(4) probe fix (applied to HEAD already)
     - ohci(4) short transfer fix
- Change the SOFTINT level from NET to SERIAL for the USB softint handler.
  This gives the callback a chance of running when another softint handler
  at SOFTINT_NET has blocked holding a lock, e.g. softnet_lock and most of
  the network stack.
     - kern/49065 - ifconfig tun0 ... sequence locks up system / lockup:
       softnet_lock held across usb xfr
     - kern/50491 - unkillable wait in usbd_transfer while using usmsc0
       on raspberry pi 2
     - kern/51395 - USB Ethernet makes xhci hang
- Various improvements to slhci(4)
- Various improvements to dwc2(4)
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.7.2.2 2015/03/06 21:39:10 snj Exp $
d11 1
a11 1
define	drmkms: drmkms_linux, drmkms_i2c, linux
a28 4
makeoptions	drmkms	CPPFLAGS+="-DCONFIG_FB=0"
makeoptions	drmkms	CPPFLAGS+="-DCONFIG_BACKLIGHT_CLASS_DEVICE=0"
makeoptions	drmkms	CPPFLAGS+="-DCONFIG_BACKLIGHT_CLASS_DEVICE_MODULE=0"

@


1.7.2.2.4.1
log
@First pass at netbsd-7 updated with USB code from HEAD
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.7.2.2 2015/03/06 21:39:10 snj Exp $
d11 1
a11 1
define	drmkms: drmkms_linux, drmkms_i2c, linux
a28 4
makeoptions	drmkms	CPPFLAGS+="-DCONFIG_FB=0"
makeoptions	drmkms	CPPFLAGS+="-DCONFIG_BACKLIGHT_CLASS_DEVICE=0"
makeoptions	drmkms	CPPFLAGS+="-DCONFIG_BACKLIGHT_CLASS_DEVICE_MODULE=0"

@


1.7.4.1
log
@file files.drmkms was added on branch tls-maxphys on 2014-08-20 00:04:20 +0000
@
text
@d1 92
@


1.7.4.2
log
@Rebase to HEAD as of a few days ago.
@
text
@a0 92
#	$NetBSD$

include "external/bsd/drm2/linux/files.drmkms_linux"

# i2c code is not separated out, but it is marked so that it could be
# if we wanted.  Not clear that this provides as much advantage as
# separating out PCI code, which will be necessary for, e.g., PCIless
# ARM SoC graphics drivers.
define	drmkms_i2c: drmkms_linux

define	drmkms: drmkms_linux, drmkms_i2c

defflag		opt_drmkms.h	DRMKMS_DEBUG
makeoptions 	drmkms	CPPFLAGS+="-I$S/external/bsd/drm2/include"
makeoptions	drmkms_ttm	CPPFLAGS+="-I$S/external/bsd/drm2/include/drm"
makeoptions 	drmkms	CPPFLAGS+="-I$S/external/bsd/drm2/dist"
makeoptions 	drmkms	CPPFLAGS+="-I$S/external/bsd/drm2/dist/include"
makeoptions 	drmkms	CPPFLAGS+="-I$S/external/bsd/drm2/dist/include/drm"
makeoptions 	drmkms	CPPFLAGS+="-I$S/external/bsd/drm2/dist/uapi"
makeoptions 	drmkms	CPPFLAGS+="-I$S/external/bsd/common/include"

makeoptions 	drmkms 	"CWARNFLAGS.drm_crtc.c"+="-Wno-shadow"
makeoptions 	drmkms 	"CWARNFLAGS.drm_crtc.c"+="-Wno-missing-field-initializers"
makeoptions 	drmkms 	"CWARNFLAGS.drm_edid.c"+="-Wno-shadow"

# XXX Should probably be in a header file.  opt_drmkms.h?
makeoptions	drmkms	CPPFLAGS+="-D__KERNEL__"

file	external/bsd/drm2/dist/drm/drm_auth.c		drmkms
file	external/bsd/drm2/dist/drm/drm_buffer.c		drmkms
file	external/bsd/drm2/dist/drm/drm_bufs.c		drmkms
file	external/bsd/drm2/drm/drm_cache.c		drmkms
file	external/bsd/drm2/dist/drm/drm_context.c	drmkms
file	external/bsd/drm2/dist/drm/drm_crtc.c		drmkms
file	external/bsd/drm2/dist/drm/drm_crtc_helper.c	drmkms
file	external/bsd/drm2/dist/drm/drm_dma.c		drmkms
file	external/bsd/drm2/dist/drm/drm_dp_helper.c	drmkms_i2c
file	external/bsd/drm2/drm/drm_drv.c			drmkms
file	external/bsd/drm2/dist/drm/drm_edid.c		drmkms_i2c
#file	external/bsd/drm2/dist/drm/drm_encoder_slave.c	drmkms_i2c
file	external/bsd/drm2/dist/drm/drm_fb_helper.c	drmkms
file	external/bsd/drm2/dist/drm/drm_flip_work.c	drmkms
file	external/bsd/drm2/drm/drm_fops.c		drmkms
file	external/bsd/drm2/dist/drm/drm_gem.c		drmkms
file	external/bsd/drm2/dist/drm/drm_global.c		drmkms
file	external/bsd/drm2/dist/drm/drm_hashtab.c	drmkms
#file	external/bsd/drm2/dist/drm/drm_info.c		drmkms
#file	external/bsd/drm2/dist/drm/drm_ioc32.c		drmkms
file	external/bsd/drm2/dist/drm/drm_ioctl.c		drmkms
file	external/bsd/drm2/dist/drm/drm_irq.c		drmkms
file	external/bsd/drm2/drm/drm_lock.c		drmkms
file	external/bsd/drm2/drm/drm_memory.c		drmkms
file	external/bsd/drm2/dist/drm/drm_mm.c		drmkms
file	external/bsd/drm2/dist/drm/drm_modes.c		drmkms
file	external/bsd/drm2/dist/drm/drm_plane_helper.c	drmkms
#file	external/bsd/drm2/dist/drm/drm_platform.c	drmkms
#file	external/bsd/drm2/dist/drm/drm_prime.c		drmkms
file	external/bsd/drm2/dist/drm/drm_probe_helper.c	drmkms
file	external/bsd/drm2/dist/drm/drm_rect.c		drmkms
file	external/bsd/drm2/drm/drm_scatter.c		drmkms
file	external/bsd/drm2/dist/drm/drm_stub.c		drmkms
file	external/bsd/drm2/drm/drm_sysfs.c		drmkms
file	external/bsd/drm2/drm/drm_vm.c			drmkms
file	external/bsd/drm2/drm/drm_vma_manager.c		drmkms

file	external/bsd/drm2/drm/drm_gem_vm.c		drmkms
file	external/bsd/drm2/drm/drm_module.c		drmkms

# TTM, the texture and tiling manager.

define	drmkms_ttm: drmkms

file	external/bsd/drm2/ttm/ttm_agp_backend.c			drmkms_ttm
file	external/bsd/drm2/dist/drm/ttm/ttm_memory.c		drmkms_ttm
file	external/bsd/drm2/dist/drm/ttm/ttm_tt.c			drmkms_ttm
file	external/bsd/drm2/dist/drm/ttm/ttm_bo.c			drmkms_ttm
file	external/bsd/drm2/dist/drm/ttm/ttm_bo_util.c		drmkms_ttm
file	external/bsd/drm2/ttm/ttm_bo_vm.c			drmkms_ttm
# Linux module goo.
#file	external/bsd/drm2/dist/drm/ttm/ttm_module.c		drmkms_ttm
# Used only by vmwgfx.  Needs porting for rcu -> pserialize.
#file	external/bsd/drm2/dist/drm/ttm/ttm_object.c		drmkms_ttm
# Used only by vmwgfx.  Needs porting.  Does silly things like SIGKILL.
#file	external/bsd/drm2/dist/drm/ttm/ttm_lock.c		drmkms_ttm
file	external/bsd/drm2/dist/drm/ttm/ttm_execbuf_util.c	drmkms_ttm
# Replaced locally by ttm_bus_dma.c.
#file	external/bsd/drm2/dist/drm/ttm/ttm_page_alloc.c		drmkms_ttm
file	external/bsd/drm2/dist/drm/ttm/ttm_bo_manager.c		drmkms_ttm
# Replaced locally by ttm_bus_dma.c.
#file	external/bsd/drm2/dist/drm/ttm/ttm_page_alloc_dma.c	drmkms_ttm

file	external/bsd/drm2/ttm/ttm_bus_dma.c			drmkms_ttm
@


1.7.4.3
log
@update from HEAD
@
text
@d11 1
a11 1
define	drmkms: drmkms_linux, drmkms_i2c, linux
a28 4
makeoptions	drmkms	CPPFLAGS+="-DCONFIG_FB=0"
makeoptions	drmkms	CPPFLAGS+="-DCONFIG_BACKLIGHT_CLASS_DEVICE=0"
makeoptions	drmkms	CPPFLAGS+="-DCONFIG_BACKLIGHT_CLASS_DEVICE_MODULE=0"

d40 1
a40 1
file	external/bsd/drm2/i2c/drm_encoder_slave.c	drmkms_i2c
a67 1
file	external/bsd/drm2/drm/drm_sysctl.c		drmkms
d69 22
a90 3
# Generic, unaccelerated drm-based framebuffer.
define	drmfb: genfb
file	external/bsd/drm2/drm/drmfb.c			drmfb
d92 1
a92 1
include "external/bsd/drm2/ttm/files.ttm"
@


1.6
log
@Make it build and boot on my test machines.

Screen blanks on boot on the Ivy Bridge system with

   DRM error in cpt_serr_int_handler: PCH transcoder A FIFO underrun

But after that everything is OK.  Appears to be an upstream problem.
To investigate...

I think there's a cache flushing issue somewhere -- there are little
display artefacts on my T60.
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.5 2014/04/01 15:08:58 riastradh Exp $
d15 1
d68 25
@


1.5
log
@Make drmkms find header files from sys/external/bsd/common.
@
text
@d1 1
a1 3
#	$NetBSD: files.drmkms,v 1.4 2014/03/31 13:38:44 riastradh Exp $

define	drmkmsbus	{ }
d11 1
a11 3
define	drmkms
device	drmkms: drmkms_linux, drmkms_i2c
attach	drmkms at drmkmsbus
d15 3
a18 1
makeoptions 	drmkms	CPPFLAGS+="-I$S/external/bsd/drm2/dist/include"
d22 1
d41 1
d54 1
d57 2
a58 1
#file	external/bsd/drm2/dist/drm/drm_proc.c		drmkms
d61 1
d63 1
a66 1
file	external/bsd/drm2/drm/drm_sysfs.c		drmkms
@


1.5.2.1
log
@Rebase.
@
text
@d1 3
a3 1
#	$NetBSD: files.drmkms,v 1.7 2014/07/16 20:59:57 riastradh Exp $
d13 3
a15 1
define	drmkms: drmkms_linux, drmkms_i2c
d19 1
a19 2
makeoptions	drmkms_ttm	CPPFLAGS+="-I$S/external/bsd/drm2/include/drm"
makeoptions 	drmkms	CPPFLAGS+="-I$S/external/bsd/drm2/dist"
a20 2
makeoptions 	drmkms	CPPFLAGS+="-I$S/external/bsd/drm2/dist/include/drm"
makeoptions 	drmkms	CPPFLAGS+="-I$S/external/bsd/drm2/dist/uapi"
a23 1
makeoptions 	drmkms 	"CWARNFLAGS.drm_crtc.c"+="-Wno-missing-field-initializers"
a41 1
file	external/bsd/drm2/dist/drm/drm_flip_work.c	drmkms
a53 1
file	external/bsd/drm2/dist/drm/drm_plane_helper.c	drmkms
d56 1
a56 2
file	external/bsd/drm2/dist/drm/drm_probe_helper.c	drmkms
file	external/bsd/drm2/dist/drm/drm_rect.c		drmkms
a58 1
file	external/bsd/drm2/drm/drm_sysfs.c		drmkms
a59 1
file	external/bsd/drm2/drm/drm_vma_manager.c		drmkms
d63 1
a63 25

# TTM, the texture and tiling manager.

define	drmkms_ttm: drmkms

file	external/bsd/drm2/ttm/ttm_agp_backend.c			drmkms_ttm
file	external/bsd/drm2/dist/drm/ttm/ttm_memory.c		drmkms_ttm
file	external/bsd/drm2/dist/drm/ttm/ttm_tt.c			drmkms_ttm
file	external/bsd/drm2/dist/drm/ttm/ttm_bo.c			drmkms_ttm
file	external/bsd/drm2/dist/drm/ttm/ttm_bo_util.c		drmkms_ttm
file	external/bsd/drm2/ttm/ttm_bo_vm.c			drmkms_ttm
# Linux module goo.
#file	external/bsd/drm2/dist/drm/ttm/ttm_module.c		drmkms_ttm
# Used only by vmwgfx.  Needs porting for rcu -> pserialize.
#file	external/bsd/drm2/dist/drm/ttm/ttm_object.c		drmkms_ttm
# Used only by vmwgfx.  Needs porting.  Does silly things like SIGKILL.
#file	external/bsd/drm2/dist/drm/ttm/ttm_lock.c		drmkms_ttm
file	external/bsd/drm2/dist/drm/ttm/ttm_execbuf_util.c	drmkms_ttm
# Replaced locally by ttm_bus_dma.c.
#file	external/bsd/drm2/dist/drm/ttm/ttm_page_alloc.c		drmkms_ttm
file	external/bsd/drm2/dist/drm/ttm/ttm_bo_manager.c		drmkms_ttm
# Replaced locally by ttm_bus_dma.c.
#file	external/bsd/drm2/dist/drm/ttm/ttm_page_alloc_dma.c	drmkms_ttm

file	external/bsd/drm2/ttm/ttm_bus_dma.c			drmkms_ttm
@


1.5.6.1
log
@file files.drmkms was added on branch yamt-pagecache on 2014-05-22 11:40:55 +0000
@
text
@d1 63
@


1.5.6.2
log
@sync with head.

for a reference, the tree before this commit was tagged
as yamt-pagecache-tag8.

this commit was splitted into small chunks to avoid
a limitation of cvs.  ("Protocol error: too many arguments")
@
text
@a0 63
#	$NetBSD$

define	drmkmsbus	{ }

include "external/bsd/drm2/linux/files.drmkms_linux"

# i2c code is not separated out, but it is marked so that it could be
# if we wanted.  Not clear that this provides as much advantage as
# separating out PCI code, which will be necessary for, e.g., PCIless
# ARM SoC graphics drivers.
define	drmkms_i2c: drmkms_linux

define	drmkms
device	drmkms: drmkms_linux, drmkms_i2c
attach	drmkms at drmkmsbus

defflag		opt_drmkms.h	DRMKMS_DEBUG
makeoptions 	drmkms	CPPFLAGS+="-I$S/external/bsd/drm2/include"
makeoptions 	drmkms	CPPFLAGS+="-I$S/external/bsd/drm2/dist/uapi"
makeoptions 	drmkms	CPPFLAGS+="-I$S/external/bsd/drm2/dist/include"
makeoptions 	drmkms	CPPFLAGS+="-I$S/external/bsd/common/include"

makeoptions 	drmkms 	"CWARNFLAGS.drm_crtc.c"+="-Wno-shadow"
makeoptions 	drmkms 	"CWARNFLAGS.drm_edid.c"+="-Wno-shadow"

# XXX Should probably be in a header file.  opt_drmkms.h?
makeoptions	drmkms	CPPFLAGS+="-D__KERNEL__"

file	external/bsd/drm2/dist/drm/drm_auth.c		drmkms
file	external/bsd/drm2/dist/drm/drm_buffer.c		drmkms
file	external/bsd/drm2/dist/drm/drm_bufs.c		drmkms
file	external/bsd/drm2/drm/drm_cache.c		drmkms
file	external/bsd/drm2/dist/drm/drm_context.c	drmkms
file	external/bsd/drm2/dist/drm/drm_crtc.c		drmkms
file	external/bsd/drm2/dist/drm/drm_crtc_helper.c	drmkms
file	external/bsd/drm2/dist/drm/drm_dma.c		drmkms
file	external/bsd/drm2/dist/drm/drm_dp_helper.c	drmkms_i2c
file	external/bsd/drm2/drm/drm_drv.c			drmkms
file	external/bsd/drm2/dist/drm/drm_edid.c		drmkms_i2c
#file	external/bsd/drm2/dist/drm/drm_encoder_slave.c	drmkms_i2c
file	external/bsd/drm2/dist/drm/drm_fb_helper.c	drmkms
file	external/bsd/drm2/drm/drm_fops.c		drmkms
file	external/bsd/drm2/dist/drm/drm_gem.c		drmkms
file	external/bsd/drm2/dist/drm/drm_global.c		drmkms
file	external/bsd/drm2/dist/drm/drm_hashtab.c	drmkms
#file	external/bsd/drm2/dist/drm/drm_info.c		drmkms
#file	external/bsd/drm2/dist/drm/drm_ioc32.c		drmkms
file	external/bsd/drm2/dist/drm/drm_ioctl.c		drmkms
file	external/bsd/drm2/dist/drm/drm_irq.c		drmkms
file	external/bsd/drm2/drm/drm_lock.c		drmkms
file	external/bsd/drm2/drm/drm_memory.c		drmkms
file	external/bsd/drm2/dist/drm/drm_mm.c		drmkms
file	external/bsd/drm2/dist/drm/drm_modes.c		drmkms
#file	external/bsd/drm2/dist/drm/drm_platform.c	drmkms
#file	external/bsd/drm2/dist/drm/drm_prime.c		drmkms
#file	external/bsd/drm2/dist/drm/drm_proc.c		drmkms
file	external/bsd/drm2/drm/drm_scatter.c		drmkms
file	external/bsd/drm2/dist/drm/drm_stub.c		drmkms
file	external/bsd/drm2/drm/drm_vm.c			drmkms

file	external/bsd/drm2/drm/drm_gem_vm.c		drmkms
file	external/bsd/drm2/drm/drm_module.c		drmkms
file	external/bsd/drm2/drm/drm_sysfs.c		drmkms
@


1.5.4.1
log
@file files.drmkms was added on branch rmind-smpnet on 2014-05-18 17:46:00 +0000
@
text
@d1 63
@


1.5.4.2
log
@sync with head
@
text
@a0 63
#	$NetBSD$

define	drmkmsbus	{ }

include "external/bsd/drm2/linux/files.drmkms_linux"

# i2c code is not separated out, but it is marked so that it could be
# if we wanted.  Not clear that this provides as much advantage as
# separating out PCI code, which will be necessary for, e.g., PCIless
# ARM SoC graphics drivers.
define	drmkms_i2c: drmkms_linux

define	drmkms
device	drmkms: drmkms_linux, drmkms_i2c
attach	drmkms at drmkmsbus

defflag		opt_drmkms.h	DRMKMS_DEBUG
makeoptions 	drmkms	CPPFLAGS+="-I$S/external/bsd/drm2/include"
makeoptions 	drmkms	CPPFLAGS+="-I$S/external/bsd/drm2/dist/uapi"
makeoptions 	drmkms	CPPFLAGS+="-I$S/external/bsd/drm2/dist/include"
makeoptions 	drmkms	CPPFLAGS+="-I$S/external/bsd/common/include"

makeoptions 	drmkms 	"CWARNFLAGS.drm_crtc.c"+="-Wno-shadow"
makeoptions 	drmkms 	"CWARNFLAGS.drm_edid.c"+="-Wno-shadow"

# XXX Should probably be in a header file.  opt_drmkms.h?
makeoptions	drmkms	CPPFLAGS+="-D__KERNEL__"

file	external/bsd/drm2/dist/drm/drm_auth.c		drmkms
file	external/bsd/drm2/dist/drm/drm_buffer.c		drmkms
file	external/bsd/drm2/dist/drm/drm_bufs.c		drmkms
file	external/bsd/drm2/drm/drm_cache.c		drmkms
file	external/bsd/drm2/dist/drm/drm_context.c	drmkms
file	external/bsd/drm2/dist/drm/drm_crtc.c		drmkms
file	external/bsd/drm2/dist/drm/drm_crtc_helper.c	drmkms
file	external/bsd/drm2/dist/drm/drm_dma.c		drmkms
file	external/bsd/drm2/dist/drm/drm_dp_helper.c	drmkms_i2c
file	external/bsd/drm2/drm/drm_drv.c			drmkms
file	external/bsd/drm2/dist/drm/drm_edid.c		drmkms_i2c
#file	external/bsd/drm2/dist/drm/drm_encoder_slave.c	drmkms_i2c
file	external/bsd/drm2/dist/drm/drm_fb_helper.c	drmkms
file	external/bsd/drm2/drm/drm_fops.c		drmkms
file	external/bsd/drm2/dist/drm/drm_gem.c		drmkms
file	external/bsd/drm2/dist/drm/drm_global.c		drmkms
file	external/bsd/drm2/dist/drm/drm_hashtab.c	drmkms
#file	external/bsd/drm2/dist/drm/drm_info.c		drmkms
#file	external/bsd/drm2/dist/drm/drm_ioc32.c		drmkms
file	external/bsd/drm2/dist/drm/drm_ioctl.c		drmkms
file	external/bsd/drm2/dist/drm/drm_irq.c		drmkms
file	external/bsd/drm2/drm/drm_lock.c		drmkms
file	external/bsd/drm2/drm/drm_memory.c		drmkms
file	external/bsd/drm2/dist/drm/drm_mm.c		drmkms
file	external/bsd/drm2/dist/drm/drm_modes.c		drmkms
#file	external/bsd/drm2/dist/drm/drm_platform.c	drmkms
#file	external/bsd/drm2/dist/drm/drm_prime.c		drmkms
#file	external/bsd/drm2/dist/drm/drm_proc.c		drmkms
file	external/bsd/drm2/drm/drm_scatter.c		drmkms
file	external/bsd/drm2/dist/drm/drm_stub.c		drmkms
file	external/bsd/drm2/drm/drm_vm.c			drmkms

file	external/bsd/drm2/drm/drm_gem_vm.c		drmkms
file	external/bsd/drm2/drm/drm_module.c		drmkms
file	external/bsd/drm2/drm/drm_sysfs.c		drmkms
@


1.4
log
@Move the drmkms i2c dependencies to where they belong.
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.3 2014/03/27 21:21:47 christos Exp $
d21 1
@


1.3
log
@add missing dependencies (Takahiro HAYASHI)
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.2 2014/03/18 18:20:42 riastradh Exp $
d11 1
a11 1
define	drmkms_i2c
d14 1
a14 1
device	drmkms: drmkms_linux, drmkms_i2c, i2cexec, i2c_bitbang
@


1.2
log
@Merge riastradh-drm2 to HEAD.
@
text
@d1 1
a1 1
#	$NetBSD: files.drmkms,v 1.1.2.1 2014/03/04 20:45:16 riastradh Exp $
d14 1
a14 1
device	drmkms: drmkms_linux, drmkms_i2c
@


1.1
log
@file files.drmkms was initially added on branch riastradh-drm2.
@
text
@d1 62
@


1.1.2.1
log
@Rework drm2 configuration and modularization.

- Split drm2.kmod into drmkms_linux, drmkms, drmkms_pci.
- Split up drmkms-related files.* similarly.
- Make drm_agp_* routines hooks that the drmkms_pci module installs.
- Reuse drm device major 180 for (old) drm and drmkms.

Now old drm and new drmkms can coexist happily in the same tree, with
or without PCI, and require no changes to userland.
@
text
@a0 62
#	$NetBSD$

define	drmkmsbus	{ }

include "external/bsd/drm2/linux/files.drmkms_linux"

# i2c code is not separated out, but it is marked so that it could be
# if we wanted.  Not clear that this provides as much advantage as
# separating out PCI code, which will be necessary for, e.g., PCIless
# ARM SoC graphics drivers.
define	drmkms_i2c

define	drmkms
device	drmkms: drmkms_linux, drmkms_i2c
attach	drmkms at drmkmsbus

defflag		opt_drmkms.h	DRMKMS_DEBUG
makeoptions 	drmkms	CPPFLAGS+="-I$S/external/bsd/drm2/include"
makeoptions 	drmkms	CPPFLAGS+="-I$S/external/bsd/drm2/dist/uapi"
makeoptions 	drmkms	CPPFLAGS+="-I$S/external/bsd/drm2/dist/include"

makeoptions 	drmkms 	"CWARNFLAGS.drm_crtc.c"+="-Wno-shadow"
makeoptions 	drmkms 	"CWARNFLAGS.drm_edid.c"+="-Wno-shadow"

# XXX Should probably be in a header file.  opt_drmkms.h?
makeoptions	drmkms	CPPFLAGS+="-D__KERNEL__"

file	external/bsd/drm2/dist/drm/drm_auth.c		drmkms
file	external/bsd/drm2/dist/drm/drm_buffer.c		drmkms
file	external/bsd/drm2/dist/drm/drm_bufs.c		drmkms
file	external/bsd/drm2/drm/drm_cache.c		drmkms
file	external/bsd/drm2/dist/drm/drm_context.c	drmkms
file	external/bsd/drm2/dist/drm/drm_crtc.c		drmkms
file	external/bsd/drm2/dist/drm/drm_crtc_helper.c	drmkms
file	external/bsd/drm2/dist/drm/drm_dma.c		drmkms
file	external/bsd/drm2/dist/drm/drm_dp_helper.c	drmkms_i2c
file	external/bsd/drm2/drm/drm_drv.c			drmkms
file	external/bsd/drm2/dist/drm/drm_edid.c		drmkms_i2c
#file	external/bsd/drm2/dist/drm/drm_encoder_slave.c	drmkms_i2c
file	external/bsd/drm2/dist/drm/drm_fb_helper.c	drmkms
file	external/bsd/drm2/drm/drm_fops.c		drmkms
file	external/bsd/drm2/dist/drm/drm_gem.c		drmkms
file	external/bsd/drm2/dist/drm/drm_global.c		drmkms
file	external/bsd/drm2/dist/drm/drm_hashtab.c	drmkms
#file	external/bsd/drm2/dist/drm/drm_info.c		drmkms
#file	external/bsd/drm2/dist/drm/drm_ioc32.c		drmkms
file	external/bsd/drm2/dist/drm/drm_ioctl.c		drmkms
file	external/bsd/drm2/dist/drm/drm_irq.c		drmkms
file	external/bsd/drm2/drm/drm_lock.c		drmkms
file	external/bsd/drm2/drm/drm_memory.c		drmkms
file	external/bsd/drm2/dist/drm/drm_mm.c		drmkms
file	external/bsd/drm2/dist/drm/drm_modes.c		drmkms
#file	external/bsd/drm2/dist/drm/drm_platform.c	drmkms
#file	external/bsd/drm2/dist/drm/drm_prime.c		drmkms
#file	external/bsd/drm2/dist/drm/drm_proc.c		drmkms
file	external/bsd/drm2/drm/drm_scatter.c		drmkms
file	external/bsd/drm2/dist/drm/drm_stub.c		drmkms
file	external/bsd/drm2/drm/drm_vm.c			drmkms

file	external/bsd/drm2/drm/drm_gem_vm.c		drmkms
file	external/bsd/drm2/drm/drm_module.c		drmkms
file	external/bsd/drm2/drm/drm_sysfs.c		drmkms
@