From 9950547bb9b5c1e53d531b507526b53503eb0e34 Mon Sep 17 00:00:00 2001 From: "Graydon, Tracy" Date: Fri, 12 Apr 2013 00:19:17 -0700 Subject: [PATCH] Rearranging to get into the format needed to build --- 0001-Adding-slp-subpackage.patch | 1528 -------------------- 0002-Adding-changes-to-configure.ac.patch | 80 - libdrm-2.4.39/Makefile.am => Makefile.am | 0 libdrm-2.4.39/Makefile.in => Makefile.in | 0 libdrm-2.4.39/README => README | 0 libdrm-2.4.39/aclocal.m4 => aclocal.m4 | 0 .../build-aux => build-aux}/config.guess | 0 {libdrm-2.4.39/build-aux => build-aux}/config.sub | 0 {libdrm-2.4.39/build-aux => build-aux}/depcomp | 0 {libdrm-2.4.39/build-aux => build-aux}/install-sh | 0 {libdrm-2.4.39/build-aux => build-aux}/ltmain.sh | 0 {libdrm-2.4.39/build-aux => build-aux}/missing | 0 libdrm-2.4.39/config.h.in => config.h.in | 0 libdrm-2.4.39/configure => configure | 0 libdrm-2.4.39/configure.ac => configure.ac | 0 {libdrm-2.4.39/exynos => exynos}/Makefile.am | 0 {libdrm-2.4.39/exynos => exynos}/Makefile.in | 0 {libdrm-2.4.39/exynos => exynos}/exynos_drm.c | 0 {libdrm-2.4.39/exynos => exynos}/exynos_drm.h | 0 {libdrm-2.4.39/exynos => exynos}/exynos_drmif.h | 0 .../exynos => exynos}/libdrm_exynos.pc.in | 0 {libdrm-2.4.39/include => include}/Makefile.am | 0 {libdrm-2.4.39/include => include}/Makefile.in | 0 {libdrm-2.4.39/include => include}/drm/Makefile | 0 {libdrm-2.4.39/include => include}/drm/Makefile.am | 0 {libdrm-2.4.39/include => include}/drm/Makefile.in | 0 {libdrm-2.4.39/include => include}/drm/drm.h | 0 .../include => include}/drm/drm_fourcc.h | 0 {libdrm-2.4.39/include => include}/drm/drm_mode.h | 0 {libdrm-2.4.39/include => include}/drm/drm_sarea.h | 0 {libdrm-2.4.39/include => include}/drm/i810_drm.h | 0 {libdrm-2.4.39/include => include}/drm/i830_drm.h | 0 {libdrm-2.4.39/include => include}/drm/i915_drm.h | 0 .../include => include}/drm/mach64_drm.h | 0 {libdrm-2.4.39/include => include}/drm/mga_drm.h | 0 .../include => include}/drm/nouveau_drm.h | 0 {libdrm-2.4.39/include => include}/drm/r128_drm.h | 0 .../include => include}/drm/radeon_drm.h | 0 .../include => include}/drm/savage_drm.h | 0 {libdrm-2.4.39/include => include}/drm/sis_drm.h | 0 {libdrm-2.4.39/include => include}/drm/via_drm.h | 0 .../include => include}/drm/vmwgfx_drm.h | 0 {libdrm-2.4.39/intel => intel}/Makefile.am | 0 {libdrm-2.4.39/intel => intel}/Makefile.in | 0 {libdrm-2.4.39/intel => intel}/intel_aub.h | 0 {libdrm-2.4.39/intel => intel}/intel_bufmgr.c | 0 {libdrm-2.4.39/intel => intel}/intel_bufmgr.h | 0 {libdrm-2.4.39/intel => intel}/intel_bufmgr_fake.c | 0 {libdrm-2.4.39/intel => intel}/intel_bufmgr_gem.c | 0 {libdrm-2.4.39/intel => intel}/intel_bufmgr_priv.h | 0 {libdrm-2.4.39/intel => intel}/intel_chipset.h | 0 {libdrm-2.4.39/intel => intel}/intel_debug.h | 0 {libdrm-2.4.39/intel => intel}/intel_decode.c | 0 {libdrm-2.4.39/intel => intel}/libdrm_intel.pc.in | 0 {libdrm-2.4.39/intel => intel}/mm.c | 0 {libdrm-2.4.39/intel => intel}/mm.h | 0 {libdrm-2.4.39/intel => intel}/test_decode.c | 0 {libdrm-2.4.39/intel => intel}/tests/gen4-3d.batch | Bin .../intel => intel}/tests/gen4-3d.batch-ref.txt | 0 .../intel => intel}/tests/gen4-3d.batch.sh | 0 {libdrm-2.4.39/intel => intel}/tests/gen5-3d.batch | Bin .../intel => intel}/tests/gen5-3d.batch-ref.txt | 0 .../intel => intel}/tests/gen5-3d.batch.sh | 0 {libdrm-2.4.39/intel => intel}/tests/gen6-3d.batch | Bin .../intel => intel}/tests/gen6-3d.batch-ref.txt | 0 .../intel => intel}/tests/gen6-3d.batch.sh | 0 .../intel => intel}/tests/gen7-2d-copy.batch | Bin .../tests/gen7-2d-copy.batch-ref.txt | 0 .../intel => intel}/tests/gen7-2d-copy.batch.sh | 0 {libdrm-2.4.39/intel => intel}/tests/gen7-3d.batch | Bin .../intel => intel}/tests/gen7-3d.batch-ref.txt | 0 .../intel => intel}/tests/gen7-3d.batch.sh | 0 {libdrm-2.4.39/intel => intel}/tests/gm45-3d.batch | Bin .../intel => intel}/tests/gm45-3d.batch-ref.txt | 0 .../intel => intel}/tests/gm45-3d.batch.sh | 0 {libdrm-2.4.39/intel => intel}/tests/test-batch.sh | 0 libdrm-2.4.39/libdrm.pc.in => libdrm.pc.in | 0 libdrm.spec | 121 -- libdrm-2.4.39/libdrm_lists.h => libdrm_lists.h | 0 {libdrm-2.4.39/libkms => libkms}/Makefile.am | 0 {libdrm-2.4.39/libkms => libkms}/Makefile.in | 0 {libdrm-2.4.39/libkms => libkms}/api.c | 0 {libdrm-2.4.39/libkms => libkms}/dumb.c | 0 {libdrm-2.4.39/libkms => libkms}/intel.c | 0 {libdrm-2.4.39/libkms => libkms}/internal.h | 0 {libdrm-2.4.39/libkms => libkms}/libkms.h | 0 {libdrm-2.4.39/libkms => libkms}/libkms.pc.in | 0 {libdrm-2.4.39/libkms => libkms}/linux.c | 0 {libdrm-2.4.39/libkms => libkms}/nouveau.c | 0 {libdrm-2.4.39/libkms => libkms}/radeon.c | 0 {libdrm-2.4.39/libkms => libkms}/vmwgfx.c | 0 {libdrm-2.4.39/m4 => m4}/libtool.m4 | 0 {libdrm-2.4.39/m4 => m4}/ltoptions.m4 | 0 {libdrm-2.4.39/m4 => m4}/ltsugar.m4 | 0 {libdrm-2.4.39/m4 => m4}/ltversion.m4 | 0 {libdrm-2.4.39/m4 => m4}/lt~obsolete.m4 | 0 {libdrm-2.4.39/nouveau => nouveau}/Makefile.am | 0 {libdrm-2.4.39/nouveau => nouveau}/Makefile.in | 0 {libdrm-2.4.39/nouveau => nouveau}/abi16.c | 0 {libdrm-2.4.39/nouveau => nouveau}/bufctx.c | 0 .../nouveau => nouveau}/libdrm_nouveau.pc.in | 0 {libdrm-2.4.39/nouveau => nouveau}/nouveau.c | 0 {libdrm-2.4.39/nouveau => nouveau}/nouveau.h | 0 {libdrm-2.4.39/nouveau => nouveau}/private.h | 0 {libdrm-2.4.39/nouveau => nouveau}/pushbuf.c | 0 {libdrm-2.4.39/omap => omap}/Makefile.am | 0 {libdrm-2.4.39/omap => omap}/Makefile.in | 0 {libdrm-2.4.39/omap => omap}/libdrm_omap.pc.in | 0 {libdrm-2.4.39/omap => omap}/omap_drm.c | 0 {libdrm-2.4.39/omap => omap}/omap_drm.h | 0 {libdrm-2.4.39/omap => omap}/omap_drmif.h | 0 .../0001-Adding-slp-subpackage.patch | 0 .../0002-Adding-changes-to-configure.ac.patch | 0 .../packaging => packaging}/libdrm.changes | 0 {libdrm-2.4.39/packaging => packaging}/libdrm.spec | 0 {libdrm-2.4.39/radeon => radeon}/Makefile.am | 0 {libdrm-2.4.39/radeon => radeon}/Makefile.in | 0 {libdrm-2.4.39/radeon => radeon}/bof.c | 0 {libdrm-2.4.39/radeon => radeon}/bof.h | 0 .../radeon => radeon}/libdrm_radeon.pc.in | 0 {libdrm-2.4.39/radeon => radeon}/r600_pci_ids.h | 0 {libdrm-2.4.39/radeon => radeon}/radeon_bo.c | 0 {libdrm-2.4.39/radeon => radeon}/radeon_bo.h | 0 {libdrm-2.4.39/radeon => radeon}/radeon_bo_gem.c | 0 {libdrm-2.4.39/radeon => radeon}/radeon_bo_gem.h | 0 {libdrm-2.4.39/radeon => radeon}/radeon_bo_int.h | 0 {libdrm-2.4.39/radeon => radeon}/radeon_cs.c | 0 {libdrm-2.4.39/radeon => radeon}/radeon_cs.h | 0 {libdrm-2.4.39/radeon => radeon}/radeon_cs_gem.c | 0 {libdrm-2.4.39/radeon => radeon}/radeon_cs_gem.h | 0 {libdrm-2.4.39/radeon => radeon}/radeon_cs_int.h | 0 {libdrm-2.4.39/radeon => radeon}/radeon_cs_space.c | 0 {libdrm-2.4.39/radeon => radeon}/radeon_surface.c | 0 {libdrm-2.4.39/radeon => radeon}/radeon_surface.h | 0 {libdrm-2.4.39/tests => tests}/Makefile.am | 0 {libdrm-2.4.39/tests => tests}/Makefile.in | 0 {libdrm-2.4.39/tests => tests}/dristat.c | 0 {libdrm-2.4.39/tests => tests}/drmstat.c | 0 {libdrm-2.4.39/tests => tests}/drmtest.c | 0 {libdrm-2.4.39/tests => tests}/drmtest.h | 0 {libdrm-2.4.39/tests => tests}/gem_basic.c | 0 {libdrm-2.4.39/tests => tests}/gem_flink.c | 0 {libdrm-2.4.39/tests => tests}/gem_mmap.c | 0 {libdrm-2.4.39/tests => tests}/gem_readwrite.c | 0 {libdrm-2.4.39/tests => tests}/getclient.c | 0 {libdrm-2.4.39/tests => tests}/getstats.c | 0 {libdrm-2.4.39/tests => tests}/getversion.c | 0 {libdrm-2.4.39/tests => tests}/kmstest/Makefile.am | 0 {libdrm-2.4.39/tests => tests}/kmstest/Makefile.in | 0 {libdrm-2.4.39/tests => tests}/kmstest/main.c | 0 .../tests => tests}/modeprint/Makefile.am | 0 .../tests => tests}/modeprint/Makefile.in | 0 .../tests => tests}/modeprint/modeprint.c | 0 .../tests => tests}/modetest/Makefile.am | 0 .../tests => tests}/modetest/Makefile.in | 0 {libdrm-2.4.39/tests => tests}/modetest/buffers.c | 0 {libdrm-2.4.39/tests => tests}/modetest/buffers.h | 0 {libdrm-2.4.39/tests => tests}/modetest/modetest.c | 0 {libdrm-2.4.39/tests => tests}/name_from_fd.c | 0 {libdrm-2.4.39/tests => tests}/openclose.c | 0 {libdrm-2.4.39/tests => tests}/radeon/Makefile.am | 0 {libdrm-2.4.39/tests => tests}/radeon/Makefile.in | 0 {libdrm-2.4.39/tests => tests}/radeon/list.h | 0 {libdrm-2.4.39/tests => tests}/radeon/radeon_ttm.c | 0 {libdrm-2.4.39/tests => tests}/radeon/rbo.c | 0 {libdrm-2.4.39/tests => tests}/radeon/rbo.h | 0 {libdrm-2.4.39/tests => tests}/setversion.c | 0 {libdrm-2.4.39/tests => tests}/updatedraw.c | 0 {libdrm-2.4.39/tests => tests}/vbltest/Makefile.am | 0 {libdrm-2.4.39/tests => tests}/vbltest/Makefile.in | 0 {libdrm-2.4.39/tests => tests}/vbltest/vbltest.c | 0 libdrm-2.4.39/xf86atomic.h => xf86atomic.h | 0 libdrm-2.4.39/xf86drm.c => xf86drm.c | 0 libdrm-2.4.39/xf86drm.h => xf86drm.h | 0 libdrm-2.4.39/xf86drmHash.c => xf86drmHash.c | 0 libdrm-2.4.39/xf86drmMode.c => xf86drmMode.c | 0 libdrm-2.4.39/xf86drmMode.h => xf86drmMode.h | 0 libdrm-2.4.39/xf86drmRandom.c => xf86drmRandom.c | 0 libdrm-2.4.39/xf86drmSL.c => xf86drmSL.c | 0 179 files changed, 1729 deletions(-) delete mode 100644 0001-Adding-slp-subpackage.patch delete mode 100644 0002-Adding-changes-to-configure.ac.patch rename libdrm-2.4.39/Makefile.am => Makefile.am (100%) rename libdrm-2.4.39/Makefile.in => Makefile.in (100%) rename libdrm-2.4.39/README => README (100%) rename libdrm-2.4.39/aclocal.m4 => aclocal.m4 (100%) rename {libdrm-2.4.39/build-aux => build-aux}/config.guess (100%) rename {libdrm-2.4.39/build-aux => build-aux}/config.sub (100%) rename {libdrm-2.4.39/build-aux => build-aux}/depcomp (100%) rename {libdrm-2.4.39/build-aux => build-aux}/install-sh (100%) rename {libdrm-2.4.39/build-aux => build-aux}/ltmain.sh (100%) rename {libdrm-2.4.39/build-aux => build-aux}/missing (100%) rename libdrm-2.4.39/config.h.in => config.h.in (100%) rename libdrm-2.4.39/configure => configure (100%) rename libdrm-2.4.39/configure.ac => configure.ac (100%) rename {libdrm-2.4.39/exynos => exynos}/Makefile.am (100%) rename {libdrm-2.4.39/exynos => exynos}/Makefile.in (100%) rename {libdrm-2.4.39/exynos => exynos}/exynos_drm.c (100%) rename {libdrm-2.4.39/exynos => exynos}/exynos_drm.h (100%) rename {libdrm-2.4.39/exynos => exynos}/exynos_drmif.h (100%) rename {libdrm-2.4.39/exynos => exynos}/libdrm_exynos.pc.in (100%) rename {libdrm-2.4.39/include => include}/Makefile.am (100%) rename {libdrm-2.4.39/include => include}/Makefile.in (100%) rename {libdrm-2.4.39/include => include}/drm/Makefile (100%) rename {libdrm-2.4.39/include => include}/drm/Makefile.am (100%) rename {libdrm-2.4.39/include => include}/drm/Makefile.in (100%) rename {libdrm-2.4.39/include => include}/drm/drm.h (100%) rename {libdrm-2.4.39/include => include}/drm/drm_fourcc.h (100%) rename {libdrm-2.4.39/include => include}/drm/drm_mode.h (100%) rename {libdrm-2.4.39/include => include}/drm/drm_sarea.h (100%) rename {libdrm-2.4.39/include => include}/drm/i810_drm.h (100%) rename {libdrm-2.4.39/include => include}/drm/i830_drm.h (100%) rename {libdrm-2.4.39/include => include}/drm/i915_drm.h (100%) rename {libdrm-2.4.39/include => include}/drm/mach64_drm.h (100%) rename {libdrm-2.4.39/include => include}/drm/mga_drm.h (100%) rename {libdrm-2.4.39/include => include}/drm/nouveau_drm.h (100%) rename {libdrm-2.4.39/include => include}/drm/r128_drm.h (100%) rename {libdrm-2.4.39/include => include}/drm/radeon_drm.h (100%) rename {libdrm-2.4.39/include => include}/drm/savage_drm.h (100%) rename {libdrm-2.4.39/include => include}/drm/sis_drm.h (100%) rename {libdrm-2.4.39/include => include}/drm/via_drm.h (100%) rename {libdrm-2.4.39/include => include}/drm/vmwgfx_drm.h (100%) rename {libdrm-2.4.39/intel => intel}/Makefile.am (100%) rename {libdrm-2.4.39/intel => intel}/Makefile.in (100%) rename {libdrm-2.4.39/intel => intel}/intel_aub.h (100%) rename {libdrm-2.4.39/intel => intel}/intel_bufmgr.c (100%) rename {libdrm-2.4.39/intel => intel}/intel_bufmgr.h (100%) rename {libdrm-2.4.39/intel => intel}/intel_bufmgr_fake.c (100%) rename {libdrm-2.4.39/intel => intel}/intel_bufmgr_gem.c (100%) rename {libdrm-2.4.39/intel => intel}/intel_bufmgr_priv.h (100%) rename {libdrm-2.4.39/intel => intel}/intel_chipset.h (100%) rename {libdrm-2.4.39/intel => intel}/intel_debug.h (100%) rename {libdrm-2.4.39/intel => intel}/intel_decode.c (100%) rename {libdrm-2.4.39/intel => intel}/libdrm_intel.pc.in (100%) rename {libdrm-2.4.39/intel => intel}/mm.c (100%) rename {libdrm-2.4.39/intel => intel}/mm.h (100%) rename {libdrm-2.4.39/intel => intel}/test_decode.c (100%) rename {libdrm-2.4.39/intel => intel}/tests/gen4-3d.batch (100%) rename {libdrm-2.4.39/intel => intel}/tests/gen4-3d.batch-ref.txt (100%) rename {libdrm-2.4.39/intel => intel}/tests/gen4-3d.batch.sh (100%) rename {libdrm-2.4.39/intel => intel}/tests/gen5-3d.batch (100%) rename {libdrm-2.4.39/intel => intel}/tests/gen5-3d.batch-ref.txt (100%) rename {libdrm-2.4.39/intel => intel}/tests/gen5-3d.batch.sh (100%) rename {libdrm-2.4.39/intel => intel}/tests/gen6-3d.batch (100%) rename {libdrm-2.4.39/intel => intel}/tests/gen6-3d.batch-ref.txt (100%) rename {libdrm-2.4.39/intel => intel}/tests/gen6-3d.batch.sh (100%) rename {libdrm-2.4.39/intel => intel}/tests/gen7-2d-copy.batch (100%) rename {libdrm-2.4.39/intel => intel}/tests/gen7-2d-copy.batch-ref.txt (100%) rename {libdrm-2.4.39/intel => intel}/tests/gen7-2d-copy.batch.sh (100%) rename {libdrm-2.4.39/intel => intel}/tests/gen7-3d.batch (100%) rename {libdrm-2.4.39/intel => intel}/tests/gen7-3d.batch-ref.txt (100%) rename {libdrm-2.4.39/intel => intel}/tests/gen7-3d.batch.sh (100%) rename {libdrm-2.4.39/intel => intel}/tests/gm45-3d.batch (100%) rename {libdrm-2.4.39/intel => intel}/tests/gm45-3d.batch-ref.txt (100%) rename {libdrm-2.4.39/intel => intel}/tests/gm45-3d.batch.sh (100%) rename {libdrm-2.4.39/intel => intel}/tests/test-batch.sh (100%) rename libdrm-2.4.39/libdrm.pc.in => libdrm.pc.in (100%) delete mode 100644 libdrm.spec rename libdrm-2.4.39/libdrm_lists.h => libdrm_lists.h (100%) rename {libdrm-2.4.39/libkms => libkms}/Makefile.am (100%) rename {libdrm-2.4.39/libkms => libkms}/Makefile.in (100%) rename {libdrm-2.4.39/libkms => libkms}/api.c (100%) rename {libdrm-2.4.39/libkms => libkms}/dumb.c (100%) rename {libdrm-2.4.39/libkms => libkms}/intel.c (100%) rename {libdrm-2.4.39/libkms => libkms}/internal.h (100%) rename {libdrm-2.4.39/libkms => libkms}/libkms.h (100%) rename {libdrm-2.4.39/libkms => libkms}/libkms.pc.in (100%) rename {libdrm-2.4.39/libkms => libkms}/linux.c (100%) rename {libdrm-2.4.39/libkms => libkms}/nouveau.c (100%) rename {libdrm-2.4.39/libkms => libkms}/radeon.c (100%) rename {libdrm-2.4.39/libkms => libkms}/vmwgfx.c (100%) rename {libdrm-2.4.39/m4 => m4}/libtool.m4 (100%) rename {libdrm-2.4.39/m4 => m4}/ltoptions.m4 (100%) rename {libdrm-2.4.39/m4 => m4}/ltsugar.m4 (100%) rename {libdrm-2.4.39/m4 => m4}/ltversion.m4 (100%) rename {libdrm-2.4.39/m4 => m4}/lt~obsolete.m4 (100%) rename {libdrm-2.4.39/nouveau => nouveau}/Makefile.am (100%) rename {libdrm-2.4.39/nouveau => nouveau}/Makefile.in (100%) rename {libdrm-2.4.39/nouveau => nouveau}/abi16.c (100%) rename {libdrm-2.4.39/nouveau => nouveau}/bufctx.c (100%) rename {libdrm-2.4.39/nouveau => nouveau}/libdrm_nouveau.pc.in (100%) rename {libdrm-2.4.39/nouveau => nouveau}/nouveau.c (100%) rename {libdrm-2.4.39/nouveau => nouveau}/nouveau.h (100%) rename {libdrm-2.4.39/nouveau => nouveau}/private.h (100%) rename {libdrm-2.4.39/nouveau => nouveau}/pushbuf.c (100%) rename {libdrm-2.4.39/omap => omap}/Makefile.am (100%) rename {libdrm-2.4.39/omap => omap}/Makefile.in (100%) rename {libdrm-2.4.39/omap => omap}/libdrm_omap.pc.in (100%) rename {libdrm-2.4.39/omap => omap}/omap_drm.c (100%) rename {libdrm-2.4.39/omap => omap}/omap_drm.h (100%) rename {libdrm-2.4.39/omap => omap}/omap_drmif.h (100%) rename {libdrm-2.4.39/packaging => packaging}/0001-Adding-slp-subpackage.patch (100%) rename {libdrm-2.4.39/packaging => packaging}/0002-Adding-changes-to-configure.ac.patch (100%) rename {libdrm-2.4.39/packaging => packaging}/libdrm.changes (100%) rename {libdrm-2.4.39/packaging => packaging}/libdrm.spec (100%) rename {libdrm-2.4.39/radeon => radeon}/Makefile.am (100%) rename {libdrm-2.4.39/radeon => radeon}/Makefile.in (100%) rename {libdrm-2.4.39/radeon => radeon}/bof.c (100%) rename {libdrm-2.4.39/radeon => radeon}/bof.h (100%) rename {libdrm-2.4.39/radeon => radeon}/libdrm_radeon.pc.in (100%) rename {libdrm-2.4.39/radeon => radeon}/r600_pci_ids.h (100%) rename {libdrm-2.4.39/radeon => radeon}/radeon_bo.c (100%) rename {libdrm-2.4.39/radeon => radeon}/radeon_bo.h (100%) rename {libdrm-2.4.39/radeon => radeon}/radeon_bo_gem.c (100%) rename {libdrm-2.4.39/radeon => radeon}/radeon_bo_gem.h (100%) rename {libdrm-2.4.39/radeon => radeon}/radeon_bo_int.h (100%) rename {libdrm-2.4.39/radeon => radeon}/radeon_cs.c (100%) rename {libdrm-2.4.39/radeon => radeon}/radeon_cs.h (100%) rename {libdrm-2.4.39/radeon => radeon}/radeon_cs_gem.c (100%) rename {libdrm-2.4.39/radeon => radeon}/radeon_cs_gem.h (100%) rename {libdrm-2.4.39/radeon => radeon}/radeon_cs_int.h (100%) rename {libdrm-2.4.39/radeon => radeon}/radeon_cs_space.c (100%) rename {libdrm-2.4.39/radeon => radeon}/radeon_surface.c (100%) rename {libdrm-2.4.39/radeon => radeon}/radeon_surface.h (100%) rename {libdrm-2.4.39/tests => tests}/Makefile.am (100%) rename {libdrm-2.4.39/tests => tests}/Makefile.in (100%) rename {libdrm-2.4.39/tests => tests}/dristat.c (100%) rename {libdrm-2.4.39/tests => tests}/drmstat.c (100%) rename {libdrm-2.4.39/tests => tests}/drmtest.c (100%) rename {libdrm-2.4.39/tests => tests}/drmtest.h (100%) rename {libdrm-2.4.39/tests => tests}/gem_basic.c (100%) rename {libdrm-2.4.39/tests => tests}/gem_flink.c (100%) rename {libdrm-2.4.39/tests => tests}/gem_mmap.c (100%) rename {libdrm-2.4.39/tests => tests}/gem_readwrite.c (100%) rename {libdrm-2.4.39/tests => tests}/getclient.c (100%) rename {libdrm-2.4.39/tests => tests}/getstats.c (100%) rename {libdrm-2.4.39/tests => tests}/getversion.c (100%) rename {libdrm-2.4.39/tests => tests}/kmstest/Makefile.am (100%) rename {libdrm-2.4.39/tests => tests}/kmstest/Makefile.in (100%) rename {libdrm-2.4.39/tests => tests}/kmstest/main.c (100%) rename {libdrm-2.4.39/tests => tests}/modeprint/Makefile.am (100%) rename {libdrm-2.4.39/tests => tests}/modeprint/Makefile.in (100%) rename {libdrm-2.4.39/tests => tests}/modeprint/modeprint.c (100%) rename {libdrm-2.4.39/tests => tests}/modetest/Makefile.am (100%) rename {libdrm-2.4.39/tests => tests}/modetest/Makefile.in (100%) rename {libdrm-2.4.39/tests => tests}/modetest/buffers.c (100%) rename {libdrm-2.4.39/tests => tests}/modetest/buffers.h (100%) rename {libdrm-2.4.39/tests => tests}/modetest/modetest.c (100%) rename {libdrm-2.4.39/tests => tests}/name_from_fd.c (100%) rename {libdrm-2.4.39/tests => tests}/openclose.c (100%) rename {libdrm-2.4.39/tests => tests}/radeon/Makefile.am (100%) rename {libdrm-2.4.39/tests => tests}/radeon/Makefile.in (100%) rename {libdrm-2.4.39/tests => tests}/radeon/list.h (100%) rename {libdrm-2.4.39/tests => tests}/radeon/radeon_ttm.c (100%) rename {libdrm-2.4.39/tests => tests}/radeon/rbo.c (100%) rename {libdrm-2.4.39/tests => tests}/radeon/rbo.h (100%) rename {libdrm-2.4.39/tests => tests}/setversion.c (100%) rename {libdrm-2.4.39/tests => tests}/updatedraw.c (100%) rename {libdrm-2.4.39/tests => tests}/vbltest/Makefile.am (100%) rename {libdrm-2.4.39/tests => tests}/vbltest/Makefile.in (100%) rename {libdrm-2.4.39/tests => tests}/vbltest/vbltest.c (100%) rename libdrm-2.4.39/xf86atomic.h => xf86atomic.h (100%) rename libdrm-2.4.39/xf86drm.c => xf86drm.c (100%) rename libdrm-2.4.39/xf86drm.h => xf86drm.h (100%) rename libdrm-2.4.39/xf86drmHash.c => xf86drmHash.c (100%) rename libdrm-2.4.39/xf86drmMode.c => xf86drmMode.c (100%) rename libdrm-2.4.39/xf86drmMode.h => xf86drmMode.h (100%) rename libdrm-2.4.39/xf86drmRandom.c => xf86drmRandom.c (100%) rename libdrm-2.4.39/xf86drmSL.c => xf86drmSL.c (100%) diff --git a/0001-Adding-slp-subpackage.patch b/0001-Adding-slp-subpackage.patch deleted file mode 100644 index 760f6bd..0000000 --- a/0001-Adding-slp-subpackage.patch +++ /dev/null @@ -1,1528 +0,0 @@ -From e2189a84d0da40b46c3406860fe087b7b09420b3 Mon Sep 17 00:00:00 2001 -From: Prajwal Mohan -Date: Wed, 10 Oct 2012 09:56:06 -0700 -Subject: [PATCH] Adding slp subpackage - ---- - Makefile.am | 6 +- - libkms/Makefile.am | 5 + - libkms/slp.c | 222 +++++++++++++ - slp/Makefile.am | 22 ++ - slp/drm_slp_bufmgr.c | 847 ++++++++++++++++++++++++++++++++++++++++++++++++++ - slp/drm_slp_bufmgr.h | 201 ++++++++++++ - slp/libdrm_slp.pc.in | 11 + - slp/list.h | 131 ++++++++ - 8 files changed, 1444 insertions(+), 1 deletions(-) - create mode 100644 libkms/slp.c - create mode 100644 slp/Makefile.am - create mode 100644 slp/drm_slp_bufmgr.c - create mode 100644 slp/drm_slp_bufmgr.h - create mode 100644 slp/libdrm_slp.pc.in - create mode 100644 slp/list.h - -diff --git a/Makefile.am b/Makefile.am -index 256a8cc..6e74607 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -49,7 +49,11 @@ if HAVE_EXYNOS - EXYNOS_SUBDIR = exynos - endif - --SUBDIRS = . $(LIBKMS_SUBDIR) $(INTEL_SUBDIR) $(NOUVEAU_SUBDIR) $(RADEON_SUBDIR) $(OMAP_SUBDIR) $(EXYNOS_SUBDIR) tests include -+if HAVE_SLP -+SLP_SUBDIR = slp -+endif -+ -+SUBDIRS = . $(LIBKMS_SUBDIR) $(INTEL_SUBDIR) $(NOUVEAU_SUBDIR) $(RADEON_SUBDIR) $(OMAP_SUBDIR) $(EXYNOS_SUBDIR) $(SLP_SUBDIR) tests include - - libdrm_la_LTLIBRARIES = libdrm.la - libdrm_ladir = $(libdir) -diff --git a/libkms/Makefile.am b/libkms/Makefile.am -index fa379a4..df74b7e 100644 ---- a/libkms/Makefile.am -+++ b/libkms/Makefile.am -@@ -31,6 +31,11 @@ if HAVE_RADEON - libkms_la_SOURCES += radeon.c - endif - -+if HAVE_SLP -+libkms_la_SOURCES += slp.c -+AM_CFLAGS += -I$(top_srcdir)/exynos -+endif -+ - libkmsincludedir = ${includedir}/libkms - libkmsinclude_HEADERS = libkms.h - -diff --git a/libkms/slp.c b/libkms/slp.c -new file mode 100644 -index 0000000..263f2ab ---- /dev/null -+++ b/libkms/slp.c -@@ -0,0 +1,222 @@ -+/************************************************************************** -+ * -+ * Copyright © 2009 VMware, Inc., Palo Alto, CA., USA -+ * All Rights Reserved. -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining a -+ * copy of this software and associated documentation files (the -+ * "Software"), to deal in the Software without restriction, including -+ * without limitation the rights to use, copy, modify, merge, publish, -+ * distribute, sub license, and/or sell copies of the Software, and to -+ * permit persons to whom the Software is furnished to do so, subject to -+ * the following conditions: -+ * -+ * The above copyright notice and this permission notice (including the -+ * next paragraph) shall be included in all copies or substantial portions -+ * of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL -+ * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, -+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE -+ * USE OR OTHER DEALINGS IN THE SOFTWARE. -+ * -+ **************************************************************************/ -+ -+ -+#define HAVE_STDINT_H -+#define _FILE_OFFSET_BITS 64 -+ -+#include -+#include -+#include -+#include -+#include "internal.h" -+ -+#include -+#include -+#include "xf86drm.h" -+ -+#include "exynos_drm.h" -+ -+struct slp_bo -+{ -+ struct kms_bo base; -+ unsigned map_count; -+}; -+ -+static int -+slp_get_prop(struct kms_driver *kms, unsigned key, unsigned *out) -+{ -+ switch (key) { -+ case KMS_BO_TYPE: -+ *out = KMS_BO_TYPE_SCANOUT_X8R8G8B8 | KMS_BO_TYPE_CURSOR_64X64_A8R8G8B8; -+ break; -+ default: -+ return -EINVAL; -+ } -+ return 0; -+} -+ -+static int -+slp_destroy(struct kms_driver *kms) -+{ -+ free(kms); -+ return 0; -+} -+ -+static int -+slp_bo_create(struct kms_driver *kms, -+ const unsigned width, const unsigned height, -+ const enum kms_bo_type type, const unsigned *attr, -+ struct kms_bo **out) -+{ -+ struct drm_exynos_gem_create arg; -+ unsigned size, pitch; -+ struct slp_bo *bo; -+ int i, ret; -+ -+ for (i = 0; attr[i]; i += 2) { -+ switch (attr[i]) { -+ case KMS_WIDTH: -+ case KMS_HEIGHT: -+ case KMS_BO_TYPE: -+ break; -+ default: -+ return -EINVAL; -+ } -+ } -+ -+ bo = calloc(1, sizeof(*bo)); -+ if (!bo) -+ return -ENOMEM; -+ -+ if (type == KMS_BO_TYPE_CURSOR_64X64_A8R8G8B8) { -+ pitch = 64 * 4; -+ size = 64 * 64 * 4; -+ } else if (type == KMS_BO_TYPE_SCANOUT_X8R8G8B8) { -+ pitch = width * 4; -+ pitch = (pitch + 512 - 1) & ~(512 - 1); -+ size = pitch * ((height + 4 - 1) & ~(4 - 1)); -+ } else { -+ return -EINVAL; -+ } -+ -+ memset(&arg, 0, sizeof(arg)); -+ arg.size = size; -+ -+ ret = drmCommandWriteRead(kms->fd, DRM_EXYNOS_GEM_CREATE, &arg, sizeof(arg)); -+ if (ret) -+ goto err_free; -+ -+ bo->base.kms = kms; -+ bo->base.handle = arg.handle; -+ bo->base.size = size; -+ bo->base.pitch = pitch; -+ -+ *out = &bo->base; -+ -+ return 0; -+ -+err_free: -+ free(bo); -+ return ret; -+} -+ -+static int -+slp_bo_get_prop(struct kms_bo *bo, unsigned key, unsigned *out) -+{ -+ switch (key) { -+ default: -+ return -EINVAL; -+ } -+} -+ -+static int -+slp_bo_map(struct kms_bo *_bo, void **out) -+{ -+ struct slp_bo *bo = (struct slp_bo *)_bo; -+ struct drm_exynos_gem_map_off arg; -+ void *map = NULL; -+ int ret; -+ -+ if (bo->base.ptr) { -+ bo->map_count++; -+ *out = bo->base.ptr; -+ return 0; -+ } -+ -+ memset(&arg, 0, sizeof(arg)); -+ arg.handle = bo->base.handle; -+ -+ ret = drmCommandWriteRead(bo->base.kms->fd, DRM_EXYNOS_GEM_MAP_OFFSET, &arg, sizeof(arg)); -+ if (ret) -+ return ret; -+ -+ map = mmap(0, bo->base.size, PROT_READ | PROT_WRITE, MAP_SHARED, bo->base.kms->fd, arg.offset); -+ if (map == MAP_FAILED) -+ return -errno; -+ -+ bo->base.ptr = map; -+ bo->map_count++; -+ *out = bo->base.ptr; -+ -+ return 0; -+} -+ -+static int -+slp_bo_unmap(struct kms_bo *_bo) -+{ -+ struct slp_bo *bo = (struct slp_bo *)_bo; -+ bo->map_count--; -+ return 0; -+} -+ -+static int -+slp_bo_destroy(struct kms_bo *_bo) -+{ -+ struct slp_bo *bo = (struct slp_bo *)_bo; -+ struct drm_gem_close arg; -+ int ret; -+ -+ if (bo->base.ptr) { -+ /* XXX Sanity check map_count */ -+ munmap(bo->base.ptr, bo->base.size); -+ bo->base.ptr = NULL; -+ } -+ -+ memset(&arg, 0, sizeof(arg)); -+ arg.handle = bo->base.handle; -+ -+ ret = drmIoctl(bo->base.kms->fd, DRM_IOCTL_GEM_CLOSE, &arg); -+ if (ret) -+ return -errno; -+ -+ free(bo); -+ return 0; -+} -+ -+int -+slp_create(int fd, struct kms_driver **out) -+{ -+ struct kms_driver *kms; -+ -+ kms = calloc(1, sizeof(*kms)); -+ if (!kms) -+ return -ENOMEM; -+ -+ kms->fd = fd; -+ -+ kms->bo_create = slp_bo_create; -+ kms->bo_map = slp_bo_map; -+ kms->bo_unmap = slp_bo_unmap; -+ kms->bo_get_prop = slp_bo_get_prop; -+ kms->bo_destroy = slp_bo_destroy; -+ kms->get_prop = slp_get_prop; -+ kms->destroy = slp_destroy; -+ *out = kms; -+ -+ return 0; -+} -diff --git a/slp/Makefile.am b/slp/Makefile.am -new file mode 100644 -index 0000000..132662b ---- /dev/null -+++ b/slp/Makefile.am -@@ -0,0 +1,22 @@ -+SUBDIRS = . -+ -+AM_CFLAGS = \ -+ $(WARN_CFLAGS) \ -+ -I$(top_srcdir) \ -+ -I$(top_srcdir)/slp \ -+ $(PTHREADSTUBS_CFLAGS) \ -+ -I$(top_srcdir)/include/drm -+ -+libdrm_slp_la_LTLIBRARIES = libdrm_slp.la -+libdrm_slp_ladir = $(libdir) -+libdrm_slp_la_LDFLAGS = -version-number 1:0:0 -no-undefined -+libdrm_slp_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ @CLOCK_LIB@ -ldl -+ -+libdrm_slp_la_SOURCES = \ -+ drm_slp_bufmgr.c \ -+ drm_slp_bufmgr.h -+ -+libdrm_slpincludedir = ${includedir}/libdrm -+libdrm_slpinclude_HEADERS = drm_slp_bufmgr.h -+ -+pkgconfig_DATA = libdrm_slp.pc -diff --git a/slp/drm_slp_bufmgr.c b/slp/drm_slp_bufmgr.c -new file mode 100644 -index 0000000..f723ded ---- /dev/null -+++ b/slp/drm_slp_bufmgr.c -@@ -0,0 +1,847 @@ -+/************************************************************************** -+ -+xserver-xorg-video-sec -+ -+Copyright 2011 Samsung Electronics co., Ltd. All Rights Reserved. -+ -+Contact: SooChan Lim , Sangjin Lee -+ -+Permission is hereby granted, free of charge, to any person obtaining a -+copy of this software and associated documentation files (the -+"Software"), to deal in the Software without restriction, including -+without limitation the rights to use, copy, modify, merge, publish, -+distribute, sub license, and/or sell copies of the Software, and to -+permit persons to whom the Software is furnished to do so, subject to -+the following conditions: -+ -+The above copyright notice and this permission notice (including the -+next paragraph) shall be included in all copies or substantial portions -+of the Software. -+ -+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. -+IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR -+ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+ -+**************************************************************************/ -+ -+#include "config.h" -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include "drm_slp_bufmgr.h" -+#include "list.h" -+ -+#define PREFIX_LIB "libdrm_slp_" -+#define SUFFIX_LIB ".so" -+#define DEFAULT_LIB PREFIX_LIB"default"SUFFIX_LIB -+ -+#define NUM_TRY_LOCK 10 -+#define SEM_NAME "pixmap_1" -+#define SEM_DEBUG 0 -+ -+#define DRM_RETURN_IF_FAIL(cond) {if (!(cond)) { fprintf (stderr, "[%s] : '%s' failed.\n", __FUNCTION__, #cond); return; }} -+#define DRM_RETURN_VAL_IF_FAIL(cond, val) {if (!(cond)) { fprintf (stderr, "[%s] : '%s' failed.\n", __FUNCTION__, #cond); return val; }} -+ -+#define MGR_IS_VALID(mgr) (mgr && \ -+ mgr->link.next && \ -+ mgr->link.next->prev == &mgr->link) -+#define BO_IS_VALID(bo) (bo && \ -+ MGR_IS_VALID(bo->bufmgr) && \ -+ bo->list.next && \ -+ bo->list.next->prev == &bo->list) -+ -+typedef struct{ -+ void* data; -+ -+ int is_valid; -+ drm_data_free free_func ; -+}drm_slp_user_data; -+ -+static struct list_head *gBufMgrs = NULL; -+ -+static int -+_sem_wait_wrapper(sem_t* sem) -+{ -+ int res = 0; -+ int num_try = NUM_TRY_LOCK; -+ -+ do -+ { -+ res = sem_wait(sem); -+ num_try--; -+ } while((res == -1) && (errno == EINTR) && (num_try >= 0)); -+ -+ if(res == -1) -+ { -+ fprintf(stderr, -+ "[libdrm] error %s:%d(sem:%p, num_try:%d) PID:%04d\n", -+ __FUNCTION__, -+ __LINE__, -+ sem, -+ num_try, -+ getpid()); -+ return 0; -+ } -+#if SEM_DEBUG -+ else -+ { -+ fprintf(stderr, -+ "[libdrm] LOCK >> %s:%d(sem:%p, num_try:%d) PID:%04d\n", -+ __FUNCTION__, -+ __LINE__, -+ sem, -+ num_try, -+ getpid()); -+ } -+#endif -+ -+ return 1; -+} -+ -+static int -+_sem_post_wrapper(sem_t* sem) -+{ -+ int res = 0; -+ int num_try = NUM_TRY_LOCK; -+ -+ do -+ { -+ res = sem_post(sem); -+ num_try--; -+ -+ } while((res == -1) && (errno == EINTR) && (num_try >= 0)); -+ -+ if(res == -1) -+ { -+ fprintf(stderr, -+ "[libdrm] error %s:%d(sem:%p, num_try:%d) PID:%04d\n", -+ __FUNCTION__, -+ __LINE__, -+ sem, -+ num_try, -+ getpid()); -+ return 0; -+ } -+#if SEM_DEBUG -+ else -+ { -+ fprintf(stderr, -+ "[libdrm] UNLOCK << %s:%d(sem:%p, num_try:%d) PID:%04d\n", -+ __FUNCTION__, -+ __LINE__, -+ sem, -+ num_try, -+ getpid()); -+ } -+#endif -+ -+ return 1; -+} -+ -+static int -+_sem_open(drm_slp_bufmgr bufmgr) -+{ -+ bufmgr->semObj.handle = sem_open(SEM_NAME, O_CREAT, 0777, 1); -+ if(bufmgr->semObj.handle == SEM_FAILED) -+ { -+ fprintf(stderr, -+ "[libdrm] error %s:%d(name:%s) PID:%04d\n", -+ __FUNCTION__, -+ __LINE__, -+ SEM_NAME, -+ getpid()); -+ bufmgr->semObj.handle = NULL; -+ return 0; -+ } -+#if SEM_DEBUG -+ else -+ { -+ fprintf(stderr, -+ "[libdrm] OPEN %s:%d(sem:%p) PID:%04d\n", -+ __FUNCTION__, -+ __LINE__, -+ bufmgr->semObj.handle, -+ getpid()); -+ } -+#endif -+ -+ bufmgr->semObj.status = STATUS_UNLOCK; -+ -+ return 1; -+} -+ -+static int -+_sem_close(drm_slp_bufmgr bufmgr) -+{ -+ _sem_wait_wrapper(bufmgr->semObj.handle); -+ sem_unlink(SEM_NAME); -+ return 1; -+} -+ -+static int -+_sem_lock(drm_slp_bufmgr bufmgr) -+{ -+ if(bufmgr->semObj.status != STATUS_UNLOCK) return 0; -+ -+ if(!_sem_wait_wrapper(bufmgr->semObj.handle)) return 0; -+ bufmgr->semObj.status = STATUS_LOCK; -+ return 1; -+} -+ -+static int -+_sem_unlock(drm_slp_bufmgr bufmgr) -+{ -+ if(bufmgr->semObj.status != STATUS_LOCK) return 0; -+ -+ _sem_post_wrapper(bufmgr->semObj.handle); -+ bufmgr->semObj.status = STATUS_UNLOCK; -+ return 1; -+} -+ -+static drm_slp_bufmgr -+_load_bufmgr(int fd, const char *file, void *arg) -+{ -+ char path[PATH_MAX] = {0,}; -+ drm_slp_bufmgr bufmgr = NULL; -+ int (*bufmgr_init)(drm_slp_bufmgr bufmgr, int fd, void *arg); -+ void *module; -+ -+ snprintf(path, sizeof(path), BUFMGR_DIR "/%s", file); -+ -+ module = dlopen(path, RTLD_LAZY); -+ if (!module) { -+ fprintf(stderr, -+ "[libdrm] failed to load module: %s(%s)\n", -+ dlerror(), file); -+ return NULL; -+ } -+ -+ bufmgr_init = dlsym(module, "init_slp_bufmgr"); -+ if (!bufmgr_init) { -+ fprintf(stderr, -+ "[libdrm] failed to lookup init function: %s(%s)\n", -+ dlerror(), file); -+ return NULL; -+ } -+ -+ bufmgr = calloc(sizeof(struct _drm_slp_bufmgr), 1); -+ if(!bufmgr) -+ { -+ return NULL; -+ } -+ -+ if(!bufmgr_init(bufmgr, fd, arg)) -+ { -+ fprintf(stderr,"[libdrm] Fail to init module(%s)\n", file); -+ free(bufmgr); -+ bufmgr = NULL; -+ return NULL; -+ } -+ -+ fprintf(stderr,"[libdrm] Success to load module(%s)\n", file); -+ -+ return bufmgr; -+} -+ -+drm_slp_bufmgr -+drm_slp_bufmgr_init(int fd, void *arg) -+{ -+ drm_slp_bufmgr bufmgr = NULL; -+ const char *p = NULL; -+ -+ if (fd < 0) -+ return NULL; -+ -+ if(gBufMgrs == NULL) -+ { -+ gBufMgrs = malloc(sizeof(struct list_head)); -+ LIST_INITHEAD(gBufMgrs); -+ } -+ else -+ { -+ LIST_FOR_EACH_ENTRY(bufmgr, gBufMgrs, link) -+ { -+ if(bufmgr->drm_fd == fd) -+ { -+ bufmgr->ref_count++; -+ fprintf(stderr, "[libdrm] bufmgr ref: fd=%d, ref_count:%d\n", fd, bufmgr->ref_count); -+ return bufmgr; -+ } -+ } -+ bufmgr = NULL; -+ } -+ fprintf(stderr, "[libdrm] bufmgr init: fd=%d\n", fd); -+ -+ p = getenv ("SLP_BUFMGR_MODULE"); -+ if (p) -+ { -+ char file[PATH_MAX] = {0,}; -+ snprintf(file, sizeof(file), PREFIX_LIB"%s"SUFFIX_LIB, p); -+ bufmgr = _load_bufmgr (fd, file, arg); -+ } -+ -+ if (!bufmgr) -+ bufmgr = _load_bufmgr (fd, DEFAULT_LIB, arg); -+ -+ if (!bufmgr) -+ { -+ struct dirent **namelist; -+ int found = 0; -+ int n; -+ -+ n = scandir(BUFMGR_DIR, &namelist, 0, alphasort); -+ if (n < 0) -+ fprintf(stderr,"[libdrm] no files : %s\n", BUFMGR_DIR); -+ else -+ { -+ while(n--) -+ { -+ if (!found && strstr (namelist[n]->d_name, PREFIX_LIB)) -+ { -+ char *p = strstr (namelist[n]->d_name, SUFFIX_LIB); -+ if (!strcmp (p, SUFFIX_LIB)) -+ { -+ bufmgr = _load_bufmgr (fd, namelist[n]->d_name, arg); -+ if (bufmgr) -+ found = 1; -+ } -+ } -+ free(namelist[n]); -+ } -+ free(namelist); -+ } -+ } -+ -+ if (!bufmgr) -+ { -+ fprintf(stderr,"[libdrm] backend is NULL.\n"); -+ return NULL; -+ } -+ -+ if (pthread_mutex_init(&bufmgr->lock, NULL) != 0) -+ { -+ bufmgr->bufmgr_destroy(bufmgr); -+ free(bufmgr); -+ return NULL; -+ } -+ -+ bufmgr->ref_count = 1; -+ bufmgr->drm_fd = fd; -+ -+ LIST_INITHEAD(&bufmgr->bos); -+ LIST_ADD(&bufmgr->link, gBufMgrs); -+ -+ return bufmgr; -+} -+ -+void -+drm_slp_bufmgr_destroy(drm_slp_bufmgr bufmgr) -+{ -+ DRM_RETURN_IF_FAIL(MGR_IS_VALID(bufmgr)); -+ -+ fprintf(stderr, "[DRM] bufmgr destroy: bufmgr:%p, drm_fd:%d\n", -+ bufmgr, bufmgr->drm_fd); -+ -+ /*Check and Free bos*/ -+ if(!LIST_IS_EMPTY(&bufmgr->bos)) -+ { -+ drm_slp_bo bo, tmp; -+ -+ LIST_FOR_EACH_ENTRY_SAFE(bo, tmp, &bufmgr->bos, list) -+ { -+ fprintf(stderr, "[libdrm] Un-freed bo(%p, ref:%d) \n", bo, bo->ref_cnt); -+ bo->ref_cnt = 1; -+ drm_slp_bo_unref(bo); -+ } -+ } -+ -+ LIST_DEL(&bufmgr->link); -+ bufmgr->bufmgr_destroy(bufmgr); -+ -+ if(bufmgr->semObj.isOpened) -+ { -+ _sem_close(bufmgr); -+ } -+ -+ pthread_mutex_destroy(&bufmgr->lock); -+ free(bufmgr); -+} -+ -+int -+drm_slp_bufmgr_lock(drm_slp_bufmgr bufmgr) -+{ -+ DRM_RETURN_VAL_IF_FAIL(MGR_IS_VALID(bufmgr), 0); -+ -+ pthread_mutex_lock(&bufmgr->lock); -+ -+ if(bufmgr->bufmgr_lock) -+ { -+ int ret; -+ ret = bufmgr->bufmgr_lock(bufmgr); -+ pthread_mutex_unlock(&bufmgr->lock); -+ return ret; -+ } -+ -+ if(!bufmgr->semObj.isOpened) -+ { -+ if(_sem_open(bufmgr) != 1) -+ { -+ pthread_mutex_unlock(&bufmgr->lock); -+ return 0; -+ } -+ bufmgr->semObj.isOpened = 1; -+ } -+ -+ if(_sem_lock(bufmgr) != 1) -+ { -+ pthread_mutex_unlock(&bufmgr->lock); -+ return 0; -+ } -+ -+ pthread_mutex_unlock(&bufmgr->lock); -+ -+ return 1; -+} -+ -+int -+drm_slp_bufmgr_unlock(drm_slp_bufmgr bufmgr) -+{ -+ DRM_RETURN_VAL_IF_FAIL(MGR_IS_VALID(bufmgr), 0); -+ -+ pthread_mutex_lock(&bufmgr->lock); -+ -+ if(bufmgr->bufmgr_unlock) -+ { -+ int ret; -+ ret = bufmgr->bufmgr_unlock(bufmgr); -+ pthread_mutex_unlock(&bufmgr->lock); -+ return ret; -+ } -+ -+ if(_sem_unlock(bufmgr) != 1) -+ { -+ pthread_mutex_unlock(&bufmgr->lock); -+ return 0; -+ } -+ -+ pthread_mutex_unlock(&bufmgr->lock); -+ -+ return 1; -+} -+ -+int -+drm_slp_bufmgr_cache_flush(drm_slp_bufmgr bufmgr, drm_slp_bo bo, int flags) -+{ -+ int ret; -+ -+ DRM_RETURN_VAL_IF_FAIL(MGR_IS_VALID(bufmgr) || BO_IS_VALID(bo), 0); -+ -+ if (!bo) -+ flags |= DRM_SLP_CACHE_ALL; -+ -+ if (bo) -+ { -+ DRM_RETURN_VAL_IF_FAIL(BO_IS_VALID(bo), 0); -+ -+ if(!bo->bufmgr) -+ return 0; -+ -+ pthread_mutex_lock(&bo->bufmgr->lock); -+ ret = bo->bufmgr->bufmgr_cache_flush(bufmgr, bo, flags); -+ pthread_mutex_unlock(&bo->bufmgr->lock); -+ } -+ else -+ { -+ pthread_mutex_lock(&bufmgr->lock); -+ ret = bufmgr->bufmgr_cache_flush(bufmgr, NULL, flags); -+ pthread_mutex_unlock(&bufmgr->lock); -+ } -+ -+ return ret; -+} -+ -+int -+drm_slp_bo_size(drm_slp_bo bo) -+{ -+ int size; -+ drm_slp_bufmgr bufmgr; -+ -+ DRM_RETURN_VAL_IF_FAIL(BO_IS_VALID(bo), 0); -+ -+ bufmgr = bo->bufmgr; -+ -+ pthread_mutex_lock(&bufmgr->lock); -+ size = bo->bufmgr->bo_size(bo); -+ pthread_mutex_unlock(&bufmgr->lock); -+ -+ return size; -+} -+ -+drm_slp_bo -+drm_slp_bo_ref(drm_slp_bo bo) -+{ -+ drm_slp_bufmgr bufmgr; -+ -+ DRM_RETURN_VAL_IF_FAIL(BO_IS_VALID(bo), NULL); -+ -+ bufmgr = bo->bufmgr; -+ -+ pthread_mutex_lock(&bufmgr->lock); -+ -+ bo->ref_cnt++; -+ -+ pthread_mutex_unlock(&bufmgr->lock); -+ -+ return bo; -+} -+ -+void -+drm_slp_bo_unref(drm_slp_bo bo) -+{ -+ drm_slp_bufmgr bufmgr; -+ -+ DRM_RETURN_IF_FAIL(BO_IS_VALID(bo)); -+ -+ bufmgr = bo->bufmgr; -+ -+ if(0 >= bo->ref_cnt) -+ return; -+ -+ pthread_mutex_lock(&bufmgr->lock); -+ -+ bo->ref_cnt--; -+ if(bo->ref_cnt == 0) -+ { -+ if(bo->user_data) -+ { -+ void* rd; -+ drm_slp_user_data* old_data; -+ unsigned long key; -+ -+ while(1==drmSLFirst(bo->user_data, &key, &rd)) -+ { -+ old_data = (drm_slp_user_data*)rd; -+ -+ if(old_data->is_valid && old_data->free_func) -+ { -+ if(old_data->data) -+ old_data->free_func(old_data->data); -+ old_data->data = NULL; -+ free(old_data); -+ } -+ drmSLDelete(bo->user_data, key); -+ } -+ -+ drmSLDestroy(bo->user_data); -+ bo->user_data = (void*)0; -+ } -+ -+ LIST_DEL(&bo->list); -+ bufmgr->bo_free(bo); -+ -+ free(bo); -+ } -+ -+ pthread_mutex_unlock(&bufmgr->lock); -+} -+ -+drm_slp_bo -+drm_slp_bo_alloc(drm_slp_bufmgr bufmgr, const char * name, int size, int flags) -+{ -+ drm_slp_bo bo=NULL; -+ -+ DRM_RETURN_VAL_IF_FAIL( MGR_IS_VALID(bufmgr) && (size > 0), NULL); -+ -+ bo = calloc(sizeof(struct _drm_slp_bo), 1); -+ if(!bo) -+ return NULL; -+ -+ bo->bufmgr = bufmgr; -+ -+ pthread_mutex_lock(&bufmgr->lock); -+ if(!bufmgr->bo_alloc(bo, name, size, flags)) -+ { -+ free(bo); -+ pthread_mutex_unlock(&bufmgr->lock); -+ return NULL; -+ } -+ bo->ref_cnt = 1; -+ LIST_ADD(&bo->list, &bufmgr->bos); -+ pthread_mutex_unlock(&bufmgr->lock); -+ -+ return bo; -+} -+ -+drm_slp_bo -+drm_slp_bo_attach(drm_slp_bufmgr bufmgr, -+ const char* name, -+ int type, -+ int size, -+ unsigned int handle) -+{ -+ drm_slp_bo bo; -+ -+ DRM_RETURN_VAL_IF_FAIL(MGR_IS_VALID(bufmgr), NULL); -+ -+ bo = calloc(sizeof(struct _drm_slp_bo), 1); -+ if(!bo) -+ return NULL; -+ -+ bo->bufmgr = bufmgr; -+ -+ pthread_mutex_lock(&bufmgr->lock); -+ if(!bufmgr->bo_attach(bo, name, type, size, handle)) -+ { -+ free(bo); -+ pthread_mutex_unlock(&bufmgr->lock); -+ return NULL; -+ } -+ bo->ref_cnt = 1; -+ LIST_ADD(&bo->list, &bufmgr->bos); -+ pthread_mutex_unlock(&bufmgr->lock); -+ -+ return bo; -+} -+ -+drm_slp_bo -+drm_slp_bo_import(drm_slp_bufmgr bufmgr, unsigned int key) -+{ -+ drm_slp_bo bo; -+ -+ DRM_RETURN_VAL_IF_FAIL(MGR_IS_VALID(bufmgr), NULL); -+ -+ bo = calloc(sizeof(struct _drm_slp_bo), 1); -+ if(!bo) -+ return NULL; -+ -+ bo->bufmgr = bufmgr; -+ -+ pthread_mutex_lock(&bufmgr->lock); -+ if(!bufmgr->bo_import(bo, key)) -+ { -+ free(bo); -+ pthread_mutex_unlock(&bufmgr->lock); -+ return NULL; -+ } -+ bo->ref_cnt = 1; -+ LIST_ADD(&bo->list, &bufmgr->bos); -+ pthread_mutex_unlock(&bufmgr->lock); -+ -+ return bo; -+} -+ -+unsigned int -+drm_slp_bo_export(drm_slp_bo bo) -+{ -+ int ret; -+ -+ DRM_RETURN_VAL_IF_FAIL(BO_IS_VALID(bo), 0); -+ -+ pthread_mutex_lock(&bo->bufmgr->lock); -+ ret = bo->bufmgr->bo_export(bo); -+ pthread_mutex_unlock(&bo->bufmgr->lock); -+ -+ return ret; -+} -+ -+unsigned int -+drm_slp_bo_get_handle(drm_slp_bo bo, int device) -+{ -+ unsigned int ret; -+ -+ DRM_RETURN_VAL_IF_FAIL(BO_IS_VALID(bo), 0); -+ -+ pthread_mutex_lock(&bo->bufmgr->lock); -+ ret = bo->bufmgr->bo_get_handle(bo, device); -+ pthread_mutex_unlock(&bo->bufmgr->lock); -+ -+ return ret; -+} -+ -+unsigned int -+drm_slp_bo_map(drm_slp_bo bo, int device, int opt) -+{ -+ unsigned int ret; -+ -+ DRM_RETURN_VAL_IF_FAIL(BO_IS_VALID(bo), 0); -+ -+ pthread_mutex_lock(&bo->bufmgr->lock); -+ if(bo->bufmgr->bo_lock) -+ { -+ bo->bufmgr->bo_lock(bo, 0, (void*)0); -+ } -+ -+ ret = bo->bufmgr->bo_map(bo, device, opt); -+ pthread_mutex_unlock(&bo->bufmgr->lock); -+ -+ return ret; -+} -+ -+int -+drm_slp_bo_unmap(drm_slp_bo bo, int device) -+{ -+ int ret; -+ -+ DRM_RETURN_VAL_IF_FAIL(BO_IS_VALID(bo), 0); -+ -+ pthread_mutex_lock(&bo->bufmgr->lock); -+ ret = bo->bufmgr->bo_unmap(bo, device); -+ -+ if(bo->bufmgr->bo_unlock) -+ { -+ bo->bufmgr->bo_unlock(bo); -+ } -+ pthread_mutex_unlock(&bo->bufmgr->lock); -+ -+ return 0; -+} -+ -+int -+drm_slp_bo_swap(drm_slp_bo bo1, drm_slp_bo bo2) -+{ -+ void* temp; -+ -+ DRM_RETURN_VAL_IF_FAIL(BO_IS_VALID(bo1), 0); -+ DRM_RETURN_VAL_IF_FAIL(BO_IS_VALID(bo2), 0); -+ -+ if(bo1->bufmgr->bo_size(bo1) != bo2->bufmgr->bo_size(bo2)) -+ return 0; -+ -+ pthread_mutex_lock(&bo1->bufmgr->lock); -+ temp = bo1->priv; -+ bo1->priv = bo2->priv; -+ bo2->priv = temp; -+ pthread_mutex_unlock(&bo1->bufmgr->lock); -+ -+ return 1; -+} -+ -+int -+drm_slp_bo_add_user_data(drm_slp_bo bo, unsigned long key, drm_data_free data_free_func) -+{ -+ int ret; -+ drm_slp_user_data* data; -+ -+ DRM_RETURN_VAL_IF_FAIL(BO_IS_VALID(bo), 0); -+ -+ if(!bo->user_data) -+ bo->user_data = drmSLCreate(); -+ -+ data = calloc(1, sizeof(drm_slp_user_data)); -+ if(!data) -+ return 0; -+ -+ data->free_func = data_free_func; -+ data->data = (void*)0; -+ data->is_valid = 0; -+ -+ ret = drmSLInsert(bo->user_data, key, data); -+ if(ret == 1) /* Already in list */ -+ { -+ free(data); -+ return 0; -+ } -+ -+ return 1; -+} -+ -+int -+drm_slp_bo_set_user_data(drm_slp_bo bo, unsigned long key, void* data) -+{ -+ void *rd; -+ drm_slp_user_data* old_data; -+ -+ DRM_RETURN_VAL_IF_FAIL(BO_IS_VALID(bo), 0); -+ -+ if(!bo->user_data) -+ return 0; -+ -+ if(drmSLLookup(bo->user_data, key, &rd)) -+ return 0; -+ -+ old_data = (drm_slp_user_data*)rd; -+ if (!old_data) -+ return 0; -+ -+ if(old_data->is_valid) -+ { -+ if(old_data->free_func) -+ { -+ if(old_data->data) -+ old_data->free_func(old_data->data); -+ old_data->data = NULL; -+ } -+ } -+ else -+ old_data->is_valid = 1; -+ -+ old_data->data = data; -+ -+ return 1; -+} -+ -+int -+drm_slp_bo_get_user_data(drm_slp_bo bo, unsigned long key, void** data) -+{ -+ void *rd; -+ drm_slp_user_data* old_data; -+ -+ DRM_RETURN_VAL_IF_FAIL(BO_IS_VALID(bo) && data && bo->user_data, 0); -+ -+ if(drmSLLookup(bo->user_data, key, &rd)) -+ { -+ *data = NULL; -+ return 0; -+ } -+ -+ old_data = (drm_slp_user_data*)rd; -+ if (!old_data) -+ { -+ *data = NULL; -+ return 0; -+ } -+ -+ *data = old_data->data; -+ -+ return 1; -+} -+ -+int -+drm_slp_bo_delete_user_data(drm_slp_bo bo, unsigned long key) -+{ -+ void *rd; -+ drm_slp_user_data* old_data=(void*)0; -+ -+ DRM_RETURN_VAL_IF_FAIL(BO_IS_VALID(bo) && bo->user_data, 0); -+ -+ if(drmSLLookup(bo->user_data, key, &rd)) -+ return 0; -+ -+ old_data = (drm_slp_user_data*)rd; -+ if (!old_data) -+ return 0; -+ -+ if(old_data->is_valid && old_data->free_func) -+ { -+ if(old_data->data) -+ old_data->free_func(old_data->data); -+ free(old_data); -+ } -+ drmSLDelete(bo->user_data, key); -+ -+ return 1; -+} -diff --git a/slp/drm_slp_bufmgr.h b/slp/drm_slp_bufmgr.h -new file mode 100644 -index 0000000..a4adef5 ---- /dev/null -+++ b/slp/drm_slp_bufmgr.h -@@ -0,0 +1,201 @@ -+/************************************************************************** -+ -+xserver-xorg-video-sec -+ -+Copyright 2011 Samsung Electronics co., Ltd. All Rights Reserved. -+ -+Contact: SooChan Lim , Sangjin Lee -+ -+Permission is hereby granted, free of charge, to any person obtaining a -+copy of this software and associated documentation files (the -+"Software"), to deal in the Software without restriction, including -+without limitation the rights to use, copy, modify, merge, publish, -+distribute, sub license, and/or sell copies of the Software, and to -+permit persons to whom the Software is furnished to do so, subject to -+the following conditions: -+ -+The above copyright notice and this permission notice (including the -+next paragraph) shall be included in all copies or substantial portions -+of the Software. -+ -+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. -+IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR -+ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+ -+**************************************************************************/ -+ -+#ifndef _DRM_SLP_BUFMGR_H_ -+#define _DRM_SLP_BUFMGR_H_ -+ -+#include -+#include -+#include -+ -+typedef struct _drm_slp_bo * drm_slp_bo; -+typedef struct _drm_slp_bufmgr * drm_slp_bufmgr; -+ -+struct list_head -+{ -+ struct list_head *prev; -+ struct list_head *next; -+}; -+ -+struct _drm_slp_bo -+{ -+ struct list_head list; -+ drm_slp_bufmgr bufmgr; -+ int ref_cnt; /*atomic count*/ -+ void *user_data; -+ -+ /* private data */ -+ void *priv; -+}; -+ -+typedef enum -+{ -+ STATUS_UNLOCK, -+ STATUS_READY_TO_LOCK, -+ STATUS_LOCK, -+} lock_status; -+ -+struct _drm_slp_bufmgr -+{ -+ struct list_head bos; /*list head of bo*/ -+ -+ pthread_mutex_t lock; -+ struct { -+ int isOpened; -+ lock_status status; -+ sem_t* handle; -+ } semObj; -+ -+ void (*bufmgr_destroy)(drm_slp_bufmgr bufmgr); -+ int (*bufmgr_cache_flush)(drm_slp_bufmgr bufmgr, drm_slp_bo bo, int flags); -+ -+ int (*bo_size)(drm_slp_bo bo); -+ -+ void (*bo_free)(drm_slp_bo bo); -+ int (*bo_alloc)(drm_slp_bo bo, -+ const char* name, -+ int size, -+ int flags); -+ int (*bo_attach)(drm_slp_bo bo, -+ const char* name, -+ int type, -+ int size, -+ unsigned int handle); -+ int (*bo_import)(drm_slp_bo bo, unsigned int key); -+ unsigned int (*bo_export)(drm_slp_bo bo); -+ -+ unsigned int (*bo_get_handle)(drm_slp_bo bo, int device); -+ unsigned int (*bo_map)(drm_slp_bo bo, int device, int opt); -+ int (*bo_unmap)(drm_slp_bo bo, int device); -+ -+ -+ /* Padding for future extension */ -+ int (*bufmgr_lock) (drm_slp_bufmgr bufmgr); -+ int (*bufmgr_unlock) (drm_slp_bufmgr bufmgr); -+ int (*bo_lock) (drm_slp_bo bo, unsigned int checkOnly, unsigned int* isLocked); -+ int (*bo_unlock) (drm_slp_bo bo); -+ void (*reserved5) (void); -+ void (*reserved6) (void); -+ -+ /* private data */ -+ void *priv; -+ -+ struct list_head link; /*link of bufmgr*/ -+ -+ int drm_fd; -+ int ref_count; -+}; -+ -+/* DRM_SLP_MEM_TYPE */ -+#define DRM_SLP_MEM_GEM 0 -+#define DRM_SLP_MEM_USERPTR 1 -+#define DRM_SLP_MEM_DMABUF 2 -+#define DRM_SLP_MEM_GPU 3 -+ -+/* DRM_SLP_DEVICE_TYPE */ -+#define DRM_SLP_DEVICE_DEFAULT 0 //Default handle -+#define DRM_SLP_DEVICE_CPU 1 -+#define DRM_SLP_DEVICE_2D 2 -+#define DRM_SLP_DEVICE_3D 3 -+#define DRM_SLP_DEVICE_MM 4 -+ -+/* DRM_SLP_OPTION */ -+#define DRM_SLP_OPTION_READ (1 << 0) -+#define DRM_SLP_OPTION_WRITE (1 << 1) -+ -+/* DRM_SLP_CACHE */ -+#define DRM_SLP_CACHE_INV 0x01 -+#define DRM_SLP_CACHE_CLN 0x02 -+#define DRM_SLP_CACHE_ALL 0x10 -+#define DRM_SLP_CACHE_FLUSH (DRM_SLP_CACHE_INV|DRM_SLP_CACHE_CLN) -+#define DRM_SLP_CACHE_FLUSH_ALL (DRM_SLP_CACHE_FLUSH|DRM_SLP_CACHE_ALL) -+ -+enum DRM_SLP_BO_FLAGS{ -+ DRM_SLP_BO_DEFAULT = 0, -+ DRM_SLP_BO_SCANOUT = (1<<0), -+ DRM_SLP_BO_NONCACHABLE = (1<<1), -+ DRM_SLP_BO_WC = (1<<2), -+}; -+ -+/* Functions for buffer mnager */ -+drm_slp_bufmgr -+drm_slp_bufmgr_init(int fd, void * arg); -+void -+drm_slp_bufmgr_destroy(drm_slp_bufmgr bufmgr); -+int -+drm_slp_bufmgr_lock(drm_slp_bufmgr bufmgr); -+int -+drm_slp_bufmgr_unlock(drm_slp_bufmgr bufmgr); -+int -+drm_slp_bufmgr_cache_flush(drm_slp_bufmgr bufmgr, drm_slp_bo bo, int flags); -+ -+ -+/*Functions for bo*/ -+int -+drm_slp_bo_size (drm_slp_bo bo); -+drm_slp_bo -+drm_slp_bo_ref(drm_slp_bo bo); -+void -+drm_slp_bo_unref(drm_slp_bo bo); -+drm_slp_bo -+drm_slp_bo_alloc(drm_slp_bufmgr bufmgr, -+ const char* name, -+ int size, -+ int flags); -+drm_slp_bo -+drm_slp_bo_attach(drm_slp_bufmgr bufmgr, -+ const char* name, -+ int type, -+ int size, -+ unsigned int handle); -+drm_slp_bo -+drm_slp_bo_import(drm_slp_bufmgr bufmgr, unsigned int key); -+unsigned int -+drm_slp_bo_export(drm_slp_bo bo); -+unsigned int -+drm_slp_bo_get_handle(drm_slp_bo, int device); -+unsigned int -+drm_slp_bo_map(drm_slp_bo bo, int device, int opt); -+int -+drm_slp_bo_unmap(drm_slp_bo bo, int device); -+int -+drm_slp_bo_swap(drm_slp_bo bo1, drm_slp_bo bo2); -+ -+/*Functions for userdata of bo*/ -+typedef void (*drm_data_free)(void *); -+int -+drm_slp_bo_add_user_data(drm_slp_bo bo, unsigned long key, drm_data_free data_free_func); -+int -+drm_slp_bo_delete_user_data(drm_slp_bo bo, unsigned long key); -+int -+drm_slp_bo_set_user_data(drm_slp_bo bo, unsigned long key, void* data); -+int -+drm_slp_bo_get_user_data(drm_slp_bo bo, unsigned long key, void** data); -+#endif /* _DRM_SLP_BUFMGR_H_ */ -diff --git a/slp/libdrm_slp.pc.in b/slp/libdrm_slp.pc.in -new file mode 100644 -index 0000000..220d38b ---- /dev/null -+++ b/slp/libdrm_slp.pc.in -@@ -0,0 +1,11 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: libdrm -+Description: Userspace interface to kernel DRM services -+Version: @PACKAGE_VERSION@ -+Requires: libdrm -+Libs: -L${libdir} -ldrm_slp -+Cflags: -I${includedir} -I${includedir}/libdrm -diff --git a/slp/list.h b/slp/list.h -new file mode 100644 -index 0000000..e967b93 ---- /dev/null -+++ b/slp/list.h -@@ -0,0 +1,131 @@ -+/* -+ * -+ * Copyright 2006 Tungsten Graphics, Inc., Bismarck, ND. USA. -+ * All Rights Reserved. -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining a -+ * copy of this software and associated documentation files (the -+ * "Software"), to deal in the Software without restriction, including -+ * without limitation the rights to use, copy, modify, merge, publish, -+ * distribute, sub license, and/or sell copies of the Software, and to -+ * permit persons to whom the Software is furnished to do so, subject to -+ * the following conditions: -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL -+ * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, -+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE -+ * USE OR OTHER DEALINGS IN THE SOFTWARE. -+ * -+ * The above copyright notice and this permission notice (including the -+ * next paragraph) shall be included in all copies or substantial portions -+ * of the Software. -+ * -+ */ -+ -+/** -+ * \file -+ * List macros heavily inspired by the Linux kernel -+ * list handling. No list looping yet. -+ * -+ * Is not threadsafe, so common operations need to -+ * be protected using an external mutex. -+ */ -+#ifndef _U_DOUBLE_LIST_H_ -+#define _U_DOUBLE_LIST_H_ -+ -+#include -+ -+static void list_inithead(struct list_head *item) -+{ -+ item->prev = item; -+ item->next = item; -+} -+ -+static inline void list_add(struct list_head *item, struct list_head *list) -+{ -+ item->prev = list; -+ item->next = list->next; -+ list->next->prev = item; -+ list->next = item; -+} -+ -+static inline void list_addtail(struct list_head *item, struct list_head *list) -+{ -+ item->next = list; -+ item->prev = list->prev; -+ list->prev->next = item; -+ list->prev = item; -+} -+ -+static inline void list_replace(struct list_head *from, struct list_head *to) -+{ -+ to->prev = from->prev; -+ to->next = from->next; -+ from->next->prev = to; -+ from->prev->next = to; -+} -+ -+static inline void list_del(struct list_head *item) -+{ -+ item->prev->next = item->next; -+ item->next->prev = item->prev; -+} -+ -+static inline void list_delinit(struct list_head *item) -+{ -+ item->prev->next = item->next; -+ item->next->prev = item->prev; -+ item->next = item; -+ item->prev = item; -+} -+ -+#define LIST_INITHEAD(__item) list_inithead(__item) -+#define LIST_ADD(__item, __list) list_add(__item, __list) -+#define LIST_ADDTAIL(__item, __list) list_addtail(__item, __list) -+#define LIST_REPLACE(__from, __to) list_replace(__from, __to) -+#define LIST_DEL(__item) list_del(__item) -+#define LIST_DELINIT(__item) list_delinit(__item) -+ -+#define LIST_ENTRY(__type, __item, __field) \ -+ ((__type *)(((char *)(__item)) - offsetof(__type, __field))) -+ -+#define LIST_IS_EMPTY(__list) \ -+ ((__list)->next == (__list)) -+ -+#ifndef container_of -+#define container_of(ptr, sample, member) \ -+ (void *)((char *)(ptr) \ -+ - ((char *)&(sample)->member - (char *)(sample))) -+#endif -+ -+#define LIST_FOR_EACH_ENTRY(pos, head, member) \ -+ for (pos = container_of((head)->next, pos, member); \ -+ &pos->member != (head); \ -+ pos = container_of(pos->member.next, pos, member)) -+ -+#define LIST_FOR_EACH_ENTRY_SAFE(pos, storage, head, member) \ -+ for (pos = container_of((head)->next, pos, member), \ -+ storage = container_of(pos->member.next, pos, member); \ -+ &pos->member != (head); \ -+ pos = storage, storage = container_of(storage->member.next, storage, member)) -+ -+#define LIST_FOR_EACH_ENTRY_SAFE_REV(pos, storage, head, member) \ -+ for (pos = container_of((head)->prev, pos, member), \ -+ storage = container_of(pos->member.prev, pos, member); \ -+ &pos->member != (head); \ -+ pos = storage, storage = container_of(storage->member.prev, storage, member)) -+ -+#define LIST_FOR_EACH_ENTRY_FROM(pos, start, head, member) \ -+ for (pos = container_of((start), pos, member); \ -+ &pos->member != (head); \ -+ pos = container_of(pos->member.next, pos, member)) -+ -+#define LIST_FOR_EACH_ENTRY_FROM_REV(pos, start, head, member) \ -+ for (pos = container_of((start), pos, member); \ -+ &pos->member != (head); \ -+ pos = container_of(pos->member.prev, pos, member)) -+ -+#endif /*_U_DOUBLE_LIST_H_*/ --- -1.7.3.4 - diff --git a/0002-Adding-changes-to-configure.ac.patch b/0002-Adding-changes-to-configure.ac.patch deleted file mode 100644 index e0c7185..0000000 --- a/0002-Adding-changes-to-configure.ac.patch +++ /dev/null @@ -1,80 +0,0 @@ -From a770b7404b7611043701e56332eede3f19f4d7c5 Mon Sep 17 00:00:00 2001 -From: Prajwal Mohan -Date: Wed, 10 Oct 2012 10:10:45 -0700 -Subject: [PATCH 2/2] Adding changes to configure.ac - ---- - configure.ac | 24 +++++++++++++++++++++++- - 1 files changed, 23 insertions(+), 1 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 9506827..97f62dc 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -93,6 +93,19 @@ AC_ARG_ENABLE(exynos-experimental-api, - [Enable support for EXYNOS's experimental API (default: disabled)]), - [EXYNOS=$enableval], [EXYNOS=no]) - -+AC_ARG_ENABLE(slp, -+ AS_HELP_STRING([--disable-slp], -+ [Enable support for slp's API (default: auto)]), -+ [SLP=$enableval], [SLP=auto]) -+ -+AC_ARG_VAR([bufmgr_dir], [Directory of slp-bufmgr]) -+ -+if test "x$bufmgr_dir" = xyes; then -+ AC_DEFINE_UNQUOTED(BUFMGR_DIR, "$bufmgr_dir", [Directory for the modules of slp_bufmgr]) -+else -+ AC_DEFINE(BUFMGR_DIR, "/usr/lib/bufmgr", [Directory for the modules of slp_bufmgr]) -+fi -+ - dnl =========================================================================== - dnl check compiler flags - AC_DEFUN([LIBDRM_CC_TRY_FLAG], [ -@@ -214,7 +227,7 @@ if test "x$HAVE_LIBUDEV" = xyes; then - fi - AM_CONDITIONAL(HAVE_LIBUDEV, [test "x$HAVE_LIBUDEV" = xyes]) - --if test "x$INTEL" != "xno" -o "x$RADEON" != "xno" -o "x$NOUVEAU" != "xno" -o "x$OMAP" != "xno"; then -+if test "x$INTEL" != "xno" -o "x$RADEON" != "xno" -o "x$NOUVEAU" != "xno" -o "x$OMAP" != "xno" -o "x$SLP" != "xno"; then - # Check for atomic intrinsics - AC_CACHE_CHECK([for native atomic primitives], drm_cv_atomic_primitives, - [ -@@ -286,6 +299,10 @@ if test "x$INTEL" != "xno" -o "x$RADEON" != "xno" -o "x$NOUVEAU" != "xno" -o "x$ - fi - fi - -+if test "x$SLP" != "xno"; then -+ AC_DEFINE(HAVE_SLP, 1, [Have slp]) -+fi -+ - if test "x$INTEL" != "xno"; then - PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10]) - fi -@@ -297,6 +314,7 @@ if test "x$have_valgrind" = "xyes"; then - AC_DEFINE([HAVE_VALGRIND], 1, [Use valgrind intrinsics to suppress false warnings]) - fi - -+AM_CONDITIONAL(HAVE_SLP, [test "x$SLP" != "xno"]) - AM_CONDITIONAL(HAVE_INTEL, [test "x$INTEL" != "xno"]) - AM_CONDITIONAL(HAVE_RADEON, [test "x$RADEON" != "xno"]) - AM_CONDITIONAL(HAVE_NOUVEAU, [test "x$NOUVEAU" != "xno"]) -@@ -315,6 +333,8 @@ AC_CONFIG_FILES([ - Makefile - libkms/Makefile - libkms/libkms.pc -+ slp/Makefile -+ slp/libdrm_slp.pc - intel/Makefile - intel/libdrm_intel.pc - radeon/Makefile -@@ -346,4 +366,6 @@ echo " Radeon API $RADEON" - echo " Nouveau API $NOUVEAU" - echo " OMAP API $OMAP" - echo " EXYNOS API $EXYNOS" -+echo " SLP API $SLP" -+echo " SLP bufmgr_dir $bufmgr_dir" - echo "" --- -1.7.3.4 - diff --git a/libdrm-2.4.39/Makefile.am b/Makefile.am similarity index 100% rename from libdrm-2.4.39/Makefile.am rename to Makefile.am diff --git a/libdrm-2.4.39/Makefile.in b/Makefile.in similarity index 100% rename from libdrm-2.4.39/Makefile.in rename to Makefile.in diff --git a/libdrm-2.4.39/README b/README similarity index 100% rename from libdrm-2.4.39/README rename to README diff --git a/libdrm-2.4.39/aclocal.m4 b/aclocal.m4 similarity index 100% rename from libdrm-2.4.39/aclocal.m4 rename to aclocal.m4 diff --git a/libdrm-2.4.39/build-aux/config.guess b/build-aux/config.guess similarity index 100% rename from libdrm-2.4.39/build-aux/config.guess rename to build-aux/config.guess diff --git a/libdrm-2.4.39/build-aux/config.sub b/build-aux/config.sub similarity index 100% rename from libdrm-2.4.39/build-aux/config.sub rename to build-aux/config.sub diff --git a/libdrm-2.4.39/build-aux/depcomp b/build-aux/depcomp similarity index 100% rename from libdrm-2.4.39/build-aux/depcomp rename to build-aux/depcomp diff --git a/libdrm-2.4.39/build-aux/install-sh b/build-aux/install-sh similarity index 100% rename from libdrm-2.4.39/build-aux/install-sh rename to build-aux/install-sh diff --git a/libdrm-2.4.39/build-aux/ltmain.sh b/build-aux/ltmain.sh similarity index 100% rename from libdrm-2.4.39/build-aux/ltmain.sh rename to build-aux/ltmain.sh diff --git a/libdrm-2.4.39/build-aux/missing b/build-aux/missing similarity index 100% rename from libdrm-2.4.39/build-aux/missing rename to build-aux/missing diff --git a/libdrm-2.4.39/config.h.in b/config.h.in similarity index 100% rename from libdrm-2.4.39/config.h.in rename to config.h.in diff --git a/libdrm-2.4.39/configure b/configure similarity index 100% rename from libdrm-2.4.39/configure rename to configure diff --git a/libdrm-2.4.39/configure.ac b/configure.ac similarity index 100% rename from libdrm-2.4.39/configure.ac rename to configure.ac diff --git a/libdrm-2.4.39/exynos/Makefile.am b/exynos/Makefile.am similarity index 100% rename from libdrm-2.4.39/exynos/Makefile.am rename to exynos/Makefile.am diff --git a/libdrm-2.4.39/exynos/Makefile.in b/exynos/Makefile.in similarity index 100% rename from libdrm-2.4.39/exynos/Makefile.in rename to exynos/Makefile.in diff --git a/libdrm-2.4.39/exynos/exynos_drm.c b/exynos/exynos_drm.c similarity index 100% rename from libdrm-2.4.39/exynos/exynos_drm.c rename to exynos/exynos_drm.c diff --git a/libdrm-2.4.39/exynos/exynos_drm.h b/exynos/exynos_drm.h similarity index 100% rename from libdrm-2.4.39/exynos/exynos_drm.h rename to exynos/exynos_drm.h diff --git a/libdrm-2.4.39/exynos/exynos_drmif.h b/exynos/exynos_drmif.h similarity index 100% rename from libdrm-2.4.39/exynos/exynos_drmif.h rename to exynos/exynos_drmif.h diff --git a/libdrm-2.4.39/exynos/libdrm_exynos.pc.in b/exynos/libdrm_exynos.pc.in similarity index 100% rename from libdrm-2.4.39/exynos/libdrm_exynos.pc.in rename to exynos/libdrm_exynos.pc.in diff --git a/libdrm-2.4.39/include/Makefile.am b/include/Makefile.am similarity index 100% rename from libdrm-2.4.39/include/Makefile.am rename to include/Makefile.am diff --git a/libdrm-2.4.39/include/Makefile.in b/include/Makefile.in similarity index 100% rename from libdrm-2.4.39/include/Makefile.in rename to include/Makefile.in diff --git a/libdrm-2.4.39/include/drm/Makefile b/include/drm/Makefile similarity index 100% rename from libdrm-2.4.39/include/drm/Makefile rename to include/drm/Makefile diff --git a/libdrm-2.4.39/include/drm/Makefile.am b/include/drm/Makefile.am similarity index 100% rename from libdrm-2.4.39/include/drm/Makefile.am rename to include/drm/Makefile.am diff --git a/libdrm-2.4.39/include/drm/Makefile.in b/include/drm/Makefile.in similarity index 100% rename from libdrm-2.4.39/include/drm/Makefile.in rename to include/drm/Makefile.in diff --git a/libdrm-2.4.39/include/drm/drm.h b/include/drm/drm.h similarity index 100% rename from libdrm-2.4.39/include/drm/drm.h rename to include/drm/drm.h diff --git a/libdrm-2.4.39/include/drm/drm_fourcc.h b/include/drm/drm_fourcc.h similarity index 100% rename from libdrm-2.4.39/include/drm/drm_fourcc.h rename to include/drm/drm_fourcc.h diff --git a/libdrm-2.4.39/include/drm/drm_mode.h b/include/drm/drm_mode.h similarity index 100% rename from libdrm-2.4.39/include/drm/drm_mode.h rename to include/drm/drm_mode.h diff --git a/libdrm-2.4.39/include/drm/drm_sarea.h b/include/drm/drm_sarea.h similarity index 100% rename from libdrm-2.4.39/include/drm/drm_sarea.h rename to include/drm/drm_sarea.h diff --git a/libdrm-2.4.39/include/drm/i810_drm.h b/include/drm/i810_drm.h similarity index 100% rename from libdrm-2.4.39/include/drm/i810_drm.h rename to include/drm/i810_drm.h diff --git a/libdrm-2.4.39/include/drm/i830_drm.h b/include/drm/i830_drm.h similarity index 100% rename from libdrm-2.4.39/include/drm/i830_drm.h rename to include/drm/i830_drm.h diff --git a/libdrm-2.4.39/include/drm/i915_drm.h b/include/drm/i915_drm.h similarity index 100% rename from libdrm-2.4.39/include/drm/i915_drm.h rename to include/drm/i915_drm.h diff --git a/libdrm-2.4.39/include/drm/mach64_drm.h b/include/drm/mach64_drm.h similarity index 100% rename from libdrm-2.4.39/include/drm/mach64_drm.h rename to include/drm/mach64_drm.h diff --git a/libdrm-2.4.39/include/drm/mga_drm.h b/include/drm/mga_drm.h similarity index 100% rename from libdrm-2.4.39/include/drm/mga_drm.h rename to include/drm/mga_drm.h diff --git a/libdrm-2.4.39/include/drm/nouveau_drm.h b/include/drm/nouveau_drm.h similarity index 100% rename from libdrm-2.4.39/include/drm/nouveau_drm.h rename to include/drm/nouveau_drm.h diff --git a/libdrm-2.4.39/include/drm/r128_drm.h b/include/drm/r128_drm.h similarity index 100% rename from libdrm-2.4.39/include/drm/r128_drm.h rename to include/drm/r128_drm.h diff --git a/libdrm-2.4.39/include/drm/radeon_drm.h b/include/drm/radeon_drm.h similarity index 100% rename from libdrm-2.4.39/include/drm/radeon_drm.h rename to include/drm/radeon_drm.h diff --git a/libdrm-2.4.39/include/drm/savage_drm.h b/include/drm/savage_drm.h similarity index 100% rename from libdrm-2.4.39/include/drm/savage_drm.h rename to include/drm/savage_drm.h diff --git a/libdrm-2.4.39/include/drm/sis_drm.h b/include/drm/sis_drm.h similarity index 100% rename from libdrm-2.4.39/include/drm/sis_drm.h rename to include/drm/sis_drm.h diff --git a/libdrm-2.4.39/include/drm/via_drm.h b/include/drm/via_drm.h similarity index 100% rename from libdrm-2.4.39/include/drm/via_drm.h rename to include/drm/via_drm.h diff --git a/libdrm-2.4.39/include/drm/vmwgfx_drm.h b/include/drm/vmwgfx_drm.h similarity index 100% rename from libdrm-2.4.39/include/drm/vmwgfx_drm.h rename to include/drm/vmwgfx_drm.h diff --git a/libdrm-2.4.39/intel/Makefile.am b/intel/Makefile.am similarity index 100% rename from libdrm-2.4.39/intel/Makefile.am rename to intel/Makefile.am diff --git a/libdrm-2.4.39/intel/Makefile.in b/intel/Makefile.in similarity index 100% rename from libdrm-2.4.39/intel/Makefile.in rename to intel/Makefile.in diff --git a/libdrm-2.4.39/intel/intel_aub.h b/intel/intel_aub.h similarity index 100% rename from libdrm-2.4.39/intel/intel_aub.h rename to intel/intel_aub.h diff --git a/libdrm-2.4.39/intel/intel_bufmgr.c b/intel/intel_bufmgr.c similarity index 100% rename from libdrm-2.4.39/intel/intel_bufmgr.c rename to intel/intel_bufmgr.c diff --git a/libdrm-2.4.39/intel/intel_bufmgr.h b/intel/intel_bufmgr.h similarity index 100% rename from libdrm-2.4.39/intel/intel_bufmgr.h rename to intel/intel_bufmgr.h diff --git a/libdrm-2.4.39/intel/intel_bufmgr_fake.c b/intel/intel_bufmgr_fake.c similarity index 100% rename from libdrm-2.4.39/intel/intel_bufmgr_fake.c rename to intel/intel_bufmgr_fake.c diff --git a/libdrm-2.4.39/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c similarity index 100% rename from libdrm-2.4.39/intel/intel_bufmgr_gem.c rename to intel/intel_bufmgr_gem.c diff --git a/libdrm-2.4.39/intel/intel_bufmgr_priv.h b/intel/intel_bufmgr_priv.h similarity index 100% rename from libdrm-2.4.39/intel/intel_bufmgr_priv.h rename to intel/intel_bufmgr_priv.h diff --git a/libdrm-2.4.39/intel/intel_chipset.h b/intel/intel_chipset.h similarity index 100% rename from libdrm-2.4.39/intel/intel_chipset.h rename to intel/intel_chipset.h diff --git a/libdrm-2.4.39/intel/intel_debug.h b/intel/intel_debug.h similarity index 100% rename from libdrm-2.4.39/intel/intel_debug.h rename to intel/intel_debug.h diff --git a/libdrm-2.4.39/intel/intel_decode.c b/intel/intel_decode.c similarity index 100% rename from libdrm-2.4.39/intel/intel_decode.c rename to intel/intel_decode.c diff --git a/libdrm-2.4.39/intel/libdrm_intel.pc.in b/intel/libdrm_intel.pc.in similarity index 100% rename from libdrm-2.4.39/intel/libdrm_intel.pc.in rename to intel/libdrm_intel.pc.in diff --git a/libdrm-2.4.39/intel/mm.c b/intel/mm.c similarity index 100% rename from libdrm-2.4.39/intel/mm.c rename to intel/mm.c diff --git a/libdrm-2.4.39/intel/mm.h b/intel/mm.h similarity index 100% rename from libdrm-2.4.39/intel/mm.h rename to intel/mm.h diff --git a/libdrm-2.4.39/intel/test_decode.c b/intel/test_decode.c similarity index 100% rename from libdrm-2.4.39/intel/test_decode.c rename to intel/test_decode.c diff --git a/libdrm-2.4.39/intel/tests/gen4-3d.batch b/intel/tests/gen4-3d.batch similarity index 100% rename from libdrm-2.4.39/intel/tests/gen4-3d.batch rename to intel/tests/gen4-3d.batch diff --git a/libdrm-2.4.39/intel/tests/gen4-3d.batch-ref.txt b/intel/tests/gen4-3d.batch-ref.txt similarity index 100% rename from libdrm-2.4.39/intel/tests/gen4-3d.batch-ref.txt rename to intel/tests/gen4-3d.batch-ref.txt diff --git a/libdrm-2.4.39/intel/tests/gen4-3d.batch.sh b/intel/tests/gen4-3d.batch.sh similarity index 100% rename from libdrm-2.4.39/intel/tests/gen4-3d.batch.sh rename to intel/tests/gen4-3d.batch.sh diff --git a/libdrm-2.4.39/intel/tests/gen5-3d.batch b/intel/tests/gen5-3d.batch similarity index 100% rename from libdrm-2.4.39/intel/tests/gen5-3d.batch rename to intel/tests/gen5-3d.batch diff --git a/libdrm-2.4.39/intel/tests/gen5-3d.batch-ref.txt b/intel/tests/gen5-3d.batch-ref.txt similarity index 100% rename from libdrm-2.4.39/intel/tests/gen5-3d.batch-ref.txt rename to intel/tests/gen5-3d.batch-ref.txt diff --git a/libdrm-2.4.39/intel/tests/gen5-3d.batch.sh b/intel/tests/gen5-3d.batch.sh similarity index 100% rename from libdrm-2.4.39/intel/tests/gen5-3d.batch.sh rename to intel/tests/gen5-3d.batch.sh diff --git a/libdrm-2.4.39/intel/tests/gen6-3d.batch b/intel/tests/gen6-3d.batch similarity index 100% rename from libdrm-2.4.39/intel/tests/gen6-3d.batch rename to intel/tests/gen6-3d.batch diff --git a/libdrm-2.4.39/intel/tests/gen6-3d.batch-ref.txt b/intel/tests/gen6-3d.batch-ref.txt similarity index 100% rename from libdrm-2.4.39/intel/tests/gen6-3d.batch-ref.txt rename to intel/tests/gen6-3d.batch-ref.txt diff --git a/libdrm-2.4.39/intel/tests/gen6-3d.batch.sh b/intel/tests/gen6-3d.batch.sh similarity index 100% rename from libdrm-2.4.39/intel/tests/gen6-3d.batch.sh rename to intel/tests/gen6-3d.batch.sh diff --git a/libdrm-2.4.39/intel/tests/gen7-2d-copy.batch b/intel/tests/gen7-2d-copy.batch similarity index 100% rename from libdrm-2.4.39/intel/tests/gen7-2d-copy.batch rename to intel/tests/gen7-2d-copy.batch diff --git a/libdrm-2.4.39/intel/tests/gen7-2d-copy.batch-ref.txt b/intel/tests/gen7-2d-copy.batch-ref.txt similarity index 100% rename from libdrm-2.4.39/intel/tests/gen7-2d-copy.batch-ref.txt rename to intel/tests/gen7-2d-copy.batch-ref.txt diff --git a/libdrm-2.4.39/intel/tests/gen7-2d-copy.batch.sh b/intel/tests/gen7-2d-copy.batch.sh similarity index 100% rename from libdrm-2.4.39/intel/tests/gen7-2d-copy.batch.sh rename to intel/tests/gen7-2d-copy.batch.sh diff --git a/libdrm-2.4.39/intel/tests/gen7-3d.batch b/intel/tests/gen7-3d.batch similarity index 100% rename from libdrm-2.4.39/intel/tests/gen7-3d.batch rename to intel/tests/gen7-3d.batch diff --git a/libdrm-2.4.39/intel/tests/gen7-3d.batch-ref.txt b/intel/tests/gen7-3d.batch-ref.txt similarity index 100% rename from libdrm-2.4.39/intel/tests/gen7-3d.batch-ref.txt rename to intel/tests/gen7-3d.batch-ref.txt diff --git a/libdrm-2.4.39/intel/tests/gen7-3d.batch.sh b/intel/tests/gen7-3d.batch.sh similarity index 100% rename from libdrm-2.4.39/intel/tests/gen7-3d.batch.sh rename to intel/tests/gen7-3d.batch.sh diff --git a/libdrm-2.4.39/intel/tests/gm45-3d.batch b/intel/tests/gm45-3d.batch similarity index 100% rename from libdrm-2.4.39/intel/tests/gm45-3d.batch rename to intel/tests/gm45-3d.batch diff --git a/libdrm-2.4.39/intel/tests/gm45-3d.batch-ref.txt b/intel/tests/gm45-3d.batch-ref.txt similarity index 100% rename from libdrm-2.4.39/intel/tests/gm45-3d.batch-ref.txt rename to intel/tests/gm45-3d.batch-ref.txt diff --git a/libdrm-2.4.39/intel/tests/gm45-3d.batch.sh b/intel/tests/gm45-3d.batch.sh similarity index 100% rename from libdrm-2.4.39/intel/tests/gm45-3d.batch.sh rename to intel/tests/gm45-3d.batch.sh diff --git a/libdrm-2.4.39/intel/tests/test-batch.sh b/intel/tests/test-batch.sh similarity index 100% rename from libdrm-2.4.39/intel/tests/test-batch.sh rename to intel/tests/test-batch.sh diff --git a/libdrm-2.4.39/libdrm.pc.in b/libdrm.pc.in similarity index 100% rename from libdrm-2.4.39/libdrm.pc.in rename to libdrm.pc.in diff --git a/libdrm.spec b/libdrm.spec deleted file mode 100644 index 1d92dae..0000000 --- a/libdrm.spec +++ /dev/null @@ -1,121 +0,0 @@ -Name: libdrm -Summary: Userspace interface to kernel DRM services -- runtime -Version: 2.4.39 -Release: 11.1 -Group: libs -License: MIT -Source0: libdrm-%{version}.tar.bz2 -Patch0: 0001-Adding-slp-subpackage.patch -Patch1: 0002-Adding-changes-to-configure.ac.patch -Requires(post): /sbin/ldconfig -Requires(postun): /sbin/ldconfig -BuildRequires: pkgconfig(x11) -BuildRequires: pkgconfig(pthread-stubs) -BuildRequires: pkgconfig(pciaccess) -BuildRequires: automake -BuildRequires: libtool - - -%description -Userspace interface to kernel DRM services -- runtime - This library implements the userspace interface to the kernel DRM - services. DRM stands for "Direct Rendering Manager", which is the - kernelspace portion of the "Direct Rendering Infrastructure" (DRI). - The DRI is currently used on Linux to provide hardware-accelerated - OpenGL drivers. - . - This package provides the runtime environment for libdrm.. - - - -%package devel -Summary: Userspace interface to kernel DRM services -- development files -Group: libdevel -Requires: libdrm = %{version}-%{release} -Obsoletes: linux-libc-dev >= 2.6.29 - -%description devel -Userspace interface to kernel DRM services -- development files - This library implements the userspace interface to the kernel DRM - services. DRM stands for "Direct Rendering Manager", which is the - kernelspace portion of the "Direct Rendering Infrastructure" (DRI). - The DRI is currently used on Linux to provide hardware-accelerated - OpenGL drivers. - . - This package provides the development environment for libdrm.. - -%package slp1 -Summary: Userspace interface to slp-specific kernel DRM services -Group: Development/Libraries - -%description slp1 -Userspace interface to slp-specific kernel DRM services - - -%package -n libkms -Summary: Userspace interface to kernel DRM buffer management -Group: libs -Requires(post): /sbin/ldconfig -Requires(postun): /sbin/ldconfig - -%description -n libkms -Userspace interface to kernel DRM buffer management - This library implements a unified userspace interface to the different buffer - management interfaces of the kernel DRM hardware drivers.. - -%prep -%setup -q -n %{name}-%{version} - -%patch0 -p1 -%patch1 -p1 - -%build -%configure --disable-static --enable-nouveau-experimental-api --enable-omap-experimental-api -make %{?jobs:-j%jobs} - -%install -rm -rf %{buildroot} -%make_install - -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - -%post -n libkms -p /sbin/ldconfig - -%postun -n libkms -p /sbin/ldconfig - -%files -%defattr(-,root,root,-) -%{_libdir}/libdrm.so.* -%{_libdir}/libdrm_omap.so.* -%{_libdir}/libdrm_radeon.so.* -%{_libdir}/libdrm_nouveau.so.* - -%files devel -%defattr(-,root,root,-) -%{_includedir}/libdrm/* -%{_includedir}/xf86drmMode.h -%{_includedir}/xf86drm.h -%{_includedir}/libkms/* -%{_includedir}/omap/* - -%{_libdir}/lib*.so -%{_libdir}/pkgconfig/* - -%files slp1 -%{_libdir}/libdrm_slp*.so.* - -%files -n libkms -%defattr(-,root,root,-) -%{_libdir}/libkms.so.* - -%changelog -* Mon Oct 22 2012 tracy.graydon@intel.com -- Branching for 1.0alpha -* Mon Aug 13 2012 Quanxian Wang - 2.4.37 -- Updating to 2.4.37 -* Tue Jun 12 2012 Rusty Lynch - 2.4.34-3-gc563db0 -- Updating to new git master snapshot -* Fri May 4 2012 Lin Yang -- test release infrastructure diff --git a/libdrm-2.4.39/libdrm_lists.h b/libdrm_lists.h similarity index 100% rename from libdrm-2.4.39/libdrm_lists.h rename to libdrm_lists.h diff --git a/libdrm-2.4.39/libkms/Makefile.am b/libkms/Makefile.am similarity index 100% rename from libdrm-2.4.39/libkms/Makefile.am rename to libkms/Makefile.am diff --git a/libdrm-2.4.39/libkms/Makefile.in b/libkms/Makefile.in similarity index 100% rename from libdrm-2.4.39/libkms/Makefile.in rename to libkms/Makefile.in diff --git a/libdrm-2.4.39/libkms/api.c b/libkms/api.c similarity index 100% rename from libdrm-2.4.39/libkms/api.c rename to libkms/api.c diff --git a/libdrm-2.4.39/libkms/dumb.c b/libkms/dumb.c similarity index 100% rename from libdrm-2.4.39/libkms/dumb.c rename to libkms/dumb.c diff --git a/libdrm-2.4.39/libkms/intel.c b/libkms/intel.c similarity index 100% rename from libdrm-2.4.39/libkms/intel.c rename to libkms/intel.c diff --git a/libdrm-2.4.39/libkms/internal.h b/libkms/internal.h similarity index 100% rename from libdrm-2.4.39/libkms/internal.h rename to libkms/internal.h diff --git a/libdrm-2.4.39/libkms/libkms.h b/libkms/libkms.h similarity index 100% rename from libdrm-2.4.39/libkms/libkms.h rename to libkms/libkms.h diff --git a/libdrm-2.4.39/libkms/libkms.pc.in b/libkms/libkms.pc.in similarity index 100% rename from libdrm-2.4.39/libkms/libkms.pc.in rename to libkms/libkms.pc.in diff --git a/libdrm-2.4.39/libkms/linux.c b/libkms/linux.c similarity index 100% rename from libdrm-2.4.39/libkms/linux.c rename to libkms/linux.c diff --git a/libdrm-2.4.39/libkms/nouveau.c b/libkms/nouveau.c similarity index 100% rename from libdrm-2.4.39/libkms/nouveau.c rename to libkms/nouveau.c diff --git a/libdrm-2.4.39/libkms/radeon.c b/libkms/radeon.c similarity index 100% rename from libdrm-2.4.39/libkms/radeon.c rename to libkms/radeon.c diff --git a/libdrm-2.4.39/libkms/vmwgfx.c b/libkms/vmwgfx.c similarity index 100% rename from libdrm-2.4.39/libkms/vmwgfx.c rename to libkms/vmwgfx.c diff --git a/libdrm-2.4.39/m4/libtool.m4 b/m4/libtool.m4 similarity index 100% rename from libdrm-2.4.39/m4/libtool.m4 rename to m4/libtool.m4 diff --git a/libdrm-2.4.39/m4/ltoptions.m4 b/m4/ltoptions.m4 similarity index 100% rename from libdrm-2.4.39/m4/ltoptions.m4 rename to m4/ltoptions.m4 diff --git a/libdrm-2.4.39/m4/ltsugar.m4 b/m4/ltsugar.m4 similarity index 100% rename from libdrm-2.4.39/m4/ltsugar.m4 rename to m4/ltsugar.m4 diff --git a/libdrm-2.4.39/m4/ltversion.m4 b/m4/ltversion.m4 similarity index 100% rename from libdrm-2.4.39/m4/ltversion.m4 rename to m4/ltversion.m4 diff --git a/libdrm-2.4.39/m4/lt~obsolete.m4 b/m4/lt~obsolete.m4 similarity index 100% rename from libdrm-2.4.39/m4/lt~obsolete.m4 rename to m4/lt~obsolete.m4 diff --git a/libdrm-2.4.39/nouveau/Makefile.am b/nouveau/Makefile.am similarity index 100% rename from libdrm-2.4.39/nouveau/Makefile.am rename to nouveau/Makefile.am diff --git a/libdrm-2.4.39/nouveau/Makefile.in b/nouveau/Makefile.in similarity index 100% rename from libdrm-2.4.39/nouveau/Makefile.in rename to nouveau/Makefile.in diff --git a/libdrm-2.4.39/nouveau/abi16.c b/nouveau/abi16.c similarity index 100% rename from libdrm-2.4.39/nouveau/abi16.c rename to nouveau/abi16.c diff --git a/libdrm-2.4.39/nouveau/bufctx.c b/nouveau/bufctx.c similarity index 100% rename from libdrm-2.4.39/nouveau/bufctx.c rename to nouveau/bufctx.c diff --git a/libdrm-2.4.39/nouveau/libdrm_nouveau.pc.in b/nouveau/libdrm_nouveau.pc.in similarity index 100% rename from libdrm-2.4.39/nouveau/libdrm_nouveau.pc.in rename to nouveau/libdrm_nouveau.pc.in diff --git a/libdrm-2.4.39/nouveau/nouveau.c b/nouveau/nouveau.c similarity index 100% rename from libdrm-2.4.39/nouveau/nouveau.c rename to nouveau/nouveau.c diff --git a/libdrm-2.4.39/nouveau/nouveau.h b/nouveau/nouveau.h similarity index 100% rename from libdrm-2.4.39/nouveau/nouveau.h rename to nouveau/nouveau.h diff --git a/libdrm-2.4.39/nouveau/private.h b/nouveau/private.h similarity index 100% rename from libdrm-2.4.39/nouveau/private.h rename to nouveau/private.h diff --git a/libdrm-2.4.39/nouveau/pushbuf.c b/nouveau/pushbuf.c similarity index 100% rename from libdrm-2.4.39/nouveau/pushbuf.c rename to nouveau/pushbuf.c diff --git a/libdrm-2.4.39/omap/Makefile.am b/omap/Makefile.am similarity index 100% rename from libdrm-2.4.39/omap/Makefile.am rename to omap/Makefile.am diff --git a/libdrm-2.4.39/omap/Makefile.in b/omap/Makefile.in similarity index 100% rename from libdrm-2.4.39/omap/Makefile.in rename to omap/Makefile.in diff --git a/libdrm-2.4.39/omap/libdrm_omap.pc.in b/omap/libdrm_omap.pc.in similarity index 100% rename from libdrm-2.4.39/omap/libdrm_omap.pc.in rename to omap/libdrm_omap.pc.in diff --git a/libdrm-2.4.39/omap/omap_drm.c b/omap/omap_drm.c similarity index 100% rename from libdrm-2.4.39/omap/omap_drm.c rename to omap/omap_drm.c diff --git a/libdrm-2.4.39/omap/omap_drm.h b/omap/omap_drm.h similarity index 100% rename from libdrm-2.4.39/omap/omap_drm.h rename to omap/omap_drm.h diff --git a/libdrm-2.4.39/omap/omap_drmif.h b/omap/omap_drmif.h similarity index 100% rename from libdrm-2.4.39/omap/omap_drmif.h rename to omap/omap_drmif.h diff --git a/libdrm-2.4.39/packaging/0001-Adding-slp-subpackage.patch b/packaging/0001-Adding-slp-subpackage.patch similarity index 100% rename from libdrm-2.4.39/packaging/0001-Adding-slp-subpackage.patch rename to packaging/0001-Adding-slp-subpackage.patch diff --git a/libdrm-2.4.39/packaging/0002-Adding-changes-to-configure.ac.patch b/packaging/0002-Adding-changes-to-configure.ac.patch similarity index 100% rename from libdrm-2.4.39/packaging/0002-Adding-changes-to-configure.ac.patch rename to packaging/0002-Adding-changes-to-configure.ac.patch diff --git a/libdrm-2.4.39/packaging/libdrm.changes b/packaging/libdrm.changes similarity index 100% rename from libdrm-2.4.39/packaging/libdrm.changes rename to packaging/libdrm.changes diff --git a/libdrm-2.4.39/packaging/libdrm.spec b/packaging/libdrm.spec similarity index 100% rename from libdrm-2.4.39/packaging/libdrm.spec rename to packaging/libdrm.spec diff --git a/libdrm-2.4.39/radeon/Makefile.am b/radeon/Makefile.am similarity index 100% rename from libdrm-2.4.39/radeon/Makefile.am rename to radeon/Makefile.am diff --git a/libdrm-2.4.39/radeon/Makefile.in b/radeon/Makefile.in similarity index 100% rename from libdrm-2.4.39/radeon/Makefile.in rename to radeon/Makefile.in diff --git a/libdrm-2.4.39/radeon/bof.c b/radeon/bof.c similarity index 100% rename from libdrm-2.4.39/radeon/bof.c rename to radeon/bof.c diff --git a/libdrm-2.4.39/radeon/bof.h b/radeon/bof.h similarity index 100% rename from libdrm-2.4.39/radeon/bof.h rename to radeon/bof.h diff --git a/libdrm-2.4.39/radeon/libdrm_radeon.pc.in b/radeon/libdrm_radeon.pc.in similarity index 100% rename from libdrm-2.4.39/radeon/libdrm_radeon.pc.in rename to radeon/libdrm_radeon.pc.in diff --git a/libdrm-2.4.39/radeon/r600_pci_ids.h b/radeon/r600_pci_ids.h similarity index 100% rename from libdrm-2.4.39/radeon/r600_pci_ids.h rename to radeon/r600_pci_ids.h diff --git a/libdrm-2.4.39/radeon/radeon_bo.c b/radeon/radeon_bo.c similarity index 100% rename from libdrm-2.4.39/radeon/radeon_bo.c rename to radeon/radeon_bo.c diff --git a/libdrm-2.4.39/radeon/radeon_bo.h b/radeon/radeon_bo.h similarity index 100% rename from libdrm-2.4.39/radeon/radeon_bo.h rename to radeon/radeon_bo.h diff --git a/libdrm-2.4.39/radeon/radeon_bo_gem.c b/radeon/radeon_bo_gem.c similarity index 100% rename from libdrm-2.4.39/radeon/radeon_bo_gem.c rename to radeon/radeon_bo_gem.c diff --git a/libdrm-2.4.39/radeon/radeon_bo_gem.h b/radeon/radeon_bo_gem.h similarity index 100% rename from libdrm-2.4.39/radeon/radeon_bo_gem.h rename to radeon/radeon_bo_gem.h diff --git a/libdrm-2.4.39/radeon/radeon_bo_int.h b/radeon/radeon_bo_int.h similarity index 100% rename from libdrm-2.4.39/radeon/radeon_bo_int.h rename to radeon/radeon_bo_int.h diff --git a/libdrm-2.4.39/radeon/radeon_cs.c b/radeon/radeon_cs.c similarity index 100% rename from libdrm-2.4.39/radeon/radeon_cs.c rename to radeon/radeon_cs.c diff --git a/libdrm-2.4.39/radeon/radeon_cs.h b/radeon/radeon_cs.h similarity index 100% rename from libdrm-2.4.39/radeon/radeon_cs.h rename to radeon/radeon_cs.h diff --git a/libdrm-2.4.39/radeon/radeon_cs_gem.c b/radeon/radeon_cs_gem.c similarity index 100% rename from libdrm-2.4.39/radeon/radeon_cs_gem.c rename to radeon/radeon_cs_gem.c diff --git a/libdrm-2.4.39/radeon/radeon_cs_gem.h b/radeon/radeon_cs_gem.h similarity index 100% rename from libdrm-2.4.39/radeon/radeon_cs_gem.h rename to radeon/radeon_cs_gem.h diff --git a/libdrm-2.4.39/radeon/radeon_cs_int.h b/radeon/radeon_cs_int.h similarity index 100% rename from libdrm-2.4.39/radeon/radeon_cs_int.h rename to radeon/radeon_cs_int.h diff --git a/libdrm-2.4.39/radeon/radeon_cs_space.c b/radeon/radeon_cs_space.c similarity index 100% rename from libdrm-2.4.39/radeon/radeon_cs_space.c rename to radeon/radeon_cs_space.c diff --git a/libdrm-2.4.39/radeon/radeon_surface.c b/radeon/radeon_surface.c similarity index 100% rename from libdrm-2.4.39/radeon/radeon_surface.c rename to radeon/radeon_surface.c diff --git a/libdrm-2.4.39/radeon/radeon_surface.h b/radeon/radeon_surface.h similarity index 100% rename from libdrm-2.4.39/radeon/radeon_surface.h rename to radeon/radeon_surface.h diff --git a/libdrm-2.4.39/tests/Makefile.am b/tests/Makefile.am similarity index 100% rename from libdrm-2.4.39/tests/Makefile.am rename to tests/Makefile.am diff --git a/libdrm-2.4.39/tests/Makefile.in b/tests/Makefile.in similarity index 100% rename from libdrm-2.4.39/tests/Makefile.in rename to tests/Makefile.in diff --git a/libdrm-2.4.39/tests/dristat.c b/tests/dristat.c similarity index 100% rename from libdrm-2.4.39/tests/dristat.c rename to tests/dristat.c diff --git a/libdrm-2.4.39/tests/drmstat.c b/tests/drmstat.c similarity index 100% rename from libdrm-2.4.39/tests/drmstat.c rename to tests/drmstat.c diff --git a/libdrm-2.4.39/tests/drmtest.c b/tests/drmtest.c similarity index 100% rename from libdrm-2.4.39/tests/drmtest.c rename to tests/drmtest.c diff --git a/libdrm-2.4.39/tests/drmtest.h b/tests/drmtest.h similarity index 100% rename from libdrm-2.4.39/tests/drmtest.h rename to tests/drmtest.h diff --git a/libdrm-2.4.39/tests/gem_basic.c b/tests/gem_basic.c similarity index 100% rename from libdrm-2.4.39/tests/gem_basic.c rename to tests/gem_basic.c diff --git a/libdrm-2.4.39/tests/gem_flink.c b/tests/gem_flink.c similarity index 100% rename from libdrm-2.4.39/tests/gem_flink.c rename to tests/gem_flink.c diff --git a/libdrm-2.4.39/tests/gem_mmap.c b/tests/gem_mmap.c similarity index 100% rename from libdrm-2.4.39/tests/gem_mmap.c rename to tests/gem_mmap.c diff --git a/libdrm-2.4.39/tests/gem_readwrite.c b/tests/gem_readwrite.c similarity index 100% rename from libdrm-2.4.39/tests/gem_readwrite.c rename to tests/gem_readwrite.c diff --git a/libdrm-2.4.39/tests/getclient.c b/tests/getclient.c similarity index 100% rename from libdrm-2.4.39/tests/getclient.c rename to tests/getclient.c diff --git a/libdrm-2.4.39/tests/getstats.c b/tests/getstats.c similarity index 100% rename from libdrm-2.4.39/tests/getstats.c rename to tests/getstats.c diff --git a/libdrm-2.4.39/tests/getversion.c b/tests/getversion.c similarity index 100% rename from libdrm-2.4.39/tests/getversion.c rename to tests/getversion.c diff --git a/libdrm-2.4.39/tests/kmstest/Makefile.am b/tests/kmstest/Makefile.am similarity index 100% rename from libdrm-2.4.39/tests/kmstest/Makefile.am rename to tests/kmstest/Makefile.am diff --git a/libdrm-2.4.39/tests/kmstest/Makefile.in b/tests/kmstest/Makefile.in similarity index 100% rename from libdrm-2.4.39/tests/kmstest/Makefile.in rename to tests/kmstest/Makefile.in diff --git a/libdrm-2.4.39/tests/kmstest/main.c b/tests/kmstest/main.c similarity index 100% rename from libdrm-2.4.39/tests/kmstest/main.c rename to tests/kmstest/main.c diff --git a/libdrm-2.4.39/tests/modeprint/Makefile.am b/tests/modeprint/Makefile.am similarity index 100% rename from libdrm-2.4.39/tests/modeprint/Makefile.am rename to tests/modeprint/Makefile.am diff --git a/libdrm-2.4.39/tests/modeprint/Makefile.in b/tests/modeprint/Makefile.in similarity index 100% rename from libdrm-2.4.39/tests/modeprint/Makefile.in rename to tests/modeprint/Makefile.in diff --git a/libdrm-2.4.39/tests/modeprint/modeprint.c b/tests/modeprint/modeprint.c similarity index 100% rename from libdrm-2.4.39/tests/modeprint/modeprint.c rename to tests/modeprint/modeprint.c diff --git a/libdrm-2.4.39/tests/modetest/Makefile.am b/tests/modetest/Makefile.am similarity index 100% rename from libdrm-2.4.39/tests/modetest/Makefile.am rename to tests/modetest/Makefile.am diff --git a/libdrm-2.4.39/tests/modetest/Makefile.in b/tests/modetest/Makefile.in similarity index 100% rename from libdrm-2.4.39/tests/modetest/Makefile.in rename to tests/modetest/Makefile.in diff --git a/libdrm-2.4.39/tests/modetest/buffers.c b/tests/modetest/buffers.c similarity index 100% rename from libdrm-2.4.39/tests/modetest/buffers.c rename to tests/modetest/buffers.c diff --git a/libdrm-2.4.39/tests/modetest/buffers.h b/tests/modetest/buffers.h similarity index 100% rename from libdrm-2.4.39/tests/modetest/buffers.h rename to tests/modetest/buffers.h diff --git a/libdrm-2.4.39/tests/modetest/modetest.c b/tests/modetest/modetest.c similarity index 100% rename from libdrm-2.4.39/tests/modetest/modetest.c rename to tests/modetest/modetest.c diff --git a/libdrm-2.4.39/tests/name_from_fd.c b/tests/name_from_fd.c similarity index 100% rename from libdrm-2.4.39/tests/name_from_fd.c rename to tests/name_from_fd.c diff --git a/libdrm-2.4.39/tests/openclose.c b/tests/openclose.c similarity index 100% rename from libdrm-2.4.39/tests/openclose.c rename to tests/openclose.c diff --git a/libdrm-2.4.39/tests/radeon/Makefile.am b/tests/radeon/Makefile.am similarity index 100% rename from libdrm-2.4.39/tests/radeon/Makefile.am rename to tests/radeon/Makefile.am diff --git a/libdrm-2.4.39/tests/radeon/Makefile.in b/tests/radeon/Makefile.in similarity index 100% rename from libdrm-2.4.39/tests/radeon/Makefile.in rename to tests/radeon/Makefile.in diff --git a/libdrm-2.4.39/tests/radeon/list.h b/tests/radeon/list.h similarity index 100% rename from libdrm-2.4.39/tests/radeon/list.h rename to tests/radeon/list.h diff --git a/libdrm-2.4.39/tests/radeon/radeon_ttm.c b/tests/radeon/radeon_ttm.c similarity index 100% rename from libdrm-2.4.39/tests/radeon/radeon_ttm.c rename to tests/radeon/radeon_ttm.c diff --git a/libdrm-2.4.39/tests/radeon/rbo.c b/tests/radeon/rbo.c similarity index 100% rename from libdrm-2.4.39/tests/radeon/rbo.c rename to tests/radeon/rbo.c diff --git a/libdrm-2.4.39/tests/radeon/rbo.h b/tests/radeon/rbo.h similarity index 100% rename from libdrm-2.4.39/tests/radeon/rbo.h rename to tests/radeon/rbo.h diff --git a/libdrm-2.4.39/tests/setversion.c b/tests/setversion.c similarity index 100% rename from libdrm-2.4.39/tests/setversion.c rename to tests/setversion.c diff --git a/libdrm-2.4.39/tests/updatedraw.c b/tests/updatedraw.c similarity index 100% rename from libdrm-2.4.39/tests/updatedraw.c rename to tests/updatedraw.c diff --git a/libdrm-2.4.39/tests/vbltest/Makefile.am b/tests/vbltest/Makefile.am similarity index 100% rename from libdrm-2.4.39/tests/vbltest/Makefile.am rename to tests/vbltest/Makefile.am diff --git a/libdrm-2.4.39/tests/vbltest/Makefile.in b/tests/vbltest/Makefile.in similarity index 100% rename from libdrm-2.4.39/tests/vbltest/Makefile.in rename to tests/vbltest/Makefile.in diff --git a/libdrm-2.4.39/tests/vbltest/vbltest.c b/tests/vbltest/vbltest.c similarity index 100% rename from libdrm-2.4.39/tests/vbltest/vbltest.c rename to tests/vbltest/vbltest.c diff --git a/libdrm-2.4.39/xf86atomic.h b/xf86atomic.h similarity index 100% rename from libdrm-2.4.39/xf86atomic.h rename to xf86atomic.h diff --git a/libdrm-2.4.39/xf86drm.c b/xf86drm.c similarity index 100% rename from libdrm-2.4.39/xf86drm.c rename to xf86drm.c diff --git a/libdrm-2.4.39/xf86drm.h b/xf86drm.h similarity index 100% rename from libdrm-2.4.39/xf86drm.h rename to xf86drm.h diff --git a/libdrm-2.4.39/xf86drmHash.c b/xf86drmHash.c similarity index 100% rename from libdrm-2.4.39/xf86drmHash.c rename to xf86drmHash.c diff --git a/libdrm-2.4.39/xf86drmMode.c b/xf86drmMode.c similarity index 100% rename from libdrm-2.4.39/xf86drmMode.c rename to xf86drmMode.c diff --git a/libdrm-2.4.39/xf86drmMode.h b/xf86drmMode.h similarity index 100% rename from libdrm-2.4.39/xf86drmMode.h rename to xf86drmMode.h diff --git a/libdrm-2.4.39/xf86drmRandom.c b/xf86drmRandom.c similarity index 100% rename from libdrm-2.4.39/xf86drmRandom.c rename to xf86drmRandom.c diff --git a/libdrm-2.4.39/xf86drmSL.c b/xf86drmSL.c similarity index 100% rename from libdrm-2.4.39/xf86drmSL.c rename to xf86drmSL.c -- 2.7.4