aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove headers from LOCAL_SRC_FILESDan Willemsen2016-01-2510-68/+13
| | | | | | | | | | | | | | | | | The build system does not use headers in LOCAL_SRC_FILES. To prevent typos, it's becoming a warning to add something to LOCAL_SRC_FILES that is not used. Since these lists are coming from file shared with other Makefile systems, use filter-out to do this dynamically. Once we move to Soong, we will need our own lists though - Soong cannot read makefiles. Remove LOCAL_EXPORT_C_INCLUDE_DIR entries that do not exist. Also clean up LOCAL_C_INCLUDES -- with LOCAL_EXPORT_C_INCLUDE_DIRS and the default $(LOCAL_PATH) entry, most were not necessary. Remove LOCAL_MODULE_TAGS := optional, that's the default. Change-Id: I2d77814eb227371da2945f6aede671d9f66d7b09
* Remove LOCAL_COPY_HEADERSColin Cross2015-12-218-29/+0
| | | | | | | | | | | Copying headers is bad for enforcing build dependencies because it puts the headers in a location that anyone can include them without depending on the module. The new build system will not support copying headers. Remove LOCAL_COPY_HEADERS, they are already available through LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) Change-Id: I545228718b7a3ad108f155673df8e7faf1c6dd3e
* drm: add nouveau_{ioctl,class}.h for nvifandroid-6.0.1_r9android-6.0.1_r81android-6.0.1_r80android-6.0.1_r8android-6.0.1_r79android-6.0.1_r78android-6.0.1_r77android-6.0.1_r74android-6.0.1_r73android-6.0.1_r72android-6.0.1_r70android-6.0.1_r7android-6.0.1_r69android-6.0.1_r68android-6.0.1_r67android-6.0.1_r66android-6.0.1_r65android-6.0.1_r62android-6.0.1_r61android-6.0.1_r60android-6.0.1_r59android-6.0.1_r58android-6.0.1_r57android-6.0.1_r56android-6.0.1_r54android-6.0.1_r53android-6.0.1_r52android-6.0.1_r51android-6.0.1_r50android-6.0.1_r49android-6.0.1_r48android-6.0.1_r47android-6.0.1_r46android-6.0.1_r45android-6.0.1_r43android-6.0.1_r42android-6.0.1_r41android-6.0.1_r40android-6.0.1_r30android-6.0.1_r3android-6.0.1_r28android-6.0.1_r27android-6.0.1_r26android-6.0.1_r25android-6.0.1_r24android-6.0.1_r22android-6.0.1_r21android-6.0.1_r20android-6.0.1_r17android-6.0.1_r13android-6.0.1_r12android-6.0.1_r11android-6.0.1_r10android-6.0.1_r1android-6.0.0_r41Andrew Chew2015-09-302-0/+739
| | | | | | | | | Import the new nvif class interface definitions from the kernel drm. These include the recently added channel priority and timeout methods, required for robust contexts. Change-Id: I11a4f834908d9892f68f72826856bfd3687ff04c Signed-off-by: Konsta Holtta <kholtta@nvidia.com>
* drm: add DRM_NOUVEAU_NVIF and CLIENT,DEVICE,CHANAndrew Chew2015-09-301-0/+9
| | | | | | | | | | Update nouveau_drm.h for DRM_NOUVEAU_NVIF and NOUVEAU_ABI16_{CLIENT,DEVICE,CHAN} handle codes that exist in kernel's version of this header. These allow userspace to call engine methods via the new NVIF interface. Change-Id: I30e2691ba0c21ccf940c4ff5fe1c9389fc6b283e Signed-off-by: Konsta Holtta <kholtta@nvidia.com>
* nouveau: add DRM_NOUVEAU_GEM_SET_ERROR_NOTIFIERAndrew Chew2015-09-301-0/+11
| | | | | | | | Add header definitions for the DRM_NOUVEAU_GEM_SET_ERROR_NOTIFIER ioctl in nouveau. Change-Id: I2675ee3a5615921b5f3967496f5275b5708a874a Signed-off-by: Konsta Holtta <kholtta@nvidia.com>
* libdrm: Add DRM_IOCTL_TEGRA_(START|STOP)_KEEPON ioctlsAndrew Chew2015-09-301-0/+9
| | | | | | | | Add struct drm_tegra_keepon, and corresponding ioctl opcodes. These are pulled from chromeos-3.18 kernel. Change-Id: I74d2c82cce7888ce1781e19292b6eacb87325be1 Signed-off-by: Andrew Chew <achew@nvidia.com>
* libdrm: Add DRM_TEGRA_(G|S)ET_CLK_RATE ioctlsAndrew Chew2015-09-301-0/+27
| | | | | | | | Add drm_tegra_get_clk_rate and drm_tegra_set_clk_rate structs and their corresponding ioctl opcodes. These are pulled from chromeos-3.18 kernel. Change-Id: Iaea44706f7d7f7a36e8b88aea5c8facfbdd0ef18 Signed-off-by: Andrew Chew <achew@nvidia.com>
* libdrm: Add GEM as Alloc/Free ioctlsAndrew Chew2015-08-241-0/+14
| | | | | | | | | Add drm_nouveau_as_alloc and drm_nouveau_as_free ioctl structs and their corresponding ioctl opcodes. These are pulled from the kernel include files. Change-Id: I54c7f91ed29f0c42c4245807cf80f34b196f86ec Signed-off-by: Andrew Chew <achew@nvidia.com>
* Merge changes I3d802b7c,I2b11caa0 into mnc-dr-devTomasz Figa2015-08-181-4/+0
|\ | | | | | | | | | | * changes: libdrm: nouveau: Add GEM_SET_INFO ioctl Revert "libdrm: Add coherent flag to set_tiling"
| * libdrm: nouveau: Add GEM_SET_INFO ioctlTomasz Figa2015-08-111-0/+1
| | | | | | | | | | | | | | This patch updates the header to add the GEM_SET_INFO ioctl recently added to the kernel. Change-Id: I3d802b7c96e120d6541d89ed247c7d459065f836
| * Revert "libdrm: Add coherent flag to set_tiling"Tomasz Figa2015-08-111-4/+0
| | | | | | | | | | | | This reverts commit c6544430c3f9019f7043d8f1684bd30a69749dc4. Will be replaced with a new, revised interface.
* | Merge "libdrm: Add NOUVEAU_GEM_DOMAIN_COHERENT" into mnc-dr-devPuneet Kumar2015-08-171-0/+1
|\ \
| * | libdrm: Add NOUVEAU_GEM_DOMAIN_COHERENTDavid Ung2015-08-171-0/+1
| |/ | | | | | | | | | | | | Add NOUVEAU_GEM_DOMAIN_COHERENT, pulled from chromeos-3.18 kernel Change-Id: Iddb8179d53bd90d54be3a5d4d89bb43754c69268 Signed-off-by: David Ung <davidu@nvidia.com>
* / libdrm: Add DRM_NOUVEAU_GEM_SET_INFOAndrew Chew2015-08-171-0/+1
|/ | | | | | | | This ioctl uses struct drm_nouveau_gem_info, same as DRM_NOUVEAU_GEM_INFO. Pulled from chromeos-3.18 kernel. Change-Id: If0ed7a0f0bc84ce5cac4efcf57c4927284fd9188 Signed-off-by: Andrew Chew <achew@nvidia.com>
* libdrm: Add coherent flag to set_tilingSeason Li2015-08-101-0/+4
| | | | Change-Id: Ib2ada1a9ea77ee9f62a77976f6c47a927a0d51ff
* libdrm: Add drm_nouveau_gem_set_tilingAndrew Chew2015-07-211-0/+6
| | | | | | | | Add drm_nouveau_gem_set_tiling ioctl struct, pulled from chromeos-3.18 kernel. Change-Id: I70bdfdf11d132e1c330abee888d078d24dcf4695 Signed-off-by: Andrew Chew <achew@nvidia.com>
* libdrm: Add drm_nouveau_gem_pushbuf_2Andrew Chew2015-07-211-0/+15
| | | | | | | | Add drm_nouveau_gem_pushbuf_2 ioctl struct, pulled from chromeos-3.18 kernel. Change-Id: I651e8d6ab91f17d63d391e8127a21a3af6e02af9 Signed-off-by: Andrew Chew <achew@nvidia.com>
* libdrm: Add rotation property fieldsSean Paul2015-07-141-0/+8
| | | | | | | From drm_crtc.h, for use with the plane "rotation" property Change-Id: If708f3d9ed4ef62f687c056b1f309f668597736a Signed-off-by: Sean Paul <seanpaul@chromium.org>
* Build libdrm as a static library for recoveryVincent Palatin2015-07-011-17/+18
| | | | | Change-Id: Ie7f4e31085c998760edc4c24ec5764614ffae593 Signed-off-by: Vincent Palatin <vpalatin@chromium.org>
* fix planetest build on 32-bit architectureVincent Palatin2015-07-011-1/+1
| | | | | | | | | | | The build used to be failing with the following error: external/libdrm/tests/planetest/modeset.c: In function 'set_crtc_mode': external/libdrm/tests/planetest/modeset.c:22:21: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast] create_blob.data = (__u64)mode; Change-Id: Idaf67326828df729ea0ecdd9e3d796e893fd78f5 Signed-off-by: Vincent Palatin <vpalatin@chromium.org>
* Revert "Build libdrm as a static library for recovery"Vincent Palatin2015-07-011-18/+17
| | | | | | | | shamu build failed This reverts commit 7718265262cf9cb93e1bfe75a3b3317941c213ff. Change-Id: Ife659ec7bb46adfc2a05a3adcf32256a9c40dd3e
* Build libdrm as a static library for recoveryVincent Palatin2015-06-301-17/+18
| | | | | Change-Id: I86971ebc28f615a1c6d5548191379583b0404960 Signed-off-by: Vincent Palatin <vpalatin@chromium.org>
* Accept dri card & crtc as argumentsSean Paul2015-06-194-7/+83
| | | | | Change-Id: Id036e1fed801ea101825fbd90f8252691e96a6a8 Signed-off-by: Sean Paul <seanpaul@chromium.org>
* Set crtc ACTIVE property on modesetSean Paul2015-06-193-1/+5
| | | | | Change-Id: Ia676be720855de5ff1facf227187bf02368a40b7 Signed-off-by: Sean Paul <seanpaul@chromium.org>
* Don't reuse crtcsSean Paul2015-06-181-0/+5
| | | | Change-Id: Iad2658dddf78f80c0c604537a3c480772e4645f1
* Merge changes I455b12de,I3ca909af into mnc-devSean Paul2015-06-1114-2/+1148
|\ | | | | | | | | | | * changes: Use atomic modeset + api Add planetest/atomictest
| * Use atomic modeset + apiSean Paul2015-06-035-50/+106
| | | | | | | | | | Change-Id: I455b12de368fea00607e330bd8db1e25ffc20827 Signed-off-by: Sean Paul <seanpaul@chromium.org>
| * Add planetest/atomictestSean Paul2015-06-0314-2/+1092
| | | | | | | | | | | | | | | | | | | | These tests move some planes around the screen. Signed-off-by: Sean Paul <seanpaul@chromium.org> (cherry picked from commit 2f327b0f1fe3b400e83b9eaf6feafb46f3d6806a) Signed-off-by: Sean Paul <seanpaul@chromium.org> Change-Id: I3ca909afe2dc9f0e1fa1ec262be72f983264a8c5
* | rockchip: Add support for Android build systemTomasz Figa2015-06-043-0/+30
| | | | | | | | | | | | | | | | This patch adds changes necessary to enable building libdrm_rockchip inside Android build system. Change-Id: Ib9562f4891dfd5868ba4cb0b7acc20467a2d4084 Signed-off-by: Tomasz Figa <tfiga@google.com>
* | rockchip: Add API to create BO object from existing handleTomasz Figa2015-06-042-0/+27
| | | | | | | | | | | | | | | | Certain use cases involve importing BO from Prime FD and obtaining a handle, which then needs to be imported into libdrm. Change-Id: Ibe28f719d1287e2cc5fb62523239635f8baac901 Signed-off-by: Tomasz Figa <tfiga@google.com>
* | rockchip: Add rockchip drm APIyzq2015-06-047-1/+473
| | | | | | | | | | | | | | | | 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>
* | Merge "libdrm: Add create/destroy blob ioctls to drm headers" into mnc-devSean Paul2015-06-032-0/+22
|\ \
| * | libdrm: Add create/destroy blob ioctls to drm headersSean Paul2015-06-032-0/+22
| |/ | | | | | | | | Signed-off-by: Sean Paul <seanpaul@chromium.org> Change-Id: Ibb7e68ec1a6e6541709dec58645a63f22ca6f2c4
* | libdrm: nouveau: Sync the staging ioctl numbers with kernelDavid Ung2015-05-181-0/+4
| | | | | | | | | | | | Change-Id: I00165feb72c101d512e88b35131a6ddd56ce71a9 Signed-off-by: David Ung <davidu@nvidia.com> Signed-off-by: Stéphane Marchesin <marcheu@chromium.org>
* | libdrm: use offset in bytes not pages in drm_mmapStéphane Marchesin2015-05-111-1/+1
|/ | | | | | | mmap64 takes an offset in bytes, not in pages. This change modifies drm_mmap to use an offset in bytes. Change-Id: If4d7ab5ba27a588af2ac711903523b520c559c50
* BACKPORT: fixup! libdrm: atomic mode setRob Clark2015-04-174-7/+24
| | | | | (cherry picked from commit 6ddc823aeb1af0c70cdcd9b206aa45d1e5f394d7) Signed-off-by: Sean Paul <seanpaul@chromium.org>
* BACKPORT: libdrm: Fix bogus increment of a property set object countAnder Conselvan de Oliveira2015-04-171-10/+6
| | | | | | | | | | | | | | | | If drmModePropertySetAdd() is called with the following property pairs it will mistakenly increase the object count: (4, 1), (5,1), (4, 2). When adding the third pair, the new_obj variable would be set when prev points to (4, 1) since it disregarded the value of the previous item. This patch changes the logic so that the obj count is incresed only if both the previous and next items have differing object ids. (cherry picked from commit 2b1faf742b6391b1537e2635b6926b3a196c1540) Signed-off-by: Sean Paul <seanpaul@chromium.org>
* BACKPORT: libdrm: atomic mode setVille Syrjälä2015-04-174-0/+316
| | | | | (cherry picked from commit fb8403c23edb3e06c979115b7b0cce2ba5099aa2) Signed-off-by: Sean Paul <seanpaul@chromium.org>
* Merge "Add missing <strings.h> includes"Greg Hackmann2015-04-162-0/+2
|\
| * Add missing <strings.h> includesGreg Hackmann2015-04-152-0/+2
| | | | | | | | | | Change-Id: I03d3928ccb3e034a96752ea2a4b8398484d1fbfd Signed-off-by: Greg Hackmann <ghackmann@google.com>
* | libdrm: Gate compilation on BOARD_USES_LIBDRMSean Paul2015-04-151-0/+4
|/ | | | | | | Topic: nouveau_breakage Change-Id: I82954a6344558ecffd7c90abe1cf55207c4161a0 Signed-off-by: Sean Paul <seanpaul@chromium.org>
* libdrm: tegra: Add funcs to add/fetch nameSean Paul2015-02-043-0/+63
| | | | | | | | Add functions within the tegra driver to add a name to a bo as well as fetch a bo from name. Signed-off-by: Sean Paul <seanpaul@chromium.org> Change-Id: I316a3920541040fe478eb5b07c1ef00a3a597e68
* libdrm: Update drm/tegra_drm.h kernel headerSean Paul2015-01-301-17/+13
| | | | | Signed-off-by: Sean Paul <seanpaul@chromium.org> Change-Id: I65a9c294be1d303f47924a4fc9e65c1a1ad75fdf
* libdrm: Store bo offset as 64-bitSean Paul2015-01-301-1/+1
| | | | | Signed-off-by: Sean Paul <seanpaul@chromium.org> Change-Id: I82f5631f56a79d9b2afc94110e8809c6ad8189b3
* libdrm: Compile tegra driver in androidSean Paul2015-01-303-1/+33
| | | | | Signed-off-by: Sean Paul <seanpaul@chromium.org> Change-Id: I1adcface945b8bc0920d2b24c3b959e96bfe1980
* libdrm: Disable intel and freedrenoSean Paul2015-01-301-2/+0
| | | | | | | | | | Disable intel b/c it's missing its pciaccess dependency. Disable freedreno b/c it doesn't compile on 64-bit and is apparently broken in other ways. Signed-off-by: Sean Paul <seanpaul@chromium.org> Change-Id: I57126c1c08b4422e8557d3baef15fcb40877af39
* libdrm: Use mmap64 instead of __mmap2Sean Paul2015-01-301-3/+1
| | | | | | | | __mmap2 isn't supported on all platforms, mmap64 is the right way to do this in android. Signed-off-by: Sean Paul <seanpaul@chromium.org> Change-Id: Ib5bb2b675770d20735434f07ea58e51dec862dc4
* Merge http://cgit.freedesktop.org/mesa/drmGeoff Mendal2015-01-20226-0/+55913
|\ | | | | | | Bug: 18959563
| * radeon: align r600/700 fmask to 128 X blocks.Dave Airlie2015-01-191-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After much searching and empricial testing, and reading of things I've no justifcation for this fix, other than it really appears this is what the hw is doing or close enough. It makes sense that each entry in the FMASK corresponds to an entry in the CMASKm and the CMASK is organised into 128x128 blocks, but I can't find anything in any of the docs/info from AMD. But I've spent a lot of time on this, and this seems to be the simplest fix, in that we don't over allocate things too much, once this fix in place we can nuke the extra multiplier in mesa. Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Marek Olšák <marek.olsak@amd.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
| * configure/freedreno: enable freedreno by defaultRob Clark2015-01-181-4/+4
| | | | | | | | | | | | | | | | | | Now that enabling freedreno doesn't automatically enable kgsl, lets enable it by default. The drm/msm driver has been upstream for a while now, and it's ABI is locked. So I don't think we need to keep calling it experimental. Signed-off-by: Rob Clark <robclark@freedesktop.org>
generated by cgit v1.2.3 (git 2.39.2)