head	1.11;
access;
symbols
	netbsd-11-0-RC4:1.11
	netbsd-11-0-RC3:1.11
	netbsd-11-0-RC2:1.11
	netbsd-11-0-RC1:1.11
	perseant-exfatfs-base-20250801:1.11
	netbsd-11:1.11.0.8
	netbsd-11-base:1.11
	netbsd-10-1-RELEASE:1.10.4.1
	perseant-exfatfs-base-20240630:1.11
	perseant-exfatfs:1.11.0.6
	perseant-exfatfs-base:1.11
	netbsd-8-3-RELEASE:1.5
	netbsd-9-4-RELEASE:1.9
	netbsd-10-0-RELEASE:1.10.4.1
	netbsd-10-0-RC6:1.10.4.1
	netbsd-10-0-RC5:1.10.4.1
	netbsd-10-0-RC4:1.10.4.1
	netbsd-10-0-RC3:1.10.4.1
	netbsd-10-0-RC2:1.10.4.1
	thorpej-ifq:1.11.0.4
	thorpej-ifq-base:1.11
	thorpej-altq-separation:1.11.0.2
	thorpej-altq-separation-base:1.11
	netbsd-10-0-RC1:1.10.4.1
	netbsd-10:1.10.0.4
	netbsd-10-base:1.10
	bouyer-sunxi-drm:1.10.0.2
	bouyer-sunxi-drm-base:1.10
	netbsd-9-3-RELEASE:1.9
	thorpej-i2c-spi-conf2:1.9.0.26
	thorpej-i2c-spi-conf2-base:1.9
	thorpej-futex2:1.9.0.24
	thorpej-futex2-base:1.9
	thorpej-cfargs2:1.9.0.22
	thorpej-cfargs2-base:1.9
	cjep_sun2x-base1:1.9
	cjep_sun2x:1.9.0.20
	cjep_sun2x-base:1.9
	cjep_staticlib_x-base1:1.9
	netbsd-9-2-RELEASE:1.9
	cjep_staticlib_x:1.9.0.18
	cjep_staticlib_x-base:1.9
	thorpej-i2c-spi-conf:1.9.0.16
	thorpej-i2c-spi-conf-base:1.9
	thorpej-cfargs:1.9.0.14
	thorpej-cfargs-base:1.9
	thorpej-futex:1.9.0.12
	thorpej-futex-base:1.9
	netbsd-9-1-RELEASE:1.9
	bouyer-xenpvh-base2:1.9
	phil-wifi-20200421:1.9
	bouyer-xenpvh-base1:1.9
	phil-wifi-20200411:1.9
	bouyer-xenpvh:1.9.0.10
	bouyer-xenpvh-base:1.9
	is-mlppp:1.9.0.8
	is-mlppp-base:1.9
	phil-wifi-20200406:1.9
	netbsd-8-2-RELEASE:1.5
	ad-namecache-base3:1.9
	netbsd-9-0-RELEASE:1.9
	netbsd-9-0-RC2:1.9
	ad-namecache-base2:1.9
	ad-namecache-base1:1.9
	ad-namecache:1.9.0.6
	ad-namecache-base:1.9
	netbsd-9-0-RC1:1.9
	phil-wifi-20191119:1.9
	netbsd-9:1.9.0.4
	netbsd-9-base:1.9
	phil-wifi-20190609:1.9
	netbsd-8-1-RELEASE:1.5
	netbsd-8-1-RC1:1.5
	isaki-audio2:1.9.0.2
	isaki-audio2-base:1.9
	pgoyette-compat-merge-20190127:1.5.16.1
	pgoyette-compat-20190127:1.8
	pgoyette-compat-20190118:1.8
	pgoyette-compat-1226:1.8
	pgoyette-compat-1126:1.8
	pgoyette-compat-1020:1.8
	pgoyette-compat-0930:1.8
	pgoyette-compat-0906:1.8
	netbsd-7-2-RELEASE:1.2.8.1
	pgoyette-compat-0728:1.5
	netbsd-8-0-RELEASE:1.5
	phil-wifi:1.5.0.18
	phil-wifi-base:1.5
	pgoyette-compat-0625:1.5
	netbsd-8-0-RC2:1.5
	pgoyette-compat-0521:1.5
	pgoyette-compat-0502:1.5
	pgoyette-compat-0422:1.5
	netbsd-8-0-RC1:1.5
	pgoyette-compat-0415:1.5
	pgoyette-compat-0407:1.5
	pgoyette-compat-0330:1.5
	pgoyette-compat-0322:1.5
	pgoyette-compat-0315:1.5
	netbsd-7-1-2-RELEASE:1.2.8.1
	pgoyette-compat:1.5.0.16
	pgoyette-compat-base:1.5
	netbsd-7-1-1-RELEASE:1.2.8.1
	tls-maxphys-base-20171202:1.5
	matt-nb8-mediatek:1.5.0.14
	matt-nb8-mediatek-base:1.5
	nick-nhusb-base-20170825:1.5
	perseant-stdc-iso10646:1.5.0.12
	perseant-stdc-iso10646-base:1.5
	netbsd-8:1.5.0.10
	netbsd-8-base:1.5
	prg-localcount2-base3:1.5
	prg-localcount2-base2:1.5
	prg-localcount2-base1:1.5
	prg-localcount2:1.5.0.8
	prg-localcount2-base:1.5
	pgoyette-localcount-20170426:1.5
	bouyer-socketcan-base1:1.5
	jdolecek-ncq:1.5.0.6
	jdolecek-ncq-base:1.5
	pgoyette-localcount-20170320:1.5
	netbsd-7-1:1.2.8.1.0.6
	netbsd-7-1-RELEASE:1.2.8.1
	netbsd-7-1-RC2:1.2.8.1
	nick-nhusb-base-20170204:1.5
	netbsd-7-nhusb-base-20170116:1.2.8.1
	bouyer-socketcan:1.5.0.4
	bouyer-socketcan-base:1.5
	pgoyette-localcount-20170107:1.5
	netbsd-7-1-RC1:1.2.8.1
	nick-nhusb-base-20161204:1.5
	pgoyette-localcount-20161104:1.5
	netbsd-7-0-2-RELEASE:1.2.8.1
	nick-nhusb-base-20161004:1.5
	localcount-20160914:1.5
	netbsd-7-nhusb:1.2.8.1.0.4
	netbsd-7-nhusb-base:1.2.8.1
	pgoyette-localcount-20160806:1.5
	pgoyette-localcount-20160726:1.5
	pgoyette-localcount:1.5.0.2
	pgoyette-localcount-base:1.5
	nick-nhusb-base-20160907:1.5
	nick-nhusb-base-20160529:1.5
	netbsd-7-0-1-RELEASE:1.2.8.1
	nick-nhusb-base-20160422:1.5
	nick-nhusb-base-20160319:1.5
	nick-nhusb-base-20151226:1.5
	netbsd-7-0:1.2.8.1.0.2
	netbsd-7-0-RELEASE:1.2.8.1
	nick-nhusb-base-20150921:1.5
	netbsd-7-0-RC3:1.2.8.1
	netbsd-7-0-RC2:1.2.8.1
	netbsd-7-0-RC1:1.2.8.1
	nick-nhusb-base-20150606:1.5
	nick-nhusb-base-20150406:1.5
	nick-nhusb:1.4.0.2
	nick-nhusb-base:1.4
	tls-maxphys-base:1.2
	tls-maxphys:1.2.0.10
	netbsd-7:1.2.0.8
	netbsd-7-base:1.2
	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.2
	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.11
date	2023.01.31.13.09.54;	author riastradh;	state Exp;
branches;
next	1.10;
commitid	oqyVl4IUGSrDaHbE;

1.10
date	2021.12.19.11.54.25;	author riastradh;	state Exp;
branches
	1.10.4.1;
next	1.9;
commitid	d7eObF37KhkQRflD;

1.9
date	2019.02.17.04.05.47;	author rin;	state Exp;
branches;
next	1.8;
commitid	viEUadQYccaOx4cB;

1.8
date	2018.08.28.03.48.38;	author riastradh;	state Exp;
branches;
next	1.7;
commitid	Yqa9vRxLXYrB2QPA;

1.7
date	2018.08.28.03.41.40;	author riastradh;	state Exp;
branches;
next	1.6;
commitid	UCntbWD2hrp00QPA;

1.6
date	2018.08.27.13.55.35;	author riastradh;	state Exp;
branches;
next	1.5;
commitid	e8EbOx0x1iAOqLPA;

1.5
date	2015.03.05.17.50.41;	author riastradh;	state Exp;
branches
	1.5.16.1
	1.5.18.1;
next	1.4;
commitid	DAvH2wkoIE72Arcy;

1.4
date	2014.11.22.19.18.08;	author riastradh;	state Exp;
branches
	1.4.2.1;
next	1.3;
commitid	oolj4c9zbwwondZx;

1.3
date	2014.11.12.02.14.17;	author christos;	state Exp;
branches;
next	1.2;
commitid	cRXvURgBqBJg2QXx;

1.2
date	2014.03.18.18.20.43;	author riastradh;	state Exp;
branches
	1.2.4.1
	1.2.6.1
	1.2.8.1
	1.2.10.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.10.4.1
date	2023.02.22.18.34.30;	author martin;	state Exp;
branches;
next	;
commitid	xjEdTzg1vUe9gyeE;

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

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

1.4.2.1
date	2015.04.06.15.18.21;	author skrll;	state Exp;
branches;
next	;
commitid	pz01Zhy7RP6iGxgy;

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.2.8.1
date	2015.03.06.21.39.11;	author snj;	state Exp;
branches;
next	;
commitid	pSdtnqChR7iEOAcy;

1.2.10.1
date	2014.03.18.18.20.43;	author tls;	state dead;
branches;
next	1.2.10.2;
commitid	jTnpym9Qu0o4R1Nx;

1.2.10.2
date	2014.08.20.00.04.33;	author tls;	state Exp;
branches;
next	1.2.10.3;
commitid	jTnpym9Qu0o4R1Nx;

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

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


desc
@@


1.11
log
@sys/modules/drmkms_pci: Remove drm_agpsupport.c.

This was moved to a separate drmkms_agp module.

XXX pullup-10
XXX pullup-9, maybe (not sure any of modularized drmkms works in 9, though)
@
text
@# $NetBSD: Makefile,v 1.10 2021/12/19 11:54:25 riastradh Exp $

.include "../Makefile.inc"
.include "../drmkms/Makefile.inc"

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

.PATH:	${S}/external/bsd/drm2/dist/drm

KMOD=	drmkms_pci

SRCS+=	drmfb_pci.c
SRCS+=	linux_pci.c

SRCS+=	drm_pci.c
SRCS+=	drm_pci_module.c

WARNS=	3

.include <bsd.kmodule.mk>
@


1.10
log
@drm: Sync (device-independent) drmkms*.kmod makefiles.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.9 2019/02/17 04:05:47 rin Exp $
a15 1
SRCS+=	drm_agpsupport.c
@


1.10.4.1
log
@Pull up following revision(s) (requested by riastradh in ticket #97):

	sys/modules/drmkms/Makefile: revision 1.19
	sys/modules/drmkms_pci/Makefile: revision 1.11

sys/modules/drmkms: Remove GPU scheduler files.
These have been moved out to drmkms_sched.kmod.

sys/modules/drmkms_pci: Remove drm_agpsupport.c.
This was moved to a separate drmkms_agp module.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.10 2021/12/19 11:54:25 riastradh Exp $
d16 1
@


1.9
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.8 2018/08/28 03:48:38 riastradh Exp $
a15 1
#SRCS+=	ati_pcigart.c		# XXX Restore for ATI support.
@


1.8
log
@Remove some superfluous vestigial `-I.'.
@
text
@d1 1
a1 1
# $NetBSD$
d21 2
@


1.7
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
@a12 2
CPPFLAGS+=	-I.

@


1.6
log
@Make drmkms_pci.kmod build again.
@
text
@d6 1
d8 1
d13 4
a16 2
CPPFLAGS+=	-DCONFIG_AGP
CPPFLAGS+=	-DCONFIG_PCI
a22 2
SRCS+=	drmfb_pci.c

@


1.5
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: Makefile,v 1.4 2014/11/22 19:18:08 riastradh Exp $
d11 3
@


1.5.18.1
log
@Sync with HEAD
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.9 2019/02/17 04:05:47 rin Exp $
a5 1
.PATH:	${S}/external/bsd/drm2/linux
a6 1

a10 3
SRCS+=	drmfb_pci.c
SRCS+=	linux_pci.c

d16 1
a16 1
WARNS=	3
@


1.5.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.8 2018/08/28 03:48:38 riastradh Exp $
a5 1
.PATH:	${S}/external/bsd/drm2/linux
a6 1

a10 3
SRCS+=	drmfb_pci.c
SRCS+=	linux_pci.c

d16 2
@


1.4
log
@Move all PCI/AGP code back to drmkms_pci module where it belongs.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.3 2014/11/12 02:14:17 christos Exp $
d16 2
@


1.4.2.1
log
@Sync with HEAD
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.5 2015/03/05 17:50:41 riastradh Exp $
a15 2
SRCS+=	drmfb_pci.c

@


1.3
log
@move agpsupport to drmkms to avoid circular dependencies.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.2 2014/03/18 18:20:43 riastradh Exp $
d12 1
a12 1
#SRCS+=	drm_agpsupport.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 $
d12 1
a12 1
SRCS+=	drm_agpsupport.c
@


1.2.8.1
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.2 2014/03/18 18:20:43 riastradh Exp $
a15 2
SRCS+=	drmfb_pci.c

@


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


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

.include "../Makefile.inc"
.include "../drmkms/Makefile.inc"

.PATH:	${S}/external/bsd/drm2/pci
.PATH:	${S}/external/bsd/drm2/dist/drm

KMOD=	drmkms_pci

#SRCS+=	ati_pcigart.c		# XXX Restore for ATI support.
SRCS+=	drm_agpsupport.c
SRCS+=	drm_pci.c
SRCS+=	drm_pci_module.c

.include <bsd.kmodule.mk>
@


1.2.10.3
log
@update from HEAD
@
text
@a15 2
SRCS+=	drmfb_pci.c

@


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


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

.include "../Makefile.inc"
.include "../drmkms/Makefile.inc"

.PATH:	${S}/external/bsd/drm2/pci
.PATH:	${S}/external/bsd/drm2/dist/drm

KMOD=	drmkms_pci

#SRCS+=	ati_pcigart.c		# XXX Restore for ATI support.
SRCS+=	drm_agpsupport.c
SRCS+=	drm_pci.c
SRCS+=	drm_pci_module.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 16
@


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

.include "../Makefile.inc"
.include "../drmkms/Makefile.inc"

.PATH:	${S}/external/bsd/drm2/pci
.PATH:	${S}/external/bsd/drm2/dist/drm

KMOD=	drmkms_pci

#SRCS+=	ati_pcigart.c		# XXX Restore for ATI support.
SRCS+=	drm_agpsupport.c
SRCS+=	drm_pci.c
SRCS+=	drm_pci_module.c

.include <bsd.kmodule.mk>
@


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


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

.include "../Makefile.inc"
.include "../drmkms/Makefile.inc"

.PATH:	${S}/external/bsd/drm2/pci
.PATH:	${S}/external/bsd/drm2/dist/drm

KMOD=	drmkms_pci

#SRCS+=	ati_pcigart.c		# XXX Restore for ATI support.
SRCS+=	drm_agpsupport.c
SRCS+=	drm_pci.c
SRCS+=	drm_pci_module.c

.include <bsd.kmodule.mk>
@