head	1.15;
access;
symbols
	netbsd-11-0-RC4:1.15
	netbsd-11-0-RC3:1.15
	netbsd-11-0-RC2:1.15
	netbsd-11-0-RC1:1.15
	perseant-exfatfs-base-20250801:1.15
	netbsd-11:1.15.0.12
	netbsd-11-base:1.15
	netbsd-10-1-RELEASE:1.15
	perseant-exfatfs-base-20240630:1.15
	perseant-exfatfs:1.15.0.10
	perseant-exfatfs-base:1.15
	netbsd-8-3-RELEASE:1.7
	netbsd-9-4-RELEASE:1.12
	netbsd-10-0-RELEASE:1.15
	netbsd-10-0-RC6:1.15
	netbsd-10-0-RC5:1.15
	netbsd-10-0-RC4:1.15
	netbsd-10-0-RC3:1.15
	netbsd-10-0-RC2:1.15
	thorpej-ifq:1.15.0.8
	thorpej-ifq-base:1.15
	thorpej-altq-separation:1.15.0.6
	thorpej-altq-separation-base:1.15
	netbsd-10-0-RC1:1.15
	netbsd-10:1.15.0.4
	netbsd-10-base:1.15
	bouyer-sunxi-drm:1.15.0.2
	bouyer-sunxi-drm-base:1.15
	netbsd-9-3-RELEASE:1.12
	thorpej-i2c-spi-conf2:1.12.0.26
	thorpej-i2c-spi-conf2-base:1.12
	thorpej-futex2:1.12.0.24
	thorpej-futex2-base:1.12
	thorpej-cfargs2:1.12.0.22
	thorpej-cfargs2-base:1.12
	cjep_sun2x-base1:1.12
	cjep_sun2x:1.12.0.20
	cjep_sun2x-base:1.12
	cjep_staticlib_x-base1:1.12
	netbsd-9-2-RELEASE:1.12
	cjep_staticlib_x:1.12.0.18
	cjep_staticlib_x-base:1.12
	thorpej-i2c-spi-conf:1.12.0.16
	thorpej-i2c-spi-conf-base:1.12
	thorpej-cfargs:1.12.0.14
	thorpej-cfargs-base:1.12
	thorpej-futex:1.12.0.12
	thorpej-futex-base:1.12
	netbsd-9-1-RELEASE:1.12
	bouyer-xenpvh-base2:1.12
	phil-wifi-20200421:1.12
	bouyer-xenpvh-base1:1.12
	phil-wifi-20200411:1.12
	bouyer-xenpvh:1.12.0.10
	bouyer-xenpvh-base:1.12
	is-mlppp:1.12.0.8
	is-mlppp-base:1.12
	phil-wifi-20200406:1.12
	netbsd-8-2-RELEASE:1.7
	ad-namecache-base3:1.12
	netbsd-9-0-RELEASE:1.12
	netbsd-9-0-RC2:1.12
	ad-namecache-base2:1.12
	ad-namecache-base1:1.12
	ad-namecache:1.12.0.6
	ad-namecache-base:1.12
	netbsd-9-0-RC1:1.12
	phil-wifi-20191119:1.12
	netbsd-9:1.12.0.4
	netbsd-9-base:1.12
	phil-wifi-20190609:1.12
	netbsd-8-1-RELEASE:1.7
	netbsd-8-1-RC1:1.7
	isaki-audio2:1.12.0.2
	isaki-audio2-base:1.12
	pgoyette-compat-merge-20190127:1.7.16.1
	pgoyette-compat-20190127:1.11
	pgoyette-compat-20190118:1.11
	pgoyette-compat-1226:1.11
	pgoyette-compat-1126:1.11
	pgoyette-compat-1020:1.11
	pgoyette-compat-0930:1.11
	pgoyette-compat-0906:1.11
	netbsd-7-2-RELEASE:1.4.2.3
	pgoyette-compat-0728:1.7
	netbsd-8-0-RELEASE:1.7
	phil-wifi:1.7.0.18
	phil-wifi-base:1.7
	pgoyette-compat-0625:1.7
	netbsd-8-0-RC2:1.7
	pgoyette-compat-0521:1.7
	pgoyette-compat-0502:1.7
	pgoyette-compat-0422:1.7
	netbsd-8-0-RC1:1.7
	pgoyette-compat-0415:1.7
	pgoyette-compat-0407:1.7
	pgoyette-compat-0330:1.7
	pgoyette-compat-0322:1.7
	pgoyette-compat-0315:1.7
	netbsd-7-1-2-RELEASE:1.4.2.2
	pgoyette-compat:1.7.0.16
	pgoyette-compat-base:1.7
	netbsd-7-1-1-RELEASE:1.4.2.2
	tls-maxphys-base-20171202:1.7
	matt-nb8-mediatek:1.7.0.14
	matt-nb8-mediatek-base:1.7
	nick-nhusb-base-20170825:1.7
	perseant-stdc-iso10646:1.7.0.12
	perseant-stdc-iso10646-base:1.7
	netbsd-8:1.7.0.10
	netbsd-8-base:1.7
	prg-localcount2-base3:1.7
	prg-localcount2-base2:1.7
	prg-localcount2-base1:1.7
	prg-localcount2:1.7.0.8
	prg-localcount2-base:1.7
	pgoyette-localcount-20170426:1.7
	bouyer-socketcan-base1:1.7
	jdolecek-ncq:1.7.0.6
	jdolecek-ncq-base:1.7
	pgoyette-localcount-20170320:1.7
	netbsd-7-1:1.4.2.2.0.6
	netbsd-7-1-RELEASE:1.4.2.2
	netbsd-7-1-RC2:1.4.2.2
	nick-nhusb-base-20170204:1.7
	netbsd-7-nhusb-base-20170116:1.4.2.2
	bouyer-socketcan:1.7.0.4
	bouyer-socketcan-base:1.7
	pgoyette-localcount-20170107:1.7
	netbsd-7-1-RC1:1.4.2.2
	nick-nhusb-base-20161204:1.7
	pgoyette-localcount-20161104:1.7
	netbsd-7-0-2-RELEASE:1.4.2.2
	nick-nhusb-base-20161004:1.7
	localcount-20160914:1.7
	netbsd-7-nhusb:1.4.2.2.0.4
	netbsd-7-nhusb-base:1.4.2.2
	pgoyette-localcount-20160806:1.7
	pgoyette-localcount-20160726:1.7
	pgoyette-localcount:1.7.0.2
	pgoyette-localcount-base:1.7
	nick-nhusb-base-20160907:1.7
	nick-nhusb-base-20160529:1.7
	netbsd-7-0-1-RELEASE:1.4.2.2
	nick-nhusb-base-20160422:1.7
	nick-nhusb-base-20160319:1.7
	nick-nhusb-base-20151226:1.6
	netbsd-7-0:1.4.2.2.0.2
	netbsd-7-0-RELEASE:1.4.2.2
	nick-nhusb-base-20150921:1.6
	netbsd-7-0-RC3:1.4.2.2
	netbsd-7-0-RC2:1.4.2.2
	netbsd-7-0-RC1:1.4.2.2
	nick-nhusb-base-20150606:1.6
	nick-nhusb-base-20150406:1.6
	nick-nhusb:1.5.0.2
	nick-nhusb-base:1.5
	tls-maxphys-base:1.4
	tls-maxphys:1.4.0.4
	netbsd-7:1.4.0.2
	netbsd-7-base:1.4
	yamt-pagecache:1.2.0.6
	rmind-smpnet-base:1.2
	rmind-smpnet:1.2.0.4
	rmind-smpnet-nbase:1.2
	yamt-pagecache-base9:1.2
	tls-earlyentropy:1.2.0.2
	tls-earlyentropy-base:1.4
	riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.2
	riastradh-drm2-base3:1.1
	riastradh-drm2:1.1.0.2;
locks; strict;
comment	@# @;


1.15
date	2022.07.17.14.11.40;	author riastradh;	state Exp;
branches;
next	1.14;
commitid	ZtojdFeOuzZpSfMD;

1.14
date	2021.12.19.11.54.24;	author riastradh;	state Exp;
branches;
next	1.13;
commitid	d7eObF37KhkQRflD;

1.13
date	2021.12.19.00.27.09;	author riastradh;	state Exp;
branches;
next	1.12;
commitid	LgTTXND5DjF44clD;

1.12
date	2019.02.17.04.05.47;	author rin;	state Exp;
branches;
next	1.11;
commitid	viEUadQYccaOx4cB;

1.11
date	2018.08.28.03.41.40;	author riastradh;	state Exp;
branches;
next	1.10;
commitid	UCntbWD2hrp00QPA;

1.10
date	2018.08.27.14.16.38;	author riastradh;	state Exp;
branches;
next	1.9;
commitid	2rP20AjVG2T1yLPA;

1.9
date	2018.08.27.13.52.58;	author riastradh;	state Exp;
branches;
next	1.8;
commitid	iwgDS9gPcHjVpLPA;

1.8
date	2018.08.27.13.52.47;	author riastradh;	state Exp;
branches;
next	1.7;
commitid	hsV8VC4PJyDRpLPA;

1.7
date	2016.02.24.22.04.15;	author skrll;	state Exp;
branches
	1.7.16.1
	1.7.18.1;
next	1.6;
commitid	JYP6fljR7INfxdWy;

1.6
date	2015.01.08.23.35.47;	author riastradh;	state Exp;
branches;
next	1.5;
commitid	D3xTQtRvgcRqih5y;

1.5
date	2014.09.14.20.09.18;	author riastradh;	state Exp;
branches
	1.5.2.1;
next	1.4;
commitid	1CXfyzzd1XhMSlQx;

1.4
date	2014.07.17.13.52.22;	author riastradh;	state Exp;
branches
	1.4.2.1
	1.4.4.1;
next	1.3;
commitid	lJSnegjr4z6HGJIx;

1.3
date	2014.07.16.20.56.26;	author riastradh;	state Exp;
branches;
next	1.2;
commitid	HSaGIfvEpvYt4EIx;

1.2
date	2014.03.18.18.20.43;	author riastradh;	state Exp;
branches
	1.2.2.1
	1.2.4.1
	1.2.6.1;
next	1.1;
commitid	YersUbOm2SKa4dtx;

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

1.7.16.1
date	2018.09.06.06.56.43;	author pgoyette;	state Exp;
branches;
next	;
commitid	HCi1bXD317XIK0RA;

1.7.18.1
date	2019.06.10.22.09.21;	author christos;	state Exp;
branches;
next	;
commitid	jtc8rnCzWiEEHGqB;

1.5.2.1
date	2015.04.06.15.18.21;	author skrll;	state Exp;
branches;
next	1.5.2.2;
commitid	pz01Zhy7RP6iGxgy;

1.5.2.2
date	2016.03.19.11.30.32;	author skrll;	state Exp;
branches;
next	;
commitid	2PHKtPSg1vDV9fZy;

1.4.2.1
date	2015.01.11.05.59.18;	author snj;	state Exp;
branches;
next	1.4.2.2;
commitid	tIqDrPTMaOaMlz5y;

1.4.2.2
date	2015.03.06.21.39.11;	author snj;	state Exp;
branches
	1.4.2.2.4.1;
next	1.4.2.3;
commitid	pSdtnqChR7iEOAcy;

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

1.4.2.2.4.1
date	2016.09.10.06.46.09;	author skrll;	state Exp;
branches;
next	;
commitid	Y4H5ydDxRxto4Ilz;

1.4.4.1
date	2014.07.17.13.52.22;	author tls;	state dead;
branches;
next	1.4.4.2;
commitid	jTnpym9Qu0o4R1Nx;

1.4.4.2
date	2014.08.20.00.04.33;	author tls;	state Exp;
branches;
next	1.4.4.3;
commitid	jTnpym9Qu0o4R1Nx;

1.4.4.3
date	2017.12.03.11.38.52;	author jdolecek;	state Exp;
branches;
next	;
commitid	XcIYRZTAh1LmerhA;

1.2.2.1
date	2014.08.10.06.56.10;	author tls;	state Exp;
branches;
next	;
commitid	i4aS5ndhchyrCMLx;

1.2.4.1
date	2014.03.18.18.20.43;	author rmind;	state dead;
branches;
next	1.2.4.2;
commitid	mL5ZYSzpqK6QS2Bx;

1.2.4.2
date	2014.05.18.17.46.11;	author rmind;	state Exp;
branches;
next	;
commitid	mL5ZYSzpqK6QS2Bx;

1.2.6.1
date	2014.03.18.18.20.43;	author yamt;	state dead;
branches;
next	1.2.6.2;
commitid	VUUXuyNWnt3AKwBx;

1.2.6.2
date	2014.05.22.11.41.07;	author yamt;	state Exp;
branches;
next	;
commitid	VUUXuyNWnt3AKwBx;

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


desc
@@


1.15
log
@drm: Dust off module build a little.
@
text
@# $NetBSD: Makefile,v 1.14 2021/12/19 11:54:24 riastradh Exp $

#
# At some point this needs to turn into linux.kmod and a proper home for it
# found.  For now pickup the linux_work.c from the (increasingly poorly
# named) common area.
#

.include "../Makefile.inc"

.PATH: ${S}/external/bsd/common/linux
.PATH: ${S}/external/bsd/drm2/linux

CPPFLAGS+=	-I${S}/external/bsd/common/include
CPPFLAGS+=	-I${S}/external/bsd/drm2/include

# XXX Kludge!
CPPFLAGS+=	-DDIAGNOSTIC

KMOD=	drmkms_linux

# common/linux
SRCS+=	linux_rcu.c
SRCS+=	linux_srcu.c
SRCS+=	linux_tasklet.c
SRCS+=	linux_work.c

# drm2/linux
SRCS+=	linux_atomic64.c
SRCS+=	linux_backlight.c
SRCS+=	linux_dma_buf.c
SRCS+=	linux_dma_fence.c
SRCS+=	linux_dma_fence_array.c
SRCS+=	linux_dma_fence_chain.c
SRCS+=	linux_dma_resv.c
SRCS+=	linux_dmi.c
SRCS+=	linux_firmware.c
SRCS+=	linux_hrtimer.c
SRCS+=	linux_i2c.c
SRCS+=	linux_idr.c
SRCS+=	linux_irq_work.c
SRCS+=	linux_kmap.c
SRCS+=	linux_list_sort.c
SRCS+=	linux_module.c
SRCS+=	linux_notifier.c
SRCS+=	linux_pci.c
SRCS+=	linux_radixtree.c
SRCS+=	linux_rwsem.c
SRCS+=	linux_sgt.c
SRCS+=	linux_stop_machine.c
SRCS+=	linux_sync_file.c
SRCS+=	linux_wait_bit.c
SRCS+=	linux_writecomb.c
SRCS+=	linux_ww_mutex.c
SRCS+=	linux_xa.c

WARNS=	3

.include <bsd.kmodule.mk>
@


1.14
log
@drm: Sync (device-independent) drmkms*.kmod makefiles.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.13 2021/12/19 00:27:09 riastradh Exp $
d49 1
a49 1
SRCS+=	linux_sg.c
@


1.13
log
@Rename fence -> dma_fence, step 2: files files.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.12 2019/02/17 04:05:47 rin Exp $
d22 7
d30 1
d33 3
d37 2
d41 1
d45 8
a52 3
SRCS+=	linux_rcu.c
SRCS+=	linux_reservation.c
SRCS+=	linux_work.c		# XXX Move me to linux.kmod.
d55 1
@


1.12
log
@Bump default value of WARNS for modules from 3 to 5, and
explicitly set WARNS for modules that fail with WARNS=5.

Also, turn on -Wno-missing-noreturn for clang for some files.

At the moment, among ~ 360 modules,
- 2 (lua and zfs) need WARNS=0
- 1 (solaris) needs WARNS=1
- 136 need WARNS=3 (mostly due to sign-compare)
- 4 need WARNS=4
- others can be compiled with WARNS=5

Discussed on tech-kern.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.11 2018/08/28 03:41:40 riastradh Exp $
d24 1
a25 1
SRCS+=	linux_fence.c
@


1.11
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$
d37 2
@


1.10
log
@Move the Linux PCI shim into its very own .c file.

The poor thing has deserved this for a very long time, even though it
is full of kludges.  Also I'm tired of recompiling everything every
time I touch it.
@
text
@d22 2
a30 1
SRCS+=	linux_pci.c
@


1.9
log
@Add some components to drmkms_linux.kmod.
@
text
@d29 1
@


1.8
log
@Sort.
@
text
@d23 1
d29 3
a31 1
SRCS+=	linux_work.c
@


1.7
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: Makefile,v 1.6 2015/01/08 23:35:47 riastradh Exp $
d11 1
a12 1
.PATH: ${S}/external/bsd/common/linux
a22 1
SRCS+=	linux_kmap.c
d25 1
@


1.7.18.1
log
@Sync with HEAD
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.12 2019/02/17 04:05:47 rin Exp $
d11 1
a12 1
.PATH: ${S}/external/bsd/drm2/linux
a21 2
SRCS+=	linux_atomic64.c
SRCS+=	linux_dma_buf.c
d23 1
a23 1
SRCS+=	linux_fence.c
a25 1
SRCS+=	linux_kmap.c
d28 1
a28 3
SRCS+=	linux_rcu.c
SRCS+=	linux_reservation.c
SRCS+=	linux_work.c		# XXX Move me to linux.kmod.
a31 2
WARNS=	3

@


1.7.16.1
log
@Sync with HEAD

Resolve a couple of conflicts (result of the uimin/uimax changes)
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.11 2018/08/28 03:41:40 riastradh Exp $
d11 1
a12 1
.PATH: ${S}/external/bsd/drm2/linux
a21 2
SRCS+=	linux_atomic64.c
SRCS+=	linux_dma_buf.c
d23 1
a23 1
SRCS+=	linux_fence.c
a25 1
SRCS+=	linux_kmap.c
d28 1
a28 3
SRCS+=	linux_rcu.c
SRCS+=	linux_reservation.c
SRCS+=	linux_work.c		# XXX Move me to linux.kmod.
@


1.6
log
@Move Linux ww_mutex code into a .c file where it belongs.
@
text
@d1 7
a7 1
# $NetBSD: Makefile,v 1.5 2014/09/14 20:09:18 riastradh Exp $
d12 1
@


1.5
log
@Fix module build of drmkms_linux.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.4 2014/07/17 13:52:22 riastradh Exp $
d23 1
@


1.5.2.1
log
@Sync with HEAD
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.6 2015/01/08 23:35:47 riastradh Exp $
a22 1
SRCS+=	linux_ww_mutex.c
@


1.5.2.2
log
@Sync with HEAD
@
text
@d1 1
a1 7
# $NetBSD: Makefile,v 1.5.2.1 2015/04/06 15:18:21 skrll Exp $

#
# At some point this needs to turn into linux.kmod and a proper home for it
# found.  For now pickup the linux_work.c from the (increasingly poorly
# named) common area.
#
a5 1
.PATH: ${S}/external/bsd/common/linux
@


1.4
log
@Remove needless linux_gfp.c.

Trying to make do with Linux's page allocation interface is pretty
much always wrong: either we let uvm allocate pages in uvm objects
for us, or we use bus_dma.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.3 2014/07/16 20:56:26 riastradh Exp $
d7 1
@


1.4.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: Makefile,v 1.4 2014/07/17 13:52:22 riastradh Exp $
a6 1
CPPFLAGS+=	-I${S}/external/bsd/common/include
@


1.4.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: Makefile,v 1.4.2.1 2015/01/11 05:59:18 snj Exp $
a22 1
SRCS+=	linux_ww_mutex.c
@


1.4.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 7
# $NetBSD: Makefile,v 1.4.2.2.4.1 2016/09/10 06:46:09 skrll Exp $

#
# At some point this needs to turn into linux.kmod and a proper home for it
# found.  For now pickup the linux_work.c from the (increasingly poorly
# named) common area.
#
a5 1
.PATH: ${S}/external/bsd/common/linux
@


1.4.2.2.4.1
log
@Sync with HEAD
@
text
@d1 1
a1 7
# $NetBSD: Makefile,v 1.4.2.2 2015/03/06 21:39:11 snj Exp $

#
# At some point this needs to turn into linux.kmod and a proper home for it
# found.  For now pickup the linux_work.c from the (increasingly poorly
# named) common area.
#
a5 1
.PATH: ${S}/external/bsd/common/linux
@


1.4.4.1
log
@file Makefile was added on branch tls-maxphys on 2014-08-20 00:04:33 +0000
@
text
@d1 23
@


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

.include "../Makefile.inc"

.PATH: ${S}/external/bsd/drm2/linux

CPPFLAGS+=	-I${S}/external/bsd/drm2/include

# XXX Kludge!
CPPFLAGS+=	-DDIAGNOSTIC

KMOD=	drmkms_linux

SRCS+=	linux_dmi.c
SRCS+=	linux_kmap.c
SRCS+=	linux_i2c.c
SRCS+=	linux_idr.c
SRCS+=	linux_list_sort.c
SRCS+=	linux_module.c
SRCS+=	linux_work.c
SRCS+=	linux_writecomb.c

.include <bsd.kmodule.mk>
@


1.4.4.3
log
@update from HEAD
@
text
@a2 6
#
# At some point this needs to turn into linux.kmod and a proper home for it
# found.  For now pickup the linux_work.c from the (increasingly poorly
# named) common area.
#

a5 1
.PATH: ${S}/external/bsd/common/linux
a6 1
CPPFLAGS+=	-I${S}/external/bsd/common/include
a21 1
SRCS+=	linux_ww_mutex.c
@


1.3
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: Makefile,v 1.2 2014/03/18 18:20:43 riastradh Exp $
a14 1
SRCS+=	linux_gfp.c
@


1.2
log
@Merge riastradh-drm2 to HEAD.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.1.2.1 2014/03/04 20:45:17 riastradh Exp $
d14 1
d22 1
@


1.2.2.1
log
@Rebase.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.4 2014/07/17 13:52:22 riastradh Exp $
d14 1
a14 1
SRCS+=	linux_dmi.c
a20 1
SRCS+=	linux_writecomb.c
@


1.2.6.1
log
@file Makefile was added on branch yamt-pagecache on 2014-05-22 11:41:07 +0000
@
text
@d1 22
@


1.2.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 22
# $NetBSD$

.include "../Makefile.inc"

.PATH: ${S}/external/bsd/drm2/linux

CPPFLAGS+=	-I${S}/external/bsd/drm2/include

# XXX Kludge!
CPPFLAGS+=	-DDIAGNOSTIC

KMOD=	drmkms_linux

SRCS+=	linux_gfp.c
SRCS+=	linux_kmap.c
SRCS+=	linux_i2c.c
SRCS+=	linux_idr.c
SRCS+=	linux_list_sort.c
SRCS+=	linux_module.c
SRCS+=	linux_work.c

.include <bsd.kmodule.mk>
@


1.2.4.1
log
@file Makefile was added on branch rmind-smpnet on 2014-05-18 17:46:11 +0000
@
text
@d1 22
@


1.2.4.2
log
@sync with head
@
text
@a0 22
# $NetBSD$

.include "../Makefile.inc"

.PATH: ${S}/external/bsd/drm2/linux

CPPFLAGS+=	-I${S}/external/bsd/drm2/include

# XXX Kludge!
CPPFLAGS+=	-DDIAGNOSTIC

KMOD=	drmkms_linux

SRCS+=	linux_gfp.c
SRCS+=	linux_kmap.c
SRCS+=	linux_i2c.c
SRCS+=	linux_idr.c
SRCS+=	linux_list_sort.c
SRCS+=	linux_module.c
SRCS+=	linux_work.c

.include <bsd.kmodule.mk>
@


1.1
log
@file Makefile was initially added on branch riastradh-drm2.
@
text
@d1 22
@


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 22
# $NetBSD$

.include "../Makefile.inc"

.PATH: ${S}/external/bsd/drm2/linux

CPPFLAGS+=	-I${S}/external/bsd/drm2/include

# XXX Kludge!
CPPFLAGS+=	-DDIAGNOSTIC

KMOD=	drmkms_linux

SRCS+=	linux_gfp.c
SRCS+=	linux_kmap.c
SRCS+=	linux_i2c.c
SRCS+=	linux_idr.c
SRCS+=	linux_list_sort.c
SRCS+=	linux_module.c
SRCS+=	linux_work.c

.include <bsd.kmodule.mk>
@