aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'freedesktop/master' into aosp/masterJohn Stultz2018-04-131-1/+32
|\ | | | | | | | | | | | | This merges the freedesktop/master branch into aosp/master Change-Id: I3104d45924f67d37808154d04c15518394204478 Signed-off-by: John Stultz <john.stultz@linaro.org>
| * autotools: Include meson.build files in tarballDylan Baker2018-01-121-1/+31
| | | | | | | | | | Signed-off-by: Dylan Baker <dylan.c.baker@intel.com> Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
| * amdgpu: move asic id table to a separate fileXiaojie Yuan2017-06-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | v2: fix an off by one error and leading white spaces v3: use thread safe strtok_r(); initialize len before calling getline(); change printf() to drmMsg(); add initial amdgpu.ids v4: integrate some recent internal changes, including format changes v5: fix line number for empty/commented lines; realloc to save memory; indentation changes v6: remove a line error v7: [Michel Dänzer] * Move amdgpu.ids to new data directory * Remove placeholder entries from amdgpu.ids * Set libdrmdatadir variable in configure.ac instead of Makefile.am [Emil Velikov] * Use isblank() instead of open-coding it [Emil Velikov] * Don't leak asic_id_table memory if realloc fails [Emil Velikov] * Check and bump table_max_size at the beginning of the while loop [Emil Velikov] * Initialize table_max_size to the number of entries in data/amdgpu.ids v8: [Michel Dänzer] * Make sure amdgpu_asic_id.c gets rebuilt when amdgpu.ids changes Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com> Signed-off-by: Samuel Li <Samuel.Li@amd.com>
* | Merge tag libdrm-2.4.75 into aosp/masterandroid-n-iot-preview-4Richard Yoo2017-05-091-2/+14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Below is a brief summary of patches pulled in: 0da99b8a (m/master, aosp/master) Move libdrm.so to vendor partition d4b83443 (tag: libdrm-2.4.75) Bump version for 2.4.75 release dae413e4 (tag: libdrm-2.4.74) Bump version for release 317bdff1 (tag: libdrm-2.4.73) Bump version for release 8cf43127 (tag: libdrm-2.4.72) Bump version for release a44c9c31 (tag: libdrm-2.4.71) Bump version for release 20208455 (tag: android-o-preview-1, tag: android-n-mr2-preview-2, tag: android-n-mr2-preview-1, aosp/sdk-release, aosp/o-preview) add a flag control that private libdrm can be chosen Bug: 35871718 Test: aosp_arm-eng compiles Change-Id: I81985fd41d5c0d8a732705dc2a4bee8eb5d459bb
| * automake: make the build less chattyEmil Velikov2016-11-221-0/+1
| | | | | | | | | | | | | | | | | | | | Having the "Entering|Leaving directory X" messages it not required nor useful in vast majority of the cases. One can always have them printed by `make -w' or by overriding the AM_MAKEFLAGS variable. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
| * headers: Add README fileEmil Velikov2016-11-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we're trying to standardise and make things more consistent in the area, add a basic README which covers some of the more popular topics. v2: - Drop drm-misc (Daniel Vetter) v3: - Elaborate on when and which headers to update - Add a list of headers and the respective "issues" - Add file to EXTRA_DIST Cc: Dave Airlie <airlied@redhat.com> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> (v1) Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
| * libdrm: add etnaviv drm supportThe etnaviv authors2016-09-171-0/+6
| | | | | | | | | | | | | | | | | | Add the libdrm_etnaviv helper library to encapsulate etnaviv-specific interfaces to the DRM. Signed-off-by: Christian Gmeiner <christian.gmeiner@gmail.com> Signed-off-by: Lucas Stach <l.stach@pengutronix.de> Tested-by: Rob Herring <robh@kernel.org>
| * automake: Don't include Android Makefiles in the release tarballAndreas Boll2016-07-231-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently only some Android Makefiles are included in the release tarball. To be more consistent one could either add the remaining files or don't ship Android Makefiles altogether. According to Emil the Android folk doesn't use our release tarballs. Thus it makes sense to remove those files from distribution which also means less work for maintenance in the future. Suggested-by: Emil Velikov <emil.l.velikov@gmail.com> Signed-off-by: Andreas Boll <andreas.boll.dev@gmail.com> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
| * vc4: Add headers and .pc files for VC4 userspace development.Eric Anholt2016-02-031-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The headers were originally written in Mesa, imported to the kernel, and improved upon in vc4-gpu-tools. These come from the v-g-t copies and will replace the Mesa and v-g-t copies, and hopefully be used from new tests in igt, as well. v2: Fix linking against libdrm_intel instead of libdrm. v3: Drop Libs and Cflags since they'll be inherited from libdrm. v4: Switch to Requires.private. I was wrong about standard practice, apparently only Intel was doing plain Requires (sorry to all involved). Signed-off-by: Eric Anholt <eric@anholt.net>
* | Merge tag 'tags/libdrm-2.4.66' into masterSean Paul2016-02-031-2/+44
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tag libdrm-2.4.66 from git://anongit.freedesktop.org/mesa/drm Signed-off-by: Sean Paul <seanpaul@chromium.org> Conflicts: Android.mk Makefile.am configure.ac freedreno/Android.mk include/drm/drm_mode.h intel/Android.mk libkms/Android.mk nouveau/Android.mk radeon/Android.mk tegra/tegra.c tests/Makefile.am xf86drmMode.c xf86drmMode.h Change-Id: I3186bde7f196d2f3438c4334591ee2a0c1371c96
| * automake: set --enable-valgrind during make distcheckEmil Velikov2015-09-211-1/+2
| | | | | | | | Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
| * Move -lm link flag to LIBADDEmil Velikov2015-08-241-2/+2
| | | | | | | | Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
| * drm: Add -lm to libdrm ldflags to fix build failure.Jérôme Glisse2015-08-241-1/+1
| | | | | | | | | | | | | | | | Last commit (b556ea127e004b734b2a7bf8e67cdcf56312171d) introduced use of log2 which require -lm flag for the linker on quite few distribution. Just add that flag to fix build. Signed-off-by: Jérôme Glisse <jglisse@redhat.com>
| * Force enable amdgpu for the dist build/check.Emil Velikov2015-08-131-0/+1
| | | | | | | | | | | | | | Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com> Reviewed-by: Jammy Zhou <Jammy.Zhou@amd.com>
| * drm: add libdrm_amdgpu (v7)Alex Deucher2015-08-051-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the new ioctl wrapper used by the new admgpu driver. It's primarily used by xf86-video-amdgpu and mesa. v2: fix amdgpu_drm.h install v3: Integrate some of the sugestions from Emil: clean up Makefile.am, configure.ac capitalize header guards fix _FILE_OFFSET_BITS with config.h use drm_mmap/drm_munmap Remove unused ARRAY_SIZE macro use shared list implementation use shared math implementation use drmGetNodeTypeFromFd helper v4: remove unused tiling defines v5: include amdgpu.h in Makefile.am v6: update amdgpu_drm.h v7: libdrm.h -> libdrm_macros.h Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
| * Revert "Add device enumeration interface (v4)"Emil Velikov2015-06-291-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit fde4969176822fe54197b6baa78f8b0ef900baba. The commit adds an API that does not seem flexible enough to be used in current open-source projects. Additionally it adds a hidden dependency of libudev, which when used in mesa caused grief when combined with Steam('s runtime). Let's revert this for now and add a tweaked API later on that can be used in mesa/xserver. Cc: Frank Min <frank.min@amd.com> Cc: Christian König <christian.koenig@amd.com> Cc: Alex Deucher <alexander.deucher@amd.com> Cc: Jammy Zhou <Jammy.Zhou@amd.com>
| * Add device enumeration interface (v4)frank2015-05-261-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | Add an interface for enumerating PCI devices on a system. v3: switch to udev/sysfs for the enumeration v4: fix warnings Signed-off-by: Frank Min <frank.min@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Jammy Zhou <Jammy.Zhou@amd.com>
| * man: rework the Makefile.amEmil Velikov2015-04-281-1/+7
| | | | | | | | | | | | | | | | | | | | | | Remove GNU make specific constructs and take into consideration that Solaris man 7 is not the same as Linux man 7. This commit introduces a dependency of xorg-macros 1.12 (released 4+ years ago) which is used to handle the above man section discrepancies. Cc: Niveditha Rau <niveditha.rau@oracle.com> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
| * automake: wrap an insanely long lineEmil Velikov2015-03-101-1/+12
| | | | | | | | Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
| * autotools: add WARN_CFLAGS to all targetsEmil Velikov2015-02-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... minus test/ttmtest. The latter is not really hooked up with the actual build. This will give us 66 warnings on a distribution build of which - 12 -Wunused-variable - 11 -Wunused-function - 19 -Wmissing-prototypes and a few -Wswitch-enum, -Wtype-limits etc. Adding the CFLAGS gives some exposure to these so that we can fix them. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Jan Vesely <jan.vesely@rutgers.edu>
| * autotools: add AM_DISTCHECK_CONFIGURE_FLAGSEmil Velikov2015-02-271-0/+16
| | | | | | | | | | | | | | | | | | To make sure that the release/distribution tarball is not broken for all the targets. Currently the experimental APIs are disabled by default amongst others. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Jan Vesely <jan.vesely@rutgers.edu>
* | rockchip: Add rockchip drm APIyzq2015-06-041-1/+5
|/ | | | | | | | This patch adds rockchip libdrm API to provide helpers for BO management on systems using Rockchip DRM. Change-Id: I2abe6434a1aad8ecf63930119b1a2adf3181d9fe Signed-off-by: Tomasz Figa <tfiga@google.com>
* libdrm: Add NVIDIA Tegra supportThierry Reding2014-11-271-1/+5
| | | | | | | | | | | | Add the libdrm_tegra helper library to encapsulate Tegra-specific interfaces to the DRM. Furthermore, Tegra is added to the list of supported chips in the modetest and vbltest programs. Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de> Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com> Signed-off-by: Thierry Reding <treding@nvidia.com>
* automake: pick up all files for distribution.Emil Velikov2014-09-281-1/+1
| | | | | | | | Autotools is already smart enough to pick the *.pc.in files but it needs some help with the Android.mk ones. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
* automake: fix 'make commit-headers'Emil Velikov2014-09-281-2/+2
| | | | | | | | Not too long ago the in-kernel drm public headers were moved. Since then we could no longer fetch/update the ones in libdrm using the command. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
* Remove i810_drm.h and i830_drm.h from the distribution tarballEmil Velikov2014-09-281-1/+1
| | | | | | | | | | | | | | | | Both of these headers are not installed since they were imported. They are not even used internally. The latter no longer exist in the kernel... Note the * symbol in EXTRA_DIST causes 'make distcheck' to fail. When was the last time we ran it ? Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> Cc: Damien Lespiau <damien.lespiau@intel.com> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Jakob Bornecrantz <jakob@vmware.com> Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
* automake: remove obsolete makefilesEmil Velikov2014-09-281-1/+9
| | | | | | | | Rather than having two extra makefiles in order to ship ~10 headers just fold its 5 lines of code into the top one makefile. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
* libdrm, freedreno, intel, nouveau, radeon: add Makefile.sourcesEmil Velikov2014-09-011-10/+4
| | | | | | | | | | | Will be used to consolidate the required sources lists as well as the install-able headers. This is turn will help us to avoid the duplication with the upcoming Android build support. v2: Rename the headers variable to *_H_FILES. v3: Rebase on top of symbol visibility patches. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
* configure: Support symbol visibility when availableThierry Reding2014-07-301-0/+1
| | | | | | | | | | | | | Checks whether or not the compiler supports the -fvisibility option. If so it sets the VISIBILITY_CFLAGS variable which can be added to the per directory AM_CFLAGS where appropriate. By default all symbols will be hidden via the VISIBILITY_CFLAGS. The drm_public macro can be used to mark symbols that should be exported. Reviewed-by: Maarten Lankhorst <maarten.lankhorst@canonical.com> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com> Signed-off-by: Thierry Reding <treding@nvidia.com>
* drm: Initialize or valgrind-clear modesetting ioctl arguments.Eric Anholt2014-01-201-0/+2
| | | | | | | | Fixes valgrind complaints in the modesetting driver. I tried to follow each ioctl's pattern for whether it was initializing just the in values, or both in and out values. Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
* freedreno: add freedreno DRMRob Clark2013-02-141-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The libdrm_freedreno helper layer for use by xf86-video-freedreno, fdre (freedreno r/e library and tests for driving gpu), and eventual gallium driver for the Adreno GPU. This uses the msm gpu driver from QCOM's android kernel tree. Note that current msm kernel driver is a bit strange. It provides a DRM interface for GEM, which is basically sufficient to have DRI2 working. But it does not provide KMS. And interface to 2d and 3d cores is via different other devices (/dev/kgsl-*). This is not quite how I'd write a DRM driver, but at this stage it is useful for xf86-video-freedreno and fdre (and eventual gallium driver) to be able to work on existing kernel driver from QCOM, to allow to capture cmdstream dumps from the binary blob drivers without having to reboot. So libdrm_freedreno attempts to hide most of the crazy. The intention is that when there is a proper kernel driver, it will be mostly just changes in libdrm_freedreno to adapt the gallium driver and xf86-video-freedreno (ignoring the fbdev->KMS changes). So don't look at freedreno as an example of how to write a libdrm module or a DRM driver.. it is just an attempt to paper over a non- standard kernel driver architecture. v1: original v2: hold ref's to pending bo's (because qcom's kernel driver doesn't), various bug fixes, add ringbuffer markers so we can emit IB's to portion of ringbuffer (so that gallium driver can use a single ringbuffer for both tile cmds and draw cmds. Signed-off-by: Rob Clark <robclark@freedesktop.org>
* libdrm: remove DISTCHECK_CONFIGURE_FLAGSMaarten Lankhorst2013-02-051-2/+0
| | | | | | | | I'm fairly sure the extra flags it specifies no longer exist, so there is no point in keeping it. It only adds a warning when running make distcheck. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
* man: fix manpage build instructionsDavid Herrmann2013-01-161-1/+1
| | | | | | | | | | | | This fixes all the out-of-tree build-failures with manpages and uses a .man_fixup file to avoid overriding man-pages on every build. Manpages are only built if xsltproc is found and the stylesheets are available locally. You can disable building manpages with --disable-manpages so the quite expensive xsltproc procedure can be skipped. Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
* man: disable man page building until David saves us allJesse Barnes2013-01-091-1/+1
| | | | | | I must have botched something in the push of the xml switchover, since I now get errors when building the pages and aliases. Just disable for now.
* libdrm: man page infrastructure and a few sample man pagesJesse Barnes2012-09-171-1/+1
|
* libdrm: add exynos drm supportInki Dae2012-05-121-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | this patch adds libdrm_exynos helper layer that inclues some intefaces for exynos specific gem and virtual display driver and also adds exynos module name to modtest and vbltest. Changelog v2: - fixed exynos broken ioctl. the pointer of uint64_t *edid should be removed. - removed unnecessary definitions. - added drm prime interfaces. this feature is used to share a buffer between drivers or memory managers and for this, please, refer to below links: http://www.mjmwired.net/kernel/Documentation/dma-buf-sharing.txt http://lwn.net/Articles/488664/ this patch is based on a link below: git://anongit.freedesktop.org/mesa/drm commit id: d72a44c7c4f5eea9c1e5bb0c36cb9e0224b9ca22 Reviewed-by: Rob Clark <rob@ti.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Inki Dae <inki.dae@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Rob Clark <rob@ti.com>
* omap: add omapdrm supportRob Clark2012-03-281-1/+5
| | | | | | | | | | This adds libdrm_omap helper layer (as used by xf86-video-omap, omapdrmtest, etc). Signed-off-by: Rob Clark <rob@ti.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> [danvet: pushed for Rob, he doesn't yet have commit access.] Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
* build: Update autotools configurationJavier Jardón2011-03-211-1/+1
| | | | | Replace some deprecated autoconf macros and use the new libtool syntax
* libdrm: Move intel_atomic.h to libdrm core for sharing.Pauli Nieminen2010-03-171-0/+1
| | | | | | | | intel_atomic.h includes very usefull atomic operations for lock free parrallel access of variables. Moving these to core libdrm for code sharing with radeon. Signed-off-by: Pauli Nieminen <suokkos@gmail.com>
* libkms: Add libkmsJakob Bornecrantz2009-12-041-1/+5
|
* Enable experimental APIs for distcheckKristian Høgsberg2009-12-031-0/+2
|
* Install kernel headers in ${includedir}/drmKristian Høgsberg2009-11-201-1/+1
|
* Drop stale TODO and unused ChangeLogKristian Høgsberg2009-11-171-1/+1
|
* Move libdrm/ up one levelKristian Høgsberg2009-11-171-2/+33
|
* Use headers copied from kernel instead of shared-coreKristian Høgsberg2009-11-171-4/+1
|
* Copy headers from kernel v2.6.32-rc6-130-g5b8f0beKristian Høgsberg2009-11-171-1/+1
|
* Add makefile rule to copy headers from kernel treeKristian Høgsberg2009-11-171-0/+7
|
* Only install libdrm_intel.pc if we build libdrm_intelJulien Cristau2009-11-051-2/+2
|
* Add libdrm_intel.pc by popular demand.Eric Anholt2009-02-231-2/+2
|
* Add some trivial regression tests, one of which fails.Eric Anholt2007-07-191-1/+1
|