aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* libdrm: Add rotation property fieldsSean 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>
* Merge remote-tracking branch 'freedesktop/master' into aosp/masterJohn Stultz2018-04-1319-404/+1673
|\ | | | | | | | | | | | | This merges the freedesktop/master branch into aosp/master Change-Id: I3104d45924f67d37808154d04c15518394204478 Signed-off-by: John Stultz <john.stultz@linaro.org>
| * 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-307-26/+444
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * drm/tegra: Sanitize format modifiersThierry Reding2018-02-191-17/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The existing format modifier definitions were merged prematurely, and recent work has unveiled that the definitions are suboptimal in several ways: - The format specifiers, except for one, are not Tegra specific, but the names don't reflect that. - The number space is split into two, reserving 32 bits for some "parameter" which most of the modifiers are not going to have. - Symbolic names for the modifiers are not using the standard DRM_FORMAT_MOD_* prefix, which makes them awkward to use. - The vendor prefix NV is somewhat ambiguous. Fortunately, nobody's started using these modifiers, so we can still fix the above issues. Do so by using the standard prefix. Also, remove TEGRA from the name of those modifiers that exist on NVIDIA GPUs as well. In case of the block linear modifiers, make the "parameter" smaller (4 bits, though only 6 values are valid) and don't let that leak into any of the other modifiers. Finally, also use the more canonical NVIDIA instead of the ambiguous NV prefix. This is based on commit 5843f4e02fbe86a59981e35adc6cabebee46fdc0 from Linux v4.16-rc1 and also updates modetest to use the new defines. Acked-by: Emil Velikov <emil.velikov@collabora.com> Signed-off-by: Thierry Reding <treding@nvidia.com>
| * drm/fourcc: Fix fourcc_mod_code() definitionThierry Reding2018-02-191-1/+1
| | | | | | | | | | | | | | | | | | | | Avoid compiler warnings when the val parameter is an expression. This is based on commit 5843f4e02fbe86a59981e35adc6cabebee46fdc0 from Linux v4.16-rc1. Acked-by: Emil Velikov <emil.velikov@collabora.com> Signed-off-by: Thierry Reding <treding@nvidia.com>
| * headers: sync up amdgpu_drm.h with drm-nextChristian König2018-01-091-0/+4
| | | | | | | | | | | | | | Sync up amdgpu changes from drm-next. Signed-off-by: Christian König <christian.koenig@amd.com> Reviewed-by: Marek Olšák <marek.olsak@amd.com>
| * headers: Drop outdated node about a delta in drm_mode.h.Eric Anholt2017-11-101-5/+0
| | | | | | | | | | | | | | Fixed in 9433b702fc16 ("headers: Sync drm{,_mode}.h with the kernel") Signed-off-by: Eric Anholt <eric@anholt.net> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
| * headers: Sync up kernel changes to use kernel types instead of stdint.h.Eric Anholt2017-11-104-149/+144
| | | | | | | | | | | | | | | | | | This pulls in pieces of drm-next d65d31388a23 ("Merge tag 'drm-misc-next-fixes-2017-11-07' of git://anongit.freedesktop.org/drm/drm-misc into drm-next") Signed-off-by: Eric Anholt <eric@anholt.net> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
| * headers: Sync up mga_drm.h from drm-next.Eric Anholt2017-11-102-5/+1
| | | | | | | | | | | | | | The kernel started using the struct from drm.h instead of the typedef. Signed-off-by: Eric Anholt <eric@anholt.net> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
| * headers: Sync up some comment spelling and whitespace fixes from drm-next.Eric Anholt2017-11-103-7/+7
| | | | | | | | | | | | | | | | | | This pulls in pieces of drm-next d65d31388a23 ("Merge tag 'drm-misc-next-fixes-2017-11-07' of git://anongit.freedesktop.org/drm/drm-misc into drm-next") Signed-off-by: Eric Anholt <eric@anholt.net> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
| * headers: Sync up some header guard changes from drm-next.Eric Anholt2017-11-1010-7/+84
| | | | | | | | | | | | | | | | | | This pulls in pieces of drm-next d65d31388a23 ("Merge tag 'drm-misc-next-fixes-2017-11-07' of git://anongit.freedesktop.org/drm/drm-misc into drm-next") Signed-off-by: Eric Anholt <eric@anholt.net> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
| * headers: Sync vc4 header from drm-next.Eric Anholt2017-11-101-3/+44
| | | | | | | | | | | | | | | | | | This updates the header with the contents from drm-next d65d31388a23 ("Merge tag 'drm-misc-next-fixes-2017-11-07' of git://anongit.freedesktop.org/drm/drm-misc into drm-next") Signed-off-by: Eric Anholt <eric@anholt.net> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
| * Revert "amdgpu: use the high VA range if possible"Christian König2017-11-091-4/+0
| | | | | | | | | | | | | | | | This reverts commit 6c0ea4b0c5452bfc1e67b74ce723696ef3c80b25. Accidentially pushed an incomplete patch. Signed-off-by: Christian König <christian.koenig@amd.com>
| * amdgpu: use the high VA range if possibleChristian König2017-11-081-0/+4
| | | | | | | | | | | | This frees up the low range for HMM. Signed-off-by: Christian König <christian.koenig@amd.com>
| * drm: sync drm headers from drm-next.Dave Airlie2017-10-252-9/+124
| | | | | | | | | | | | | | This updates the headers with the contents in drm-next at 62884cd386b876638720ef88374b31a84ca7ee5f This adds leasing and aspect ratio.
| * amdgpu: add padding to the fence to handle ioctlMarek Olšák2017-10-201-0/+1
| | | | | | | | copied from Dave's kernel patch.
| * headers: Sync amdgpu_drm.h with drm-nextAndres Rodriguez2017-10-201-1/+30
| | | | | | | | | | | | | | | | | | Generated using make headers_install from: airlied/drm-next 282dc83 Merge tag 'drm-intel-next-2017-10-12' ... Signed-off-by: Andres Rodriguez <andresx7@gmail.com> Acked-by: Dave Airlie <airlied@redhat.com> Acked-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
| * include: sync drm.h and amdgpu_drm.h with airlied/drm-nextMarek Olšák2017-10-121-0/+21
| |
| * headers: sync syncobj ioctl defines.Dave Airlie2017-10-101-0/+22
| | | | | | | | | | | | | | This syncs the drm.h header with my drm-next branch as of bb7a9c8d712f37385a706a594d6edf6e6d2669d0 Signed-off-by: Dave Airlie <airlied@redhat.com>
| * headers: sync DRM_MODE_ROTATE/REFLECT defines from kernel v4.14-rc1Rob Herring2017-10-091-0/+47
| | | | | | | | | | | | | | | | | | Add the new DRM_MODE_ROTATE_* and DRM_MODE_REFLECT_* defines from v4.14-rc1 kernel. Reviewed-by: Thierry Reding <treding@nvidia.com> Reviewed-by: Robert Foss <robert.foss@collabora.com> Signed-off-by: Rob Herring <robh@kernel.org>
| * drm: Pull new modifier uapi into drm_fourcc and drm_modeJason Ekstrand2017-08-152-0/+81
| | | | | | | | Reviewed-by: Daniel Stone <daniels@collabora.com>
| * drm: update drm.h to latest in drm-next.Dave Airlie2017-06-281-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This syncs the drm.h header with my drm-next branch as of 6d61e70ccc21606ffb8a0a03bd3aba24f659502b. It brings over the semaphore API changes. Generated using make headers_install. Generated from git://people.freedesktop.org/~airlied/linux drm-next commit 6d61e70ccc2. [airlied: I split patch in two, split reviewed by across both] Reviewed-by: Eric Anholt <eric@anholt.net> Signed-off-by: Dave Airlie <airlied@redhat.com>
| * amdgpu: sync amdgpu_drm with kernel.Dave Airlie2017-06-261-1/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | This syncs the amdgpu_drm header with my drm-next branch as of 6d61e70ccc21606ffb8a0a03bd3aba24f659502b. It brings over the VM and semaphore API changes. Generated using make headers_install. Generated from git://people.freedesktop.org/~airlied/linux drm-next commit 6d61e70ccc2. Reviewed-by: Michel Dänzer <michel.daenzer@amd.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
| * headers: Update drm_fourcc and vc4_drm.h with new VC4 tiling UAPI.Eric Anholt2017-06-222-4/+41
| | | | | | | | | | | | | | Taken from make headers_install of drm-misc-next (34c8ea400ff6383b028f63df2453914163afc07c) Reviewed-by: Daniel Stone <daniels@collabora.com>
| * headers: sync drm_sarea.h with airlied/drm-nextEric Engestrom2017-06-031-0/+8
| | | | | | | | | | | | | | | | | | | | | | Adds the C++ extern guards from ebbb0e5cfd2ceb1150b1 drm: add extern C guard for the UAPI headers Generated using `make headers_install` from airlied/drm-next at commit 2a1720376adda5ecf8e636fbfb05339c7dad1c55 Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com> Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
| * headers: sync drm_fourcc.h with airlied/drm-nextEric Engestrom2017-06-031-0/+126
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a bunch of modifiers stuff, as well as a few new formats. Includes the following changes: ebbb0e5cfd2ceb1150b1 drm: add extern C guard for the UAPI headers b9fb2a21ac8058965a6b drm_fourcc: Document linear modifier af913418261d6d3e7a29 drm_fourcc: Fix DRM_FORMAT_MOD_LINEAR #define fd056f05b9fcba35b77e drm: add fourcc codes for 16bit R and RG 73f1a5858bf82f3bf232 drm/fourcc: add vivante tiled layout format modifiers ba2b5277dc52cc96944d drm: add RGB formats with separate alpha plane 5e91144dd702d068b22a drm/tegra: Add tiling FB modifiers Generated using `make headers_install` from airlied/drm-next at commit 2a1720376adda5ecf8e636fbfb05339c7dad1c55 Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com> Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
| * amdgpu/drm: add AMDGPU_HW_IP_VCN_ENCLeo Liu2017-05-231-1/+2
| | | | | | | | | | | | | | Signed-off-by: Leo Liu <leo.liu@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com>
| * amdgpu/drm: add AMDGPU_HW_IP_VCN_DECLeo Liu2017-05-231-1/+2
| | | | | | | | | | | | | | Signed-off-by: Leo Liu <leo.liu@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com>
| * amdgpu: add raven family idHawking Zhang2017-05-231-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com> Signed-off-by: Chunming Zhou <David1.Zhou@amd.com> Reviewed-by: Junwei Zhang <Jerry.Zhang@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com>
| * Headers: Sync drm{,_mode}.h with the kernelDaniel Stone2017-04-062-15/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generated using make headers_install, based on drm-misc-next commit 5db06a8a98f515f67446a69c57577c4c363ec65d. This clarifies the comments around modifiers such that they are per-framebuffer rather than per-plane, adds the beginnings of aspect ratio mode flags, link status properties, and updates the 'reserved' field from vblank events to include the CRTC ID. v2: Split into separate patch, pull in full kernel changes. v3: Undo revert of connector-type enums, since it is not actually harmful. Signed-off-by: Daniel Stone <daniels@collabora.com> Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
| * headers: the uint*_t vs. __u* discrepancy in amdgpu_drm is fixedNicolai Hähnle2017-04-031-4/+0
| | | | | | | | | | | | | | | | | | This was already done in commit 3dc002df3e5 ("amdgpu: sync amdgpu_drm.h with kernel 4.11-rc2"), now update the README accordingly. Signed-off-by: Nicolai Hähnle <nicolai.haehnle@amd.com> Reviewed-by: Marek Olšák <marek.olsak@amd.com> Acked-by: Emil Velikov <emil.velikov@collabora.com>
| * headers: sync amdgpu_drm.h from airlied/drm-nextNicolai Hähnle2017-04-031-1/+55
| | | | | | | | | | | | | | | | | | | | | | | | Changes include: PRT and preemption flags, sensor info, and some more changes for Vega10. Generated using make headers_install from airlied/drm-next commit 320d8c3d38739fa8e31a076b86cbdafcf8897d5e. Signed-off-by: Nicolai Hähnle <nicolai.haehnle@amd.com> Reviewed-by: Marek Olšák <marek.olsak@amd.com> Acked-by: Emil Velikov <emil.velikov@collabora.com>
| * amdgpu_drm: add AMDGPU_HW_IP_UVD_ENCLeo Liu2017-03-271-1/+2
| | | | | | | | | | | | Signed-off-by: Leo Liu <leo.liu@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Marek Olšák <marek.olsak@amd.com>
| * amdgpu: update amdgpu_drm.h for Vega10Marek Olšák2017-03-271-2/+8
| | | | | | | | Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
| * amdgpu: sync amdgpu_drm.h with kernel 4.11-rc2Marek Olšák2017-03-271-145/+251
| | | | | | | | Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
| * headers: add explicit note against local changes in the READMEEmil Velikov2017-02-131-0/+2
| | | | | | | | | | | | Even with the step by step guide people sometimes get confused. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
* | Merge tag libdrm-2.4.75 into aosp/masterRichard Yoo2017-05-0911-335/+1746
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Import uapi/i915_drm.h from v4.10-rc5-950-g152d5750dda9Chris Wilson2017-01-271-10/+266
| | | | | | | | To sync with "drm/i915: Support explicit fencing for execbuf"
| * vc4: Add new GETPARAMs that have been merged to drm-next.Eric Anholt2016-11-281-0/+2
| | | | | | | | Signed-off-by: Eric Anholt <eric@anholt.net>
| * libdrm: random typo fixesGrazvydas Ignotas2016-11-221-1/+1
| | | | | | | | | | | | | | | | | | Just some trivial boring typo fixes all over the tree. READMEs and comments only. Signed-off-by: Grazvydas Ignotas <notasas@gmail.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
| * headers: Add README fileEmil Velikov2016-11-141-0/+157
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * headers: Sync drm{,_mode}.h with the kernelMichel Dänzer2016-10-132-3/+63
| | | | | | | | | | | | | | Generated using make headers_install, based on linus master commit b67be92feb486f800d80d72c67fd87b47b79b18e. Acked-by: Daniel Vetter <daniel@ffwll.ch>
| * intel: Export pooled EU and min no. of eus in a pool.Yang Rong2016-09-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update kernel interface with new I915_GETPARAM ioctl entries for pooled EU and min no. of eus in a pool. Add a wrapping function for each parameter. Userspace drivers need these values when decide the thread count. This kernel enabled pooled eu by default for BXT and for fused down 2x6 parts it is advised to turn it off. But there is another HW issue in these parts (fused down 2x6 parts) before C0 that requires Pooled EU to be enabled as a workaround. In this case the pool configuration changes depending upon which subslice is disabled and the no. of eus in a pool is different, So userspace need to know min no. of eus in a pool. V2: use return value as the query results. ret < 0 when error, ret = 0 when not support, and ret > 0 indicate query results.(Chris) V3: Correct V2 errors. Signed-off-by: Yang Rong <rong.r.yang@intel.com> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
| * amdgpu: sync amdgpu_drm.h with the kernelMarek Olšák2016-09-051-16/+26
| | | | | | | | Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net>
| * radeon: sync radeon_drm.h with the kernelMarek Olšák2016-09-051-9/+42
| | | | | | | | | | | | | | the CIK tile mode definitions are moved out, userspace doesn't use them Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net>
| * amdgpu: expose the AMDGPU_GEM_CREATE_VRAM_CLEARED flagFlora Cui2016-09-021-0/+2
| | | | | | | | | | | | | | | | With this flag specified, VRAM buffer will be cleared at allocation time. Signed-off-by: Flora Cui <Flora.Cui@amd.com> Reviewed-by: Alexandre Demers <alexandre.f.demers@gmail.com>
| * virtgpu: Update kernel headerAndreas Boll2016-07-231-51/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | Generated using make headers_install. This brings the C++ guard, proper include path for drm.h and the switching to kernel types for fixed-with integers. Generated from drm-next commit c11dea5b0290984fa48111957ba3fdc5b3bdae5a 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: Update kernel headers for getparam addition.Eric Anholt2016-07-151-0/+21
| | | | | | | | | | | | | | This also brings over the C++ guard introduced recently in the kernel headers. Signed-off-by: Eric Anholt <eric@anholt.net>