head	1.1;
branch	1.1.1;
access;
symbols
	netbsd-11-0-RC4:1.1.1.1
	netbsd-11-0-RC3:1.1.1.1
	netbsd-11-0-RC2:1.1.1.1
	netbsd-11-0-RC1:1.1.1.1
	netbsd-11:1.1.1.1.0.16
	netbsd-11-base:1.1.1.1
	libdrm-2-4-124:1.1.1.1
	netbsd-10-1-RELEASE:1.1.1.1
	libdrm-2-4-122:1.1.1.1
	netbsd-8-3-RELEASE:1.1.1.1
	netbsd-9-4-RELEASE:1.1.1.1
	netbsd-10-0-RELEASE:1.1.1.1
	netbsd-10-0-RC6:1.1.1.1
	netbsd-10-0-RC5:1.1.1.1
	netbsd-10-0-RC4:1.1.1.1
	netbsd-10-0-RC3:1.1.1.1
	netbsd-10-0-RC2:1.1.1.1
	netbsd-10-0-RC1:1.1.1.1
	netbsd-10:1.1.1.1.0.14
	netbsd-10-base:1.1.1.1
	libdrm-2-4-114:1.1.1.1
	netbsd-9-3-RELEASE:1.1.1.1
	libdrm-2-4-112:1.1.1.1
	libdrm-2-4-109:1.1.1.1
	libdrm-2-4-107:1.1.1.1
	netbsd-9-2-RELEASE:1.1.1.1
	libdrm-2-4-105:1.1.1.1
	libdrm-2-4-102:1.1.1.1
	netbsd-9-1-RELEASE:1.1.1.1
	netbsd-8-2-RELEASE:1.1.1.1
	libdrm-2-4-100:1.1.1.1
	netbsd-9-0-RELEASE:1.1.1.1
	netbsd-9-0-RC2:1.1.1.1
	netbsd-9-0-RC1:1.1.1.1
	netbsd-9:1.1.1.1.0.12
	netbsd-9-base:1.1.1.1
	libdrm-2-4-99:1.1.1.1
	netbsd-8-1-RELEASE:1.1.1.1
	netbsd-8-1-RC1:1.1.1.1
	libdrm-2-4-97:1.1.1.1
	libdrm-2-4-96:1.1.1.1
	netbsd-7-2-RELEASE:1.1.1.1
	netbsd-8-0-RELEASE:1.1.1.1
	netbsd-8-0-RC2:1.1.1.1
	netbsd-8-0-RC1:1.1.1.1
	netbsd-7-1-2-RELEASE:1.1.1.1
	libdrm-2-4-91:1.1.1.1
	netbsd-7-1-1-RELEASE:1.1.1.1
	libdrm-2-4-83:1.1.1.1
	netbsd-8:1.1.1.1.0.10
	netbsd-8-base:1.1.1.1
	netbsd-7-1:1.1.1.1.0.8
	netbsd-7-1-RELEASE:1.1.1.1
	libdrm-2-4-75:1.1.1.1
	netbsd-7-1-RC2:1.1.1.1
	netbsd-7-1-RC1:1.1.1.1
	netbsd-7-0-2-RELEASE:1.1.1.1
	libdrm-2-4-70:1.1.1.1
	netbsd-6:1.1.1.1.0.6
	netbsd-7-0-1-RELEASE:1.1.1.1
	netbsd-7-0:1.1.1.1.0.4
	netbsd-7-0-RELEASE:1.1.1.1
	netbsd-7-0-RC3:1.1.1.1
	netbsd-7-0-RC2:1.1.1.1
	libdrm-2-4-62:1.1.1.1
	netbsd-7-0-RC1:1.1.1.1
	libdrm-2-4-59:1.1.1.1
	libdrm-2-4-58:1.1.1.1
	netbsd-7:1.1.1.1.0.2
	netbsd-7-base:1.1.1.1
	libdrm-2-4-54:1.1.1.1
	riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.1.1.1
	libdrm-2-4-52:1.1.1.1
	xorg:1.1.1;
locks; strict;
comment	@# @;


1.1
date	2014.03.17.07.51.43;	author mrg;	state Exp;
branches
	1.1.1.1;
next	;
commitid	e8QhQJtwbPKsC1tx;

1.1.1.1
date	2014.03.17.07.51.43;	author mrg;	state Exp;
branches
	1.1.1.1.6.1;
next	;
commitid	e8QhQJtwbPKsC1tx;

1.1.1.1.6.1
date	2014.03.17.07.51.43;	author snj;	state dead;
branches;
next	1.1.1.1.6.2;
commitid	LLcJqXC4PLAfdcez;

1.1.1.1.6.2
date	2016.07.13.19.33.59;	author snj;	state Exp;
branches;
next	;
commitid	LLcJqXC4PLAfdcez;


desc
@@


1.1
log
@Initial revision
@
text
@0x12300000:      0x54f08006: XY_SRC_COPY_BLT (rgb enabled, alpha enabled, src tile 1, dst tile 0)
0x12300004:      0x03cc0190:    format 8888, pitch 400, rop 0xcc, clipping disabled,  
0x12300008:      0x00000000:    dst (0,0)
0x1230000c:      0x00640064:    dst (100,100)
0x12300010:      0x122e9000:    dst offset 0x122e9000
0x12300014:      0x00000000:    src (0,0)
0x12300018:      0x00000080:    src pitch 128
0x1230001c:      0x02ff1000:    src offset 0x02ff1000
0x12300020:      0x13000002: MI_FLUSH_DW post_sync_op='no write' 
0x12300024:      0x00000000:    address
0x12300028:      0x00000000:    dword
0x1230002c:      0x00000000:    upper dword
0x12300030:      0x05000000: MI_BATCH_BUFFER_END
0x12300034:      0x00000000:    
@


1.1.1.1
log
@initial import of libdrm-2.4.52
@
text
@@


1.1.1.1.6.1
log
@file gen7-2d-copy.batch-ref.txt was added on branch netbsd-6 on 2016-07-13 19:33:59 +0000
@
text
@d1 14
@


1.1.1.1.6.2
log
@Pull up following revision(s) (requested by mrg in ticket #1326):
	distrib/sets/lists/xbase/shl.mi: patch
	distrib/sets/lists/xcomp/mi: patch
	distrib/sets/lists/xcomp/shl.mi: patch
	external/mit/xorg/lib/libdrm/Makefile: patch
	external/mit/xorg/lib/libdrm/Makefile.defines: patch
	external/mit/xorg/lib/libdrm/shlib_version: patch
	external/mit/xorg/lib/libdrm/drm/Makefile: patch
	external/mit/xorg/lib/libdrm_intel/Makefile: patch
	external/mit/xorg/lib/libdrm_radeon/Makefile: patch
	external/mit/xorg/lib/libdrm_radeon/shlib_version: patch
	external/mit/xorg/server/drivers/xf86-video-radeon/Makefile: revision 1.15
	external/mit/xorg/server/drivers/xf86-video-ati/Makefile: patch
	xsrc/external/mit/libdrm/dist/Makefile.am: patch
	xsrc/external/mit/libdrm/dist/Makefile.in: patch
	xsrc/external/mit/libdrm/dist/aclocal.m4: patch
	xsrc/external/mit/libdrm/dist/config.guess: patch
	xsrc/external/mit/libdrm/dist/config.h.in: patch
	xsrc/external/mit/libdrm/dist/config.sub: patch
	xsrc/external/mit/libdrm/dist/configure: patch
	xsrc/external/mit/libdrm/dist/configure.ac: patch
	xsrc/external/mit/libdrm/dist/depcomp: patch
	xsrc/external/mit/libdrm/dist/install-sh: patch
	xsrc/external/mit/libdrm/dist/libdrm_lists.h: patch
	xsrc/external/mit/libdrm/dist/ltmain.sh: patch
	xsrc/external/mit/libdrm/dist/missing: patch
	xsrc/external/mit/libdrm/dist/xf86drm.c: patch
	xsrc/external/mit/libdrm/dist/xf86drm.h: patch
	xsrc/external/mit/libdrm/dist/xf86drmMode.c: patch
	xsrc/external/mit/libdrm/dist/xf86drmMode.h: patch
	xsrc/external/mit/libdrm/dist/build-aux/config.guess: patch
	xsrc/external/mit/libdrm/dist/build-aux/config.sub: patch
	xsrc/external/mit/libdrm/dist/build-aux/depcomp: patch
	xsrc/external/mit/libdrm/dist/build-aux/install-sh: patch
	xsrc/external/mit/libdrm/dist/build-aux/ltmain.sh: patch
	xsrc/external/mit/libdrm/dist/build-aux/missing: patch
	xsrc/external/mit/libdrm/dist/exynos/Makefile.am: patch
	xsrc/external/mit/libdrm/dist/exynos/Makefile.in: patch
	xsrc/external/mit/libdrm/dist/exynos/exynos_drm.c: patch
	xsrc/external/mit/libdrm/dist/exynos/exynos_drm.h: patch
	xsrc/external/mit/libdrm/dist/exynos/exynos_drmif.h: patch
	xsrc/external/mit/libdrm/dist/exynos/libdrm_exynos.pc.in: patch
	xsrc/external/mit/libdrm/dist/include/Makefile.in: patch
	xsrc/external/mit/libdrm/dist/include/drm/Makefile: patch
	xsrc/external/mit/libdrm/dist/include/drm/Makefile.am: patch
	xsrc/external/mit/libdrm/dist/include/drm/Makefile.in: patch
	xsrc/external/mit/libdrm/dist/include/drm/drm.h: patch
	xsrc/external/mit/libdrm/dist/include/drm/drm_fourcc.h: patch
	xsrc/external/mit/libdrm/dist/include/drm/drm_mode.h: patch
	xsrc/external/mit/libdrm/dist/include/drm/i915_drm.h: patch
	xsrc/external/mit/libdrm/dist/include/drm/radeon_drm.h: patch
	xsrc/external/mit/libdrm/dist/intel/Makefile.am: patch
	xsrc/external/mit/libdrm/dist/intel/Makefile.in: patch
	xsrc/external/mit/libdrm/dist/intel/intel_aub.h:patch
	xsrc/external/mit/libdrm/dist/intel/intel_bufmgr.c: patch
	xsrc/external/mit/libdrm/dist/intel/intel_bufmgr.h: patch
	xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_gem.c: patch
	xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_priv.h: patch
	xsrc/external/mit/libdrm/dist/intel/intel_chipset.h: patch
	xsrc/external/mit/libdrm/dist/intel/intel_debug.h: patch
	xsrc/external/mit/libdrm/dist/intel/intel_decode.c: patch
	xsrc/external/mit/libdrm/dist/intel/test_decode.c: patch
	xsrc/external/mit/libdrm/dist/intel/tests/gen4-3d.batch-ref.txt: patch
	xsrc/external/mit/libdrm/dist/intel/tests/gen4-3d.batch.sh: patch
	xsrc/external/mit/libdrm/dist/intel/tests/gen5-3d.batch-ref.txt: patch
	xsrc/external/mit/libdrm/dist/intel/tests/gen5-3d.batch.sh: patch
	xsrc/external/mit/libdrm/dist/intel/tests/gen6-3d.batch-ref.txt: patch
	xsrc/external/mit/libdrm/dist/intel/tests/gen6-3d.batch.sh: patch
	xsrc/external/mit/libdrm/dist/intel/tests/gen7-2d-copy.batch-ref.txt: patch
	xsrc/external/mit/libdrm/dist/intel/tests/gen7-2d-copy.batch.sh: patch
	xsrc/external/mit/libdrm/dist/intel/tests/gen7-3d.batch-ref.txt: patch
	xsrc/external/mit/libdrm/dist/intel/tests/gen7-3d.batch.sh: patch
	xsrc/external/mit/libdrm/dist/intel/tests/gm45-3d.batch-ref.txt: patch
	xsrc/external/mit/libdrm/dist/intel/tests/gm45-3d.batch.sh: patch
	xsrc/external/mit/libdrm/dist/intel/tests/test-batch.sh: patch
	xsrc/external/mit/libdrm/dist/libkms/Makefile.am: patch
	xsrc/external/mit/libdrm/dist/libkms/Makefile.in: patch
	xsrc/external/mit/libdrm/dist/libkms/dumb.c: patch
	xsrc/external/mit/libdrm/dist/libkms/internal.h: patch
	xsrc/external/mit/libdrm/dist/libkms/linux.c: patch
	xsrc/external/mit/libdrm/dist/libkms/radeon.c: patch
	xsrc/external/mit/libdrm/dist/m4/libtool.m4: patch
	xsrc/external/mit/libdrm/dist/m4/ltoptions.m4: patch
	xsrc/external/mit/libdrm/dist/m4/ltsugar.m4: patch
	xsrc/external/mit/libdrm/dist/m4/ltversion.m4: patch
	xsrc/external/mit/libdrm/dist/m4/lt~obsolete.m4: patch
	xsrc/external/mit/libdrm/dist/nouveau/Makefile.am:  patch
	xsrc/external/mit/libdrm/dist/nouveau/Makefile.in:  patch
	xsrc/external/mit/libdrm/dist/nouveau/abi16.c: patch
	xsrc/external/mit/libdrm/dist/nouveau/bufctx.c: patch
	xsrc/external/mit/libdrm/dist/nouveau/libdrm_nouveau.pc.in: patch
	xsrc/external/mit/libdrm/dist/nouveau/nouveau.c: patch
	xsrc/external/mit/libdrm/dist/nouveau/nouveau.h: patch
	xsrc/external/mit/libdrm/dist/nouveau/nouveau_bo.c: patch
	xsrc/external/mit/libdrm/dist/nouveau/nouveau_bo.h: patch
	xsrc/external/mit/libdrm/dist/nouveau/nouveau_channel.c: patch
	xsrc/external/mit/libdrm/dist/nouveau/nouveau_channel.h: patch
	xsrc/external/mit/libdrm/dist/nouveau/nouveau_device.c: patch
	xsrc/external/mit/libdrm/dist/nouveau/nouveau_device.h: patch
	xsrc/external/mit/libdrm/dist/nouveau/nouveau_drmif.h: patch
	xsrc/external/mit/libdrm/dist/nouveau/nouveau_grobj.c: patch
	xsrc/external/mit/libdrm/dist/nouveau/nouveau_grobj.h: patch
	xsrc/external/mit/libdrm/dist/nouveau/nouveau_notifier.c: patch
	xsrc/external/mit/libdrm/dist/nouveau/nouveau_notifier.h: patch
	xsrc/external/mit/libdrm/dist/nouveau/nouveau_private.h: patch
	xsrc/external/mit/libdrm/dist/nouveau/nouveau_pushbuf.c: patch
	xsrc/external/mit/libdrm/dist/nouveau/nouveau_pushbuf.h: patch
	xsrc/external/mit/libdrm/dist/nouveau/nouveau_reloc.c: patch
	xsrc/external/mit/libdrm/dist/nouveau/nouveau_reloc.h: patch
	xsrc/external/mit/libdrm/dist/nouveau/nouveau_resource.c: patch
	xsrc/external/mit/libdrm/dist/nouveau/nouveau_resource.h: patch
	xsrc/external/mit/libdrm/dist/nouveau/private.h: patch
	xsrc/external/mit/libdrm/dist/nouveau/pushbuf.c: patch
	xsrc/external/mit/libdrm/dist/omap/Makefile.am: patch
	xsrc/external/mit/libdrm/dist/omap/Makefile.in: patch
	xsrc/external/mit/libdrm/dist/omap/libdrm_omap.pc.in: patch
	xsrc/external/mit/libdrm/dist/omap/omap_drm.c: patch
	xsrc/external/mit/libdrm/dist/omap/omap_drm.h: patch
	xsrc/external/mit/libdrm/dist/omap/omap_drmif.h: patch
	xsrc/external/mit/libdrm/dist/radeon/Makefile.am: patch
	xsrc/external/mit/libdrm/dist/radeon/Makefile.in: patch
	xsrc/external/mit/libdrm/dist/radeon/r600_pci_ids.h: patch
	xsrc/external/mit/libdrm/dist/radeon/radeon_cs_space.c: patch
	xsrc/external/mit/libdrm/dist/radeon/radeon_surface.c: patch
	xsrc/external/mit/libdrm/dist/radeon/radeon_surface.h: patch
	xsrc/external/mit/libdrm/dist/tests/Makefile.am: patch
	xsrc/external/mit/libdrm/dist/tests/Makefile.in: patch
	xsrc/external/mit/libdrm/dist/tests/drmtest.c: patch
	xsrc/external/mit/libdrm/dist/tests/gem_flink.c: patch
	xsrc/external/mit/libdrm/dist/tests/kmstest/Makefile.in: patch
	xsrc/external/mit/libdrm/dist/tests/modeprint/Makefile.am: patch
	xsrc/external/mit/libdrm/dist/tests/modeprint/Makefile.in: patch
	xsrc/external/mit/libdrm/dist/tests/modeprint/modeprint.c: patch
	xsrc/external/mit/libdrm/dist/tests/modetest/Makefile.am: patch
	xsrc/external/mit/libdrm/dist/tests/modetest/Makefile.in: patch
	xsrc/external/mit/libdrm/dist/tests/modetest/modetest.c: patch
	xsrc/external/mit/libdrm/dist/tests/radeon/Makefile.am: patch
	xsrc/external/mit/libdrm/dist/tests/radeon/Makefile.in: patch
	xsrc/external/mit/libdrm/dist/tests/radeon/list.h: patch
	xsrc/external/mit/libdrm/dist/tests/radeon/radeon_ttm.c: patch
	xsrc/external/mit/libdrm/dist/tests/radeon/rbo.c: patch
	xsrc/external/mit/libdrm/dist/tests/radeon/rbo.h: patch
	xsrc/external/mit/libdrm/dist/tests/vbltest/Makefile.in: patch
	xsrc/external/mit/libdrm/dist/tests/vbltest/vbltest.c: patch
	xsrc/external/mit/xf86-video-ati/dist/src/r600_exa.c: revision 1.6
	xsrc/external/mit/xf86-video-ati/dist/src/r600_textured_videofuncs.c: revision 1.2
	xsrc/external/mit/xf86-video-ati/dist/src/r6xx_accel.c: revision 1.7
	xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa.c: revision 1.2
	xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa_funcs.c: revision 1.10
	xsrc/external/mit/xf86-video-ati/dist/src/radeon_textured_video.c: revision 1.5
Update libdrm to 2.4.36.
--
make sure all the KMS code is only ever run when in KMS mode.  fixes
problems with the UMS (aka existing) driver type when KMS is enabled.
--
enable KMS on x86.
@
text
@a0 14
0x12300000:      0x54f08006: XY_SRC_COPY_BLT (rgb enabled, alpha enabled, src tile 1, dst tile 0)
0x12300004:      0x03cc0190:    format 8888, pitch 400, rop 0xcc, clipping disabled,  
0x12300008:      0x00000000:    dst (0,0)
0x1230000c:      0x00640064:    dst (100,100)
0x12300010:      0x122e9000:    dst offset 0x122e9000
0x12300014:      0x00000000:    src (0,0)
0x12300018:      0x00000080:    src pitch 128
0x1230001c:      0x02ff1000:    src offset 0x02ff1000
0x12300020:      0x13000002: MI_FLUSH_DW post_sync_op='no write' 
0x12300024:      0x00000000:    address
0x12300028:      0x00000000:    dword
0x1230002c:      0x00000000:    upper dword
0x12300030:      0x05000000: MI_BATCH_BUFFER_END
0x12300034:      0x00000000:    
@


