summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* libdrm: Add rotation property fieldsandroid-wear-p-preview-2android-p-preview-3android-p-preview-2android-o-mr1-iot-release-1.0.1android-o-mr1-iot-release-1.0.0Sean Paul2018-05-021-0/+13
| | | | | | | | | | | | From drm_crtc.h, for use with the plane "rotation" property NOTE: These are legacy definitions for old code, similar DRM_MODE_* mask values are defined in the upstream code. Change-Id: I9240dede6a53817e6d8cedb31f6877312078b5ab Signed-off-by: Sean Paul <seanpaul@chromium.org> [jstultz: Added note about legacy definitions ] Signed-off-by: John Stultz <john.stultz@linaro.org>
* libdrm: amdgpu: Fix Android.bp build issuesJohn Stultz2018-05-012-0/+7
| | | | | | | Add missing files and required build time defines Change-Id: I4c417ebeef390f2e64c6b019954829cda93c0ec9 Signed-off-by: John Stultz <john.stultz@linaro.org>
* libdrm: amdgpu: Initialize unions with memset rather than "= {0}"John Stultz2018-05-011-2/+4
| | | | | | | | Clang complains when initializing unions using "= {0}" so instead use memset. Change-Id: Ib2fba6226ac4adfde7f0d271b3c953ac66cb84ee Signed-off-by: John Stultz <john.stultz@linaro.org>
* libdrm: Switch to Android.bp for omap driverJohn Stultz2018-05-013-13/+20
| | | | | | | | | The omap driver got missed in forward porting the change to the Android.bp make files, so fix that. Change-Id: I94dee0852f418090f861a0930c862512083a46ee Signed-off-by: John Stultz <john.stultz@linaro.org>
* libdrm: planetest/atomictest: Fix up build issue missed in rebasingJohn Stultz2018-04-303-26/+26
| | | | | | | | | | | | We dropped commit 5a6afa130317 (BACKPORT: libdrm: atomic mode set) when moving forward to upstream libdrm, as it should be redundent. Unfortunately, the API in that commit is slightly different upstream, and thus the planetest and atomictest tests needed some updates to use the upstream API Change-Id: I76cd52f12f6679792a0cedb529973e426932c98c Signed-off-by: John Stultz <john.stultz@linaro.org>
* Merge remote-tracking branch 'aosp/upstream-aosp-merge-fdo-master' into libdrmDmitry Shmidt2018-04-27206-2616/+9813
|\ | | | | | | Change-Id: Ifff1b65a81b838a6ab77c9f33eb5c3c514c250db
| * Android.bp: Add include exports for android dirJohn Stultz2018-04-131-1/+1
| | | | | | | | | | | | | | | | | | This forward ports Stefan Schake's patch 32ee9c0e0566 "android: Add missing include exports" to the Android.bp file. Change-Id: Ie07582b87ae3bda0d49073c524e5c0a394e614bb Signed-off-by: John Stultz <john.stultz@linaro.org>
| * Merge remote-tracking branch 'freedesktop/master' into aosp/masterJohn Stultz2018-04-13205-2615/+9812
|/| | | | | | | | | | | | | This merges the freedesktop/master branch into aosp/master Change-Id: I3104d45924f67d37808154d04c15518394204478 Signed-off-by: John Stultz <john.stultz@linaro.org>
| * libdrm: gralloc_handle.h: Fix build issue with AndroidJohn Stultz2018-04-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In trying to integrate the new gralloc_handle.h with the drm_hwcomposer, I started seeing the following compilation errors: In file included from external/drm_hwcomposer/platformdrmgeneric.cpp:28: external/libdrm/android/gralloc_handle.h:108:9: error: cannot initialize return object of type 'native_handle_t *' (aka 'native_handle *') with an lvalue of type 'struct gralloc_handle_t *' return handle; ^~~~~~ 1 error generated. This seems to be due to the gralloc_handle_create() definition needs to return a native_handle_t * type, rather then a gralloc_handle_t *, which is what the code actually returns. After talking w/ Rob Herring, having the code return the native handle should be the proper fix, so that is what this patch changes. Cc: Chih-Wei Huang <cwhuang@android-x86.org> Cc: Stefan Schake <stschake@gmail.com> Cc: Robert Foss <robert.foss@collabora.com> Cc: Sean Paul <seanpaul@google.com> Cc: Rob Herring <robh@kernel.org> Signed-off-by: John Stultz <john.stultz@linaro.org> Reviewed-by: Robert Foss <robert.foss@collabora.com>
| * headers: Update READMEDaniel Stone2018-03-301-5/+1
| | | | | | | | | | | | | | | | Nouveau has made a very deliberate choice to hide its actual kernel ABI behind libdrm. i915 is no longer out of date. Signed-off-by: Daniel Stone <daniels@collabora.com> Acked-by: Alex Deucher <alexander.deucher@amd.com>
| * headers: Sync with drm-nextDaniel Stone2018-03-308-26/+451
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Taken from the drm-next pull for 4.17-rc1 (694f54f680f7), and manually reconciled: core: - Dropped DRM_MODE_TYPE_ALL and DRM_MODE_FLAG_ALL; these are purely internal details of the bits accepted by the currently running kernel, and can not be generally relied on by userspace - Add HDCP flags - Note CTM entry representation is sign-magnitude format, not two's-complement amdgpu: - Add QUERY_STATE2 context op - Add VCN firmware version query etnaviv: - Add more GPU feature flags i915: - Add caps, params and ioctls for PMU / perf-stream - Add support for explicit fencing nouveau: - Add TILE_COMP layout vc4: - Add perfmon ioctls virtgpu: - Add capset-fix param vmware: - Add handle-close ioctl and explicit-fencing support Signed-off-by: Daniel Stone <daniels@collabora.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
| * headers: sync up amdgpu_drm.h with drm-nextRex Zhu2018-03-291-0/+4
| | | | | | | | | | | | | | | | | | Add sensor_info type AMDGPU_INFO_SENSOR_STABLE_PSTATE_GFX_MCLK AMDGPU_INFO_SENSOR_STABLE_PSTATE_GFX_SCLK Reviewed-by: Evan Quan <evan.quan@amd.com> Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
| * Revert "libdrm: intel/Android.mk: Filter libdrm_intel library requirements ↵Emil Velikov2018-03-281-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on x86/x86_64" This reverts commit ed07718ae7bab596297abf210bb0c37c6dba58ed. The commit added a guard since libpciaccess may be missing on some setups. As of last commit there are no traces of the project, from Android POV. Hence, we can revert this workaround - which caused similar breakage to the one it's trying to fix. This time in Mesa. Cc: Rob Herring <rob.herring@linaro.org> Acked-by: John Stultz <john.stultz@linaro.org>
| * intel: Do not use libpciaccess on AndroidTomasz Figa2018-03-282-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch makes the code not rely anymore on libpciaccess when compiled for Android to eliminate ioperm() and iopl() syscalls required by that library. As a side effect, the mappable aperture size is hardcoded to 64 MiB on Android, however nothing seems to rely on this value anyway, as checked be grepping relevant code in drm_gralloc and Mesa. Cc: Rob Herring <rob.herring@linaro.org> Signed-off-by: Tomasz Figa <tfiga@google.com> [Emil Velikov: rebase against master. add missing __func__, Eric] Signed-off-by: Emil Velikov <emil.velikov@collabora.com> Acked-by: John Stultz <john.stultz@linaro.org>
| * xf86drmMode: merge successive mutually-exclusive #ifsEric Engestrom2018-03-221-2/+1
| | | | | | | | | | | | Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com> Reviewed-by: Frank Binns <frank.binns@imgtec.com> Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
| * libdrm: Use readdir instead of readdir_r to avoid build warningsJohn Stultz2018-03-221-19/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Building libdrm under AOSP, we see the following build warning: external/libdrm/xf86drm.c:2861:12: warning: 'readdir_r' is deprecated: readdir_r is deprecated; use readdir instead [-Wdeprecated-declarations] while (readdir_r(sysdir, pent, &ent) == 0 && ent != NULL) { ^ Building on Linux with glibc produces the same warning. Thus, this patch replaces readdir_r with readdir. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=102031 Cc: Robert Foss <robert.foss@collabora.com> Cc: Rob Herring <robh@kernel.org> Cc: Stefan Schake <stschake@gmail.com> Cc: John Stultz <john.stultz@linaro.org> Signed-off-by: John Stultz <john.stultz@linaro.org> Reviewed-by: Emil Velikov <emil.velikov@collabora.com> [Emil Velikov: remove unused variables, Eric] Signed-off-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
| * android: Add missing include exportsStefan Schake2018-03-221-1/+3
| | | | | | | | | | | | | | | | They were set for the static library but not the shared variant. Signed-off-by: Stefan Schake <stschake@gmail.com> Acked-by: John Stultz <john.stultz@linaro.org> Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
| * omap: add Android build supportGowtham Tammana2018-03-221-0/+13
| | | | | | | | | | | | | | Add Android.mk file to build libdrm_omap library. Signed-off-by: Gowtham Tammana <g-tammana@ti.com> Signed-off-by: Andrew F. Davis <afd@ti.com>
| * libdrm: amdgpu: Adding DRM_RDWR flag in amdgpu_bo_exportSatyajit2018-03-221-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | Currently while exporting prime handle to fd read write access is not granted. mmap fails because of this. mmap was not supported on prime initially. Here is link to related discussion https://lists.freedesktop.org/archives/dri-devel/2017-February/131840.html Adding the DRM_RDWR flag in amdgpu_bo_export to support mmap. Signed-off-by: Satyajit <satyajit.sahu@amd.com> Acked-by: Christian König <christian.koenig@amd.com>
| * meson: drop unnecessary variableEric Engestrom2018-03-201-2/+1
| | | | | | | | | | Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com> Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
| * meson: move line to allow using `config` earlierEric Engestrom2018-03-201-2/+2
| | | | | | | | | | Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com> Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
| * meson: drop unneeded dependency to libudevEric Engestrom2018-03-201-7/+1
| | | | | | | | | | | | | | | | libdrm only needed libudev for a few days 3 years ago, between fde4969176822fe54197 and its revert 5b0e76f143887c4ec7db. Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com> Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
| * meson,configure: include config.h automaticallyEric Engestrom2018-03-2096-370/+3
| | | | | | | | | | | | | | | | | | 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: replace `if(compiles) have=true` with `have=compiles`Eric Engestrom2018-03-201-3/+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 UDEVEric Engestrom2018-03-203-5/+7
| | | | | | | | | | | | 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-203-5/+6
| | | | | | | | | | | | 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-203-6/+6
| | | | | | | | | | | | Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com> Reviewed-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
| * tests: fix memory leak issueInki Dae2018-03-201-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | Fixed memory leak issue to drmModeRes and drmModePlaneRes objects. These objects were allocated by drmModeGetResources and drmModeGetPlaneResources functions but not freed properly. So this patch frees them by calling drmModeFreeResources drmModeFreePlaneResources functions at failure case. Signed-off-by: Inki Dae <inki.dae@samsung.com> Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
| * libdrm: intel/Android.mk: Filter libdrm_intel library requirements on x86/x86_64John Stultz2018-03-181-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When building AOSP after updating libdrm project to the freedesktop/master branch, I've seen the following build errors: external/libdrm/intel/Android.mk: error: libdrm_intel (SHARED_LIBRARIES android-arm64) missing libpciaccess (SHARED_LIBRARIES android-arm64) You can set ALLOW_MISSING_DEPENDENCIES=true in your environment if this is intentional, but that may defer real problems until later in the build. Using ALLOW_MISSING_DEPENDENCIES=true when building allows things to function properly, but is not ideal. So basically, while I'm not including the libdrm_intel package into the build, just the fact that the Android.mk file references libpciaccess which isn't a repo included in AOSP causes the build failure. So it seems we need some sort of conditional filter in the Android.mk to skip over it if we're not building for intel. Cc: Chad Versace <chad.versace@linux.intel.com> Cc: Marissa Wall <marissaw@google.com> Cc: Sean Paul <seanpaul@google.com> Cc: Dan Willemsen <dwillemsen@google.com> Cc: Tomasz Figa <tfiga@google.com> Cc: Robert Foss <robert.foss@collabora.com> Reviewed-by: Emil Velikov <emil.velikov@collabora.com> Signed-off-by: John Stultz <john.stultz@linaro.org> Signed-off-by: Rob Herring <robh@kernel.org>
| * tests/exynos: remove dead conditionSeung-Woo Kim2018-03-151-7/+0
| | | | | | | | | | | | | | | | There is already condition checking input values between 2 and 4096 so condition checking 0 is always false. Remove the dead condition. Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com> Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
| * meson: detect alloca.hEric Engestrom2018-03-141-1/+1
| | | | | | | | | | | | | | amdgpu makes use of it Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com> Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
| * meson: make it easy to add headers to checkEric Engestrom2018-03-141-6/+5
| | | | | | | | | | Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com> Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
| * meson: don't use compiler.has_headerDylan Baker2018-03-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Meson's compiler.has_header is completely useless, it only checks that a header exists, not whether it's usable. This creates problems if a header contains a conditional #error declaration, like so: > #if __x86_64__ > # error "Doesn't work with x86_64!" > #endif Compiler.has_header will return true in this case, even when compiling for x86_64. This is useless. Instead, we'll do a compile check so that any #error declarations will be treated as errors, and compilation will work. Fixes compilation on x32 architecture. Gentoo Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=649746 meson bug: https://github.com/mesonbuild/meson/issues/2246 CC: Matt Turner <mattst88@gmail.com> Signed-off-by: Dylan Baker <dylan.c.baker@intel.com> Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
| * meson: use pkg-config to detect libatomic_opsEric Engestrom2018-03-099-9/+11
| | | | | | | | | | Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com> Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
| * drm/amdgpu: Remove IB count checkingSabre Shao2018-03-081-2/+0
| | | | | | | | | | Signed-off-by: Sabre Shao <Sabre.Shao@amd.com> Reviewed-by: Marek Olšák <marek.olsak@amd.com>
| * Revert "amdgpu:support 16 ibs per submit for PAL/SRIOV"Marek Olšák2018-03-081-1/+1
| | | | | | | | | | | | This reverts commit 924f856a9047b87e8bfdc2867f7fe484e3f71343. Wrong patch.
| * amdgpu:support 16 ibs per submit for PAL/SRIOVQiang Yu2018-03-081-1/+1
| | | | | | | | | | | | | | | | | | to support SRIOV and MCBP, need 16 IBs per submit Signed-off-by: Qiang Yu <Qiang.Yu@amd.com> Reviewed-by: Junwei Zhang <Jerry.Zhang@amd.com> Acked-by: Christian König <christian.koenig@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
| * freedreno: add missing symbols to symbol-checkEric Engestrom2018-03-081-0/+2
| | | | | | | | | | | | | | Fixes: 1384c081233751569473 "freedreno: add interface to get buffer address" Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com> Reviewed-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Christian Gmeiner <christian.gmeiner@gmail.com>
| * drm/atomic: Refuse to add invalid objects to requestsDaniel Stone2018-03-071-0/+3
| | | | | | | | | | | | | | | | Object and property IDs cannot be zero. Prevent them from being added to the request stream at all, rather than breaking at commit time. Signed-off-by: Daniel Stone <daniels@collabora.com> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
| * intel/intel_chipset.h: Sync Cannonlake IDs.Rodrigo Vivi2018-03-051-24/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Let's sync CNL ids with Spec and kernel. Sync with kernel commit '3f43031b1693 ("drm/i915/cnl: Add Cannonlake PCI IDs for another SKU.")' and commit 'e3890d05b342 ("drm/i915/cnl: Sync PCI ID with Spec.")' Cc: James Ausmus <james.ausmus@intel.com> Cc: Lucas De Marchi <lucas.demarchi@intel.com> Cc: Paulo Zanoni <paulo.r.zanoni@intel.com> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> Reviewed-by: Rafael Antognolli <rafael.antognolli@intel.com>
| * bump version for releaseRob Clark2018-03-052-2/+2
| | | | | | | | Signed-off-by: Rob Clark <robclark@freedesktop.org>
| * meson: add configuration summaryEric Engestrom2018-03-051-0/+17
| | | | | | | | | | | | The message block printed is the same as the one in configure.ac Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com>
| * tests/amdgpu: Fix misspellings of "suite"Michel Dänzer2018-03-022-12/+12
| | | | | | | | Acked-by: Christian König <christian.koenig@amd.com>
| * test/amdgpu: disable bo eviction test by defaultChunming Zhou2018-03-011-0/+2
| | | | | | | | | | | | | | | | | | | | | | if some system has no swap space and memory is less, than the test could fail. And bo eviction test takes much more time in some system, which effects automation test result and efficiency. So disable it by default now, only be used by developer manually. Signed-off-by: Chunming Zhou <david1.zhou@amd.com> Acked-by: Christian König <christian.koenig@amd.com>
| * amdgpu: fix "add AMDGPU_VA_RANGE_HIGH"Christian König2018-02-281-2/+2
| | | | | | | | | | | | | | | | | | The range is stored as exclusive, not inclusive. Subtracts one to get the inclusive interval for the calculation. This fixes crashes when 32bit addresses are in use. Signed-off-by: Christian König <christian.koenig@amd.com> Reviewed-and-Tested-by: Michel Dänzer <michel.daenzer@amd.com>
| * amdgpu: add AMDGPU_VA_RANGE_HIGHChristian König2018-02-284-8/+24
| | | | | | | | | | | | | | Return high addresses if requested and available. Signed-off-by: Christian König <christian.koenig@amd.com> Reviewed-by: Marek Olšák <marek.olsak@amd.com>
| * amdgpu: mostly revert "use the high VA range if possible v2"Christian König2018-02-282-14/+20
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 07ea20d5beb24315b721adf83bbfa72ce016e146. Unfortunately it turned out that this change broke some corner cases in Mesa. Revert it for now, but keep the high range in separate VA managers. Signed-off-by: Christian König <christian.koenig@amd.com> Reviewed-by: Marek Olšák <marek.olsak@amd.com>
| * freedreno: add interface to get buffer addressRob Clark2018-02-264-0/+27
| | | | | | | | | | | | | | | | | | | | | | Needed for clover/OpenCL. Fortunately the kernel interface is already in place. Include a stub _put_iova() so mesa can tell us when it no longer needs the buffer to be pinned. There is no kernel interface for this (yet), but at least if we want to unpin buffers we won't need mesa changes. Signed-off-by: Rob Clark <robclark@freedesktop.org>
| * *-symbol-check: Don't hard-code nm executableHeiko Becker2018-02-2320-9/+22
| | | | | | | | | | | | | | | | | | | | | | | | 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>
| * android: fix gralloc_handle_create() problemsRob Herring2018-02-201-18/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's a number of problems with gralloc_handle_create starting with it doesn't even compile. More importantly, it doesn't really create (i.e. allocate) a handle. It allocates a native_handle_t, copies it to a struct gralloc_handle_t on the stack and returns the struct (not a ptr). So the caller still has to allocate a struct gralloc_handle_t to hold the returned struct. Rework gralloc_handle_create() to allocate a new handle and return the pointer to the allocated handle. Callers should free the handle with native_handle_close() and native_handle_delete(). In the interest of making gralloc_handle_t opaque, return a native_handle_t ptr instead. Reviewed-by: Robert Foss <robert.foss@collabora.com> Signed-off-by: Rob Herring <robh@kernel.org>