head	1.3;
access;
symbols
	netbsd-11-0-RC4:1.3
	netbsd-11-0-RC3:1.3
	netbsd-11-0-RC2:1.3
	netbsd-11-0-RC1:1.3
	perseant-exfatfs-base-20250801:1.3
	netbsd-11:1.3.0.12
	netbsd-11-base:1.3
	netbsd-10-1-RELEASE:1.3
	perseant-exfatfs-base-20240630:1.3
	perseant-exfatfs:1.3.0.10
	perseant-exfatfs-base:1.3
	netbsd-8-3-RELEASE:1.1.1.2
	netbsd-10-0-RELEASE:1.3
	netbsd-10-0-RC6:1.3
	netbsd-10-0-RC5:1.3
	netbsd-10-0-RC4:1.3
	netbsd-10-0-RC3:1.3
	netbsd-10-0-RC2:1.3
	thorpej-ifq:1.3.0.8
	thorpej-ifq-base:1.3
	thorpej-altq-separation:1.3.0.6
	thorpej-altq-separation-base:1.3
	netbsd-10-0-RC1:1.3
	netbsd-10:1.3.0.4
	netbsd-10-base:1.3
	bouyer-sunxi-drm:1.3.0.2
	bouyer-sunxi-drm-base:1.3
	linux-drm-v5-6-rc3:1.1.1.3
	cjep_sun2x:1.2.0.10
	cjep_sun2x-base:1.2
	cjep_staticlib_x-base1:1.2
	cjep_staticlib_x:1.2.0.8
	cjep_staticlib_x-base:1.2
	thorpej-futex-base:1.2
	bouyer-xenpvh-base2:1.2
	phil-wifi-20200421:1.2
	bouyer-xenpvh-base1:1.2
	phil-wifi-20200411:1.2
	bouyer-xenpvh:1.2.0.6
	bouyer-xenpvh-base:1.2
	phil-wifi-20200406:1.2
	netbsd-8-2-RELEASE:1.1.1.2
	ad-namecache-base3:1.2
	ad-namecache-base2:1.2
	ad-namecache-base1:1.2
	ad-namecache:1.2.0.4
	ad-namecache-base:1.2
	netbsd-8-1-RELEASE:1.1.1.2
	netbsd-8-1-RC1:1.1.1.2
	isaki-audio2:1.2.0.2
	isaki-audio2-base:1.2
	pgoyette-compat-merge-20190127:1.1.1.2.28.1
	pgoyette-compat-20190127:1.2
	pgoyette-compat-20190118:1.2
	pgoyette-compat-1226:1.2
	pgoyette-compat-1126:1.2
	pgoyette-compat-1020:1.2
	pgoyette-compat-0930:1.2
	pgoyette-compat-0906:1.2
	netbsd-7-2-RELEASE:1.1.1.2
	pgoyette-compat-0728:1.1.1.2
	netbsd-8-0-RELEASE:1.1.1.2
	phil-wifi:1.1.1.2.0.30
	phil-wifi-base:1.1.1.2
	pgoyette-compat-0625:1.1.1.2
	netbsd-8-0-RC2:1.1.1.2
	pgoyette-compat-0521:1.1.1.2
	pgoyette-compat-0502:1.1.1.2
	pgoyette-compat-0422:1.1.1.2
	netbsd-8-0-RC1:1.1.1.2
	pgoyette-compat-0415:1.1.1.2
	pgoyette-compat-0407:1.1.1.2
	pgoyette-compat-0330:1.1.1.2
	pgoyette-compat-0322:1.1.1.2
	pgoyette-compat-0315:1.1.1.2
	netbsd-7-1-2-RELEASE:1.1.1.2
	pgoyette-compat:1.1.1.2.0.28
	pgoyette-compat-base:1.1.1.2
	netbsd-7-1-1-RELEASE:1.1.1.2
	tls-maxphys-base-20171202:1.1.1.2
	matt-nb8-mediatek:1.1.1.2.0.26
	matt-nb8-mediatek-base:1.1.1.2
	nick-nhusb-base-20170825:1.1.1.2
	perseant-stdc-iso10646:1.1.1.2.0.24
	perseant-stdc-iso10646-base:1.1.1.2
	netbsd-8:1.1.1.2.0.22
	netbsd-8-base:1.1.1.2
	prg-localcount2-base3:1.1.1.2
	prg-localcount2-base2:1.1.1.2
	prg-localcount2-base1:1.1.1.2
	prg-localcount2:1.1.1.2.0.20
	prg-localcount2-base:1.1.1.2
	pgoyette-localcount-20170426:1.1.1.2
	bouyer-socketcan-base1:1.1.1.2
	jdolecek-ncq:1.1.1.2.0.18
	jdolecek-ncq-base:1.1.1.2
	pgoyette-localcount-20170320:1.1.1.2
	netbsd-7-1:1.1.1.2.0.16
	netbsd-7-1-RELEASE:1.1.1.2
	netbsd-7-1-RC2:1.1.1.2
	nick-nhusb-base-20170204:1.1.1.2
	netbsd-7-nhusb-base-20170116:1.1.1.2
	bouyer-socketcan:1.1.1.2.0.14
	bouyer-socketcan-base:1.1.1.2
	pgoyette-localcount-20170107:1.1.1.2
	netbsd-7-1-RC1:1.1.1.2
	nick-nhusb-base-20161204:1.1.1.2
	pgoyette-localcount-20161104:1.1.1.2
	netbsd-7-0-2-RELEASE:1.1.1.2
	nick-nhusb-base-20161004:1.1.1.2
	localcount-20160914:1.1.1.2
	netbsd-7-nhusb:1.1.1.2.0.12
	netbsd-7-nhusb-base:1.1.1.2
	pgoyette-localcount-20160806:1.1.1.2
	pgoyette-localcount-20160726:1.1.1.2
	pgoyette-localcount:1.1.1.2.0.10
	pgoyette-localcount-base:1.1.1.2
	nick-nhusb-base-20160907:1.1.1.2
	nick-nhusb-base-20160529:1.1.1.2
	netbsd-7-0-1-RELEASE:1.1.1.2
	nick-nhusb-base-20160422:1.1.1.2
	nick-nhusb-base-20160319:1.1.1.2
	nick-nhusb-base-20151226:1.1.1.2
	netbsd-7-0:1.1.1.2.0.8
	netbsd-7-0-RELEASE:1.1.1.2
	nick-nhusb-base-20150921:1.1.1.2
	netbsd-7-0-RC3:1.1.1.2
	netbsd-7-0-RC2:1.1.1.2
	netbsd-7-0-RC1:1.1.1.2
	nick-nhusb-base-20150606:1.1.1.2
	nick-nhusb-base-20150406:1.1.1.2
	nick-nhusb:1.1.1.2.0.6
	nick-nhusb-base:1.1.1.2
	tls-maxphys-base:1.1.1.2
	tls-maxphys:1.1.1.2.0.4
	netbsd-7:1.1.1.2.0.2
	netbsd-7-base:1.1.1.2
	linux-3-15-drm-bsd:1.1.1.2
	yamt-pagecache:1.1.1.1.0.8
	yamt-pagecache-base9:1.1.1.1
	tls-earlyentropy:1.1.1.1.0.6
	tls-earlyentropy-base:1.1.1.2
	riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.1.1.1
	riastradh-drm2-base3:1.1.1.1
	rmind-smpnet-base:1.1.1.1
	rmind-smpnet:1.1.1.1.0.4
	rmind-smpnet-nbase:1.1.1.1
	riastradh-drm2:1.1.1.1.0.2
	riastradh-drm2-base2:1.1.1.1
	linux-3-6-rc8-drm2-bsd:1.1.1.1
	LINUX:1.1.1;
locks; strict;
comment	@# @;


1.3
date	2021.12.18.23.45.27;	author riastradh;	state Exp;
branches;
next	1.2;
commitid	Zzh9v7Bb24ydPblD;

1.2
date	2018.08.27.04.58.23;	author riastradh;	state dead;
branches;
next	1.1;
commitid	SZZre9lWvwC1sIPA;

1.1
date	2013.07.23.02.13.11;	author riastradh;	state Exp;
branches
	1.1.1.1;
next	;
commitid	muz3qjDNaUyelxYw;

1.1.1.1
date	2013.07.23.02.13.11;	author riastradh;	state Exp;
branches
	1.1.1.1.2.1
	1.1.1.1.4.1
	1.1.1.1.6.1
	1.1.1.1.8.1;
next	1.1.1.2;
commitid	muz3qjDNaUyelxYw;

1.1.1.2
date	2014.07.16.19.35.24;	author riastradh;	state Exp;
branches
	1.1.1.2.4.1
	1.1.1.2.28.1
	1.1.1.2.30.1;
next	1.1.1.3;
commitid	ENods5WXphhtCDIx;

1.1.1.3
date	2021.12.18.20.15.23;	author riastradh;	state Exp;
branches;
next	;
commitid	Qm9wp54q2SRJDalD;

1.1.1.1.2.1
date	2013.07.23.02.13.11;	author riastradh;	state dead;
branches;
next	1.1.1.1.2.2;
commitid	MN32yFPPnPsPKDYw;

1.1.1.1.2.2
date	2013.07.23.21.28.22;	author riastradh;	state Exp;
branches;
next	;
commitid	MN32yFPPnPsPKDYw;

1.1.1.1.4.1
date	2013.07.23.02.13.11;	author rmind;	state dead;
branches;
next	1.1.1.1.4.2;
commitid	cbp9Ov2uYijlqh3x;

1.1.1.1.4.2
date	2013.08.28.23.59.32;	author rmind;	state Exp;
branches;
next	;
commitid	cbp9Ov2uYijlqh3x;

1.1.1.1.6.1
date	2014.08.10.06.55.29;	author tls;	state Exp;
branches;
next	;
commitid	oVzXby2Mw1D8CMLx;

1.1.1.1.8.1
date	2013.07.23.02.13.11;	author yamt;	state dead;
branches;
next	1.1.1.1.8.2;
commitid	VUUXuyNWnt3AKwBx;

1.1.1.1.8.2
date	2014.05.22.11.40.53;	author yamt;	state Exp;
branches;
next	;
commitid	VUUXuyNWnt3AKwBx;

1.1.1.2.4.1
date	2014.07.16.19.35.24;	author tls;	state dead;
branches;
next	1.1.1.2.4.2;
commitid	jTnpym9Qu0o4R1Nx;

1.1.1.2.4.2
date	2014.08.20.00.04.09;	author tls;	state Exp;
branches;
next	;
commitid	jTnpym9Qu0o4R1Nx;

1.1.1.2.28.1
date	2018.09.06.06.56.16;	author pgoyette;	state dead;
branches;
next	;
commitid	HCi1bXD317XIK0RA;

1.1.1.2.30.1
date	2019.06.10.22.08.04;	author christos;	state dead;
branches;
next	;
commitid	jtc8rnCzWiEEHGqB;


desc
@@


1.3
log
@Merge linux-drm-v5-6-rc3
@
text
@# SPDX-License-Identifier: GPL-2.0
ch7006-y := ch7006_drv.o ch7006_mode.o
obj-$(CONFIG_DRM_I2C_CH7006) += ch7006.o

sil164-y := sil164_drv.o
obj-$(CONFIG_DRM_I2C_SIL164) += sil164.o

tda998x-y := tda998x_drv.o
obj-$(CONFIG_DRM_I2C_NXP_TDA998X) += tda998x.o
obj-$(CONFIG_DRM_I2C_NXP_TDA9950) += tda9950.o
@


1.2
log
@merge linux-drm-v4-4-143
@
text
@d1 1
a1 2
ccflags-y := -Iinclude/drm

d7 4
@


1.1
log
@Initial revision
@
text
@@


1.1.1.1
log
@Import drm sources from Linux v3.8-rc6.
(commit id 88b62b915b0b7e25870eb0604ed9a92ba4bfc9f7)

Linux                   NetBSD
drivers/gpu/drm         sys/external/bsd/drm2/dist/drm
include/drm             sys/external/bsd/drm2/dist/include/drm
include/uapi/drm        sys/external/bsd/drm2/dist/uapi/drm

Files/subtrees excluded because of licence issues, to be either
revisited later (particularly nouveau and radeon, which are mostly
permissively licensed but a number of whose files have no licence
statements), rewritten/ignored, or imported later as kernel modules
under external/gpl2 instead:

   include/drm/drm_fb_cma_helper.h
   include/drm/drm_gem_cma_helper.h
   include/drm/drm_os_linux.h
   include/drm/drm_pciids.h
   include/drm/drm_sysfs.h
   include/drm/drm_usb.h
   include/drm/exynos_drm.h
   include/drm/gma_drm.h
   include/drm/intel-gtt.h
   drm/cirrus
   drm/drm_edid_load.c
   drm/drm_fb_cma_helper.c
   drm/drm_gem_cma_helper.c
   drm/drm_sysfs.c
   drm/drm_trace.h
   drm/drm_trace_points.c
   drm/drm_usb.c
   drm/exynos
   drm/gma500
   drm/i915/i915_trace.h
   drm/i915/i915_trace_points.c
   drm/i915/intel_acpi.c
   drm/mgag200
   drm/nouveau
   drm/radeon
   drm/shmobile
   drm/tegra
   drm/udl
   uapi/exynos_drm.h
@
text
@@


1.1.1.1.6.1
log
@Rebase.
@
text
@a7 3

tda998x-y := tda998x_drv.o
obj-$(CONFIG_DRM_I2C_NXP_TDA998X) += tda998x.o
@


1.1.1.2
log
@Import drm from Linux 3.15 (commitid 1860e379875dfe7271c649058aeddffe5afd9d0d).

   drivers/gpu/drm      -> sys/external/bsd/drm2/dist/drm
   include/drm          -> sys/external/bsd/drm2/dist/include/drm
   include/uapi/drm     -> sys/external/bsd/drm2/dist/uapi/drm

GPL sources excluded.
@
text
@a7 3

tda998x-y := tda998x_drv.o
obj-$(CONFIG_DRM_I2C_NXP_TDA998X) += tda998x.o
@


1.1.1.3
log
@Import drm from Linux v5.6-rc3 (commit f8788d86ab28f61f7b46eb6be375f8a726783636)

    drivers/gpu/drm     -> sys/external/bsd/drm2/dist/drm
    include/drm         -> sys/external/bsd/drm2/dist/include/drm
    include/uapi/drm    -> sys/external/bsd/drm2/dist/include/uapi/drm

GPL exclusions in dist/drm:

- amd/amdgpu/amdgpu_atpx_handler.c
- arc/
- arm/
- armada/
- aspeed/
- atmel-hlcdc/
- bochs/
- bridge/
- cirrus/
- drm_dp_cec.c
- drm_dp_mst_topology_internal.h
- drm_edid_load.c
- drm_format_helper.c
- drm_gem_cma_helper.c
- drm_gem_framebuffer_helper.c
- drm_gem_shmem_helper.c
- drm_gem_ttm_helper.c
- drm_gem_vram_helper.c
- drm_hdcp.c
- drm_lease.c
- drm_mipi_dbi.c
- drm_simple_kms_helper.c
- drm_sysfs.c
- drm_trace.h
- drm_vram_helper_common.c
- drm_writeback.c
- etnaviv/
- exynos/
- fsl-dcu/
- gma500/
- hisilicon/
- i2c/tda9950.c
- i2c/tda998x_drv.c
- i915/gt/selftest_context.c
- i915/gt/selftest_engine.c
- i915/gt/selftest_engine.h
- i915/gt/selftest_engine_cs.c
- i915/gt/selftest_engine_pm.c
- i915/i915_trace.h
- i915/selftests/i915_live_selftests.h
- i915/selftests/i915_mock_selftests.h
- i915/selftests/i915_perf_selftests.h
- i915/selftests/lib_sw_fence.h
- imx/
- ingenic/
- lima/
- mcde/
- mediatek/
- meson/
- mgag200/
- msm/
- mxsfb/
- omapdrm/
- panel/
- panfrost/
- pl111/
- radeon/radeon_atpx_handler.c
- rcar-du/
- rockchip/
- selftests/drm_cmdline_selftests.h
- selftests/drm_modeset_selftests.h
- selftests/test-drm_cmdline_parser.c
- selftests/test-drm_damage_helper.c
- selftests/test-drm_dp_mst_helper.c
- selftests/test-drm_format.c
- selftests/test-drm_framebuffer.c
- selftests/test-drm_modeset_common.c
- selftests/test-drm_modeset_common.h
- selftests/test-drm_plane_helper.c
- selftests/test-drm_rect.c
- shmobile/
- sti/
- stm/
- sun4i/
- tegra/
- tilcdc/
- tiny/
- tve200/
- udl/
- v3d/
- vc4/
- virtio/virtgpu_trace.h
- virtio/virtgpu_trace_points.c
- vkms/
- vmwgfx/device_include/vmware_pack_begin.h
- vmwgfx/device_include/vmware_pack_end.h
- zte/

  Exceptions -- these all appear to be files to which someone added
  an SPDX license header automatically by a script that is not aware
  of the default MIT licensing under drivers/gpu/drm:

  - ast/ast_dp501.c
  - ast/ast_dram_tables.h
  - lib/drm_random.c
  - lib/drm_random.h
  - i915/display/intel_acpi.c
  - i915/selftests/mock_gem_device.h
  - i915/selftests/i915_mock_selftests.h
  - i915/selftests/i915_live_selftests.h
  - r128/ati_pcigart.h
  - selftests/drm_mm_selftests.h
  - selftests/test-drm_mm.c
  - vmwgfx/device_include/vm_basic_types.h

GPL exclusions in dist/include/drm:

- bridge
- drm_client.h
- drm_fb_cma_helper.h
- drm_format_helper.h
- drm_gem_cma_helper.h
- drm_gem_shmem_helper.h
- drm_gem_ttm_helper.h
- drm_gem_vram_helper.h
- drm_lease.h
- drm_mipi_dbi.h
- drm_mipi_dsi.h
- drm_of.h
- drm_simple_kms_helper.h
- drm_sysfs.h
- drm_writeback.h
- gma_drm.h
- i2c/tda998x.h
- i915_mei_hdcp_interface.h
- intel-gtt.h

  Exceptions:
  - drm_agpsupport.h - was in original drm; wrong spdx header auto-added

GPL exclusions in dist/include/uapi/drm:

- armada_drm.h
- etnaviv_drm.h
- exynos_drm.h
- lima_drm.h
- omap_drm.h

  Exceptions:
  - i810_drm.h - was in original drm; spdx header is wrong
@
text
@d1 2
a2 1
# SPDX-License-Identifier: GPL-2.0
a10 1
obj-$(CONFIG_DRM_I2C_NXP_TDA9950) += tda9950.o
@


1.1.1.2.30.1
log
@Sync with HEAD
@
text
@@


1.1.1.2.28.1
log
@Sync with HEAD

Resolve a couple of conflicts (result of the uimin/uimax changes)
@
text
@@


1.1.1.2.4.1
log
@file Makefile was added on branch tls-maxphys on 2014-08-20 00:04:09 +0000
@
text
@d1 10
@


1.1.1.2.4.2
log
@Rebase to HEAD as of a few days ago.
@
text
@a0 10
ccflags-y := -Iinclude/drm

ch7006-y := ch7006_drv.o ch7006_mode.o
obj-$(CONFIG_DRM_I2C_CH7006) += ch7006.o

sil164-y := sil164_drv.o
obj-$(CONFIG_DRM_I2C_SIL164) += sil164.o

tda998x-y := tda998x_drv.o
obj-$(CONFIG_DRM_I2C_NXP_TDA998X) += tda998x.o
@


1.1.1.1.8.1
log
@file Makefile was added on branch yamt-pagecache on 2014-05-22 11:40:53 +0000
@
text
@d1 7
@


1.1.1.1.8.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 7
ccflags-y := -Iinclude/drm

ch7006-y := ch7006_drv.o ch7006_mode.o
obj-$(CONFIG_DRM_I2C_CH7006) += ch7006.o

sil164-y := sil164_drv.o
obj-$(CONFIG_DRM_I2C_SIL164) += sil164.o
@


1.1.1.1.4.1
log
@file Makefile was added on branch rmind-smpnet on 2013-08-28 23:59:32 +0000
@
text
@d1 7
@


1.1.1.1.4.2
log
@sync with head
@
text
@a0 7
ccflags-y := -Iinclude/drm

ch7006-y := ch7006_drv.o ch7006_mode.o
obj-$(CONFIG_DRM_I2C_CH7006) += ch7006.o

sil164-y := sil164_drv.o
obj-$(CONFIG_DRM_I2C_SIL164) += sil164.o
@


1.1.1.1.2.1
log
@file Makefile was added on branch riastradh-drm2 on 2013-07-23 21:28:22 +0000
@
text
@d1 7
@


1.1.1.1.2.2
log
@sync with HEAD and actually get the drm2 import
@
text
@a0 7
ccflags-y := -Iinclude/drm

ch7006-y := ch7006_drv.o ch7006_mode.o
obj-$(CONFIG_DRM_I2C_CH7006) += ch7006.o

sil164-y := sil164_drv.o
obj-$(CONFIG_DRM_I2C_SIL164) += sil164.o
@