aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'freedesktop/master' into aosp/masterJohn Stultz2018-04-131-24/+62
|\ | | | | | | | | | | | | This merges the freedesktop/master branch into aosp/master Change-Id: I3104d45924f67d37808154d04c15518394204478 Signed-off-by: John Stultz <john.stultz@linaro.org>
| * meson,configure: include config.h automaticallyEric Engestrom2018-03-201-0/+2
| | | | | | | | | | | | | | | | | | This will prevent any more missing `#include "config.h"` bug, at the cost of having to recompile some files that didn't need to be when changing build options. Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com> Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
| * meson,configure: always define UDEVEric Engestrom2018-03-201-0/+2
| | | | | | | | | | | | Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com> Reviewed-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
| * meson,configure: always define HAVE_VISIBILITYEric Engestrom2018-03-201-0/+2
| | | | | | | | | | | | Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com> Reviewed-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
| * meson,configure: always define HAVE_OPEN_MEMSTREAMEric Engestrom2018-03-201-1/+3
| | | | | | | | | | | | Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com> Reviewed-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
| * bump version for releaseRob Clark2018-03-051-1/+1
| | | | | | | | Signed-off-by: Rob Clark <robclark@freedesktop.org>
| * *-symbol-check: Don't hard-code nm executableHeiko Becker2018-02-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Helpful if your nm executable has a prefix based on the architecture, for example. Signed-off-by: Heiko Becker <heirecka@exherbo.org> Cc: Timo Gurr <timo.gurr@gmail.com> [Eric: v2: rebase and add Meson support] Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com> Reviewed-by: Eric Anholt <eric@anholt.net> Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
| * meson/configure.ac: pthread-stubs not present on OpenBSDJonathan Gray2018-02-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | pthread-stubs is no longer required on OpenBSD and has been removed. libpthread parts involved moved to libc. Signed-off-by: Jonathan Gray <jsg@jsg.id.au> Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com> [Eric: add meson equivalent] Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com> Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
| * configure.ac: bump version to 2.4.90Marek Olšák2018-02-161-1/+1
| |
| * meson,configure: turn undefined preprocessor tokens warnings into errorsEric Engestrom2018-01-311-1/+1
| | | | | | | | | | | | Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com> Reviewed-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
| * configure: always define HAVE_LIBDRM_ATOMIC_PRIMITIVES and HAVE_LIB_ATOMIC_OPSEric Engestrom2018-01-311-0/+4
| | | | | | | | | | | | | | | | Fixes #if undefined warnings Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com> Reviewed-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
| * meson,configure: add warning when using undefined preprocessor tokensEric Engestrom2018-01-311-1/+1
| | | | | | | | | | | | Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com> Reviewed-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
| * always define HAVE_VALGRINDEric Engestrom2018-01-291-0/+2
| | | | | | | | | | | | Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com> Reviewed-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
| * always define HAVE_CAIROEric Engestrom2018-01-291-0/+2
| | | | | | | | | | | | Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com> Reviewed-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
| * always define HAVE_FREEDRENO_KGSLEric Engestrom2018-01-291-0/+2
| | | | | | | | | | | | Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com> Reviewed-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
| * meson,configure: always define HAVE_{INTEL,VMWGFX,NOUVEAU,EXYNOS,VC4,RADEON}Eric Engestrom2018-01-291-0/+14
| | | | | | | | | | | | Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com> Reviewed-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
| * meson,configure: remove unused HAVE_ETNAVIV defineEric Engestrom2018-01-291-3/+0
| | | | | | | | | | | | Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com> Reviewed-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
| * meson,configure: remove unused HAVE_FREEDRENO defineEric Engestrom2018-01-291-3/+0
| | | | | | | | | | | | Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com> Reviewed-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
| * meson,configure: remove unused HAVE_TEGRA defineEric Engestrom2018-01-291-3/+0
| | | | | | | | | | | | Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com> Reviewed-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
| * meson,configure: remove unused HAVE_OMAP defineEric Engestrom2018-01-291-3/+0
| | | | | | | | | | | | Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com> Reviewed-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
| * configure: remove unused HAVE_INSTALL_TESTS defineEric Engestrom2018-01-291-3/+0
| | | | | | | | | | | | Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com> Reviewed-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
| * configure: remove unused HAVE_CUNIT defineEric Engestrom2018-01-291-2/+0
| | | | | | | | | | | | Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com> Reviewed-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
| * configure.ac: bump version for releaseDave Airlie2017-12-171-1/+1
| |
| * configure.ac: bump version for releaseMarek Olšák2017-11-031-1/+1
| |
| * configure.ac: bump version for releaseMarek Olšák2017-10-311-1/+1
| |
| * configure.ac: bump version for releaseMarek Olšák2017-10-301-1/+1
| |
| * configure.ac: bump version to 2.4.85Marek Olšák2017-10-201-1/+1
| |
| * configure.ac: bump version to 2.4.84Marek Olšák2017-10-121-1/+1
| |
| * configure.ac: Bump version to 2.4.83Daniel Stone2017-08-241-1/+1
| |
| * configure.ac: bump version for releaseLucas Stach2017-07-191-1/+1
| | | | | | | | Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
| * amdgpu: move asic id table to a separate fileXiaojie Yuan2017-06-121-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * Bump version to 2.4.81Marek Olšák2017-05-241-1/+1
| |
| * configure: Fix the <sys/sysmacros.h> checkAdam Jackson2017-05-041-0/+4
| | | | | | | | | | | | | | | | | | | | AC_HEADER_MAJOR only defines MAJOR_IN_SYSMACROS if major() is _not_ defined by <sys/types.h> alone. It is, but it warns, and that's ugly. To fix this, push -Werror into CFLAGS when invoking AC_HEADER_MAJOR so the warning makes the compilation test fail. Reviewed-by: Emil Velikov <emil.velilkov@collabora.com> Signed-off-by: Adam Jackson <ajax@redhat.com>
| * configure.ac: bump version for releaseChristian Gmeiner2017-04-141-1/+1
| | | | | | | | Signed-off-by: Christian Gmeiner <christian.gmeiner@gmail.com>
| * configure.ac: bump version for releaseMarek Olšák2017-04-081-1/+1
| |
| * configure.ac: bump version for releaseDaniel Stone2017-04-071-1/+1
| |
| * configure.ac: pthread-stubs is not a thing on GNU/kFreeBSDEmil Velikov2017-04-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | As mentioned on the xcb mailing list, the platform uses the GLIBC forwarding mechanism. https://lists.freedesktop.org/archives/xcb/2016-November/010896.html Reported-by: Andreas Boll <andreas.boll.dev@gmail.com> Signed-off-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com> Reviewed-by: Andreas Boll <andreas.boll.dev@gmail.com>
| * configure.ac: bump the version to 2.4.77Marek Olšák2017-04-041-1/+1
| |
| * configure.ac: bring back pthread-stubs checkEmil Velikov2017-04-031-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | Accidentally removed with earlier commit. Although rather than simply adding the check for all platforms, use the same heuristics as we do in mesa. Namely: pthread-stubs is a thing only for BSD platforms. Everyone else should have lightweight pthread API in their C runtime library. Fixes: 4ecd1ef010b ("xf86drm: fix null termination of string buffer") Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Eric Engestrom <eric@engestrom.ch>
| * configure.ac: bump version for releaseMarek Olšák2017-03-291-1/+1
| |
| * configure: Explicitly check for pkg-config at the top levelAdam Jackson2017-03-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | If you don't, then the first place the m4 expands is: if test "x$INTEL" != "xno"; then PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10]) fi So on non-Intel architectures we never find it in the path, and all subsequent PKG_CHECK_MODULESes fail. Boo autoconf. Signed-off-by: Adam Jackson <ajax@redhat.com>
* | Merge tag libdrm-2.4.75 into aosp/masterandroid-n-iot-preview-4Richard Yoo2017-05-091-25/+63
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Bump version for 2.4.75 releaseChad Versace2017-01-271-1/+1
| | | | | | | | | | | | For Intel explicit fencing. Signed-off-by: Chad Versace <chadversary@chromium.org>
| * Revert "Bump version for 2.4.75 release"Dave Airlie2017-01-271-1/+1
| | | | | | | | This reverts commit 736970c49beb9de7ab549f076069d52f4e7bc6f2.
| * Bump version for 2.4.75 releaseChad Versace2017-01-271-1/+1
| | | | | | | | | | | | For Intel explicit fencing. Signed-off-by: Chad Versace <chadversary@chromium.org>
| * xf86drm: fix null termination of string bufferTaro Yamada2017-01-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | The string written to the buffer by read() is not null-terminated, but currently drmParsePciBusInfo() places null character only at the end of the buffer, not at the end of the string. As a result, the string passed to sscanf() contains an uninitialized value. This patch changes to places null character at the end of the string. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=99045 Signed-off-by: Taro Yamada <archer_ame@yahoo.co.jp> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
| * configure: remove libudev checksEmil Velikov2016-12-051-7/+0
| | | | | | | | | | | | Library is no longer used. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
| * Bump version for releaseRobert Bragg2016-11-291-1/+1
| |
| * Bump version for releaseEmil Velikov2016-11-141-1/+1
| |
| * Bump version for releaseMatt Turner2016-11-141-1/+1
| |