aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pie-platform-release to aosp-master - DO NOT MERGEHEADmasterBill Yi2018-10-240-0/+0
|\ | | | | | | Change-Id: I766eb41d83ed2020ac890f03f012bcadaaa9ff35
| * merge in pi-release history after reset to masterpie-releasegitbuildkicker2018-01-290-0/+0
| |\
| | * merge in pi-release history after reset to mastergitbuildkicker2018-01-290-0/+0
| | |\ | | |/ | |/|
| * | Snap for 4571561 from 8965152a5b26a0063c9070d42f95769ddc5b97c3 to pi-releaseandroid-build-team Robot2018-01-281-2/+2
| |\ \ | | |/ | |/| | | | Change-Id: Ia7986efd912d54011fa674740659b1d99df20ca9
| * | Snap for 4545621 from bab2e89478d2896c778a7229f485cad2a47345dd to pi-releaseandroid-build-team Robot2018-01-141-0/+1
| |\ \ | | | | | | | | | | | | Change-Id: I7494033bcb609a418ab92ef3861839cbf83c0748
| * \ \ Snap for 4434599 from 55a0d81b6ee547353bf50de61b67906dcbb1f368 to pi-releaseandroid-build-team Robot2017-11-050-0/+0
| |\ \ \ | | | | | | | | | | | | | | | Change-Id: I6f2febab14f5094c2cdb619127d75cdce862ad9c
| * \ \ \ Snap for 4413317 from a77de2becfbb0aa2b8c7632b89af14b381e3836b to pi-releaseandroid-build-team Robot2017-10-2443-454/+489
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Change-Id: I92d14a9bc276720e791bf9d68dc308602d71f8ee
| * \ \ \ \ Snap for 4410151 from a9d680b399e118ca8627624de299f29533dfebbc to pi-releaseandroid-build-team Robot2017-10-210-0/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Change-Id: I32e3475159ca7e086000513da64098804955bbbd
| * \ \ \ \ \ Snap for 4393550 from 47575b1f8afc73d939187d9ce848765c0cde98d5 to pi-releaseandroid-build-team Robot2017-10-135-2/+15
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If5fc5b271b1e1d0afedc858892195865f9da457a
* | \ \ \ \ \ \ Merge pi-dr1-dev to aosp-masterBill Yi2018-10-191-3/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I685b523f3c89dd0efb6aa491251c3e0200ec2083
| * | | | | | | | Merge stage-dr1-aosp-master into stage-aosp-masterXin Li2018-08-131-3/+4
|/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 112535855 Change-Id: I1f1f2f8f6588c49411186404505841bbca8119a4
| * | | | | | | | Make libdrm recovery_available am: d9aac04d6cJerry Zhang2018-08-031-0/+1
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 8b8d0170f7 Change-Id: I948476189241b69ede29bb62cef7f3a413caca0f
* | | | | | | | | Make libdrm recovery_availableJerry Zhang2018-08-031-0/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: d9aac04d6c Change-Id: Idd959a5501a1f73bf7491d9dad576a307c1c3ac0
| * | | | | | | | | Make libdrm recovery_availableJerry Zhang2018-07-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 110380063 Test: Compiles, recovery works Change-Id: I07b36484c1a13783ae32f63a8c05dff130524817
| | * | | | | | | | Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-masterXin Li2018-07-200-0/+0
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 52368c4ddf Change-Id: I4acd63bbb2d1bb60c71a9bd7b93dafc5f5fdc636
| | | * | | | | | | | Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-masterXin Li2018-07-191-3/+4
| |_|/| | | | | | | | |/| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 111615259 Change-Id: I25a175251a1c1240604bf79c8e12f221b4ab1374
| | * | | | | | | | libdrm: reduce number of reallocations in drmModeAtomicAddPropertyAdrian Salido2018-07-181-3/+4
| |/| | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: c5371788ed Change-Id: I3815cd86f4bdc41b5c7553e9ca237d8cc8cfd88f
| | * | | | | | | | libdrm: reduce number of reallocations in drmModeAtomicAddPropertyAdrian Salido2018-07-091-3/+4
| | | |_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When calling drmModeAtomicAddProperty allocation of memory happens as needed in increments of 16 elements. This can be very slow if there are multiple properties to be updated in an Atomic Commit call. Increase this to as many as can fit in a memory PAGE to avoid having to reallocate memory too often. Bug: 111047515 Change-Id: I043db1e7608b0a606adf1a6e468c90734372f363
* | | | | | | | | omap: Add DRM_RDWR flag to dmabuf export am: ad03011fcbHemant Hariyani2018-06-061-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 3c65100f3e Change-Id: I940f13f2a9e5c9a30c54304474b3747871a16879
| * | | | | | | | | omap: Add DRM_RDWR flag to dmabuf exportHemant Hariyani2018-06-061-1/+1
|/| | | | | | | | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: ad03011fcb Change-Id: I24ca6dd0bc75b92b00b07d4c20f7368020b41636
| * | | | | | | | omap: Add DRM_RDWR flag to dmabuf exportHemant Hariyani2018-06-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows mmap on dmabuf fd with MAP_SHARED and PROT_WRITE. This fixes boot failures caused due to mmap() returning error Signed-off-by: Hemant Hariyani <hemanthariyani@ti.com> [picked and updated commitmsg from http://git.ti.com/cgit/cgit.cgi/android/external-libdrm.git/] Bug: 74437007 Change-Id: I8ed3ed3ecb8a5005b3aa69a852e3c0f29ef9f43d Signed-off-by: Praneeth Bajjuri <praneeth@ti.com> Signed-off-by: Alistair Strachan <astrachan@google.com>
* | | | | | | | | libdrm: Add rotation property fields am: 7551405900Sean Paul2018-05-021-0/+13
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: a9e7af11ef Change-Id: I661dfa858c52749f730d241222f576992aca0a42
| * | | | | | | | | libdrm: Add rotation property fieldsSean Paul2018-05-021-0/+13
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 7551405900 Change-Id: I72368485f2294befe5283be11932dda6d182a5f1
| | * | | | | | | | 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>
* | | | | | | | | | libdrm: amdgpu: Fix Android.bp build issues am: dffc3a32a1John Stultz2018-05-022-0/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: bae5e71e53 Change-Id: Ib257a7ae060da26fc973295e1487583249a64bc6
| * | | | | | | | | libdrm: amdgpu: Fix Android.bp build issuesJohn Stultz2018-05-022-0/+7
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: dffc3a32a1 Change-Id: Ie48f80d96f099127ec2b82c5935df043cda9d32e
| | * | | | | | | | 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}" am: a428014f95John Stultz2018-05-021-2/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: a719d8b000 Change-Id: I5b0c0b5740161459e0832dd2559fb4a4d734e0a0
| * | | | | | | | | libdrm: amdgpu: Initialize unions with memset rather than "= {0}"John Stultz2018-05-021-2/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: a428014f95 Change-Id: Ib145107df1b05ed524918d19421250b8049e4f2a
| | * | | | | | | | 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 driver am: 898243f460John Stultz2018-05-023-13/+20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 3e48fd62c1 Change-Id: Icf991273a6d1644ca9c4d372d054e191b2ed7f77
| * | | | | | | | | libdrm: Switch to Android.bp for omap driverJohn Stultz2018-05-023-13/+20
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 898243f460 Change-Id: I7e105925a3183f8e837c260c1b0bde25645b07f6
| | * | | | | | | | 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 rebasing am: ↵John Stultz2018-05-023-26/+26
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 843b239004 am: 1ba95114c2 Change-Id: Ie0cbf6979440565a012802443a061f80679de840
| * | | | | | | | | libdrm: planetest/atomictest: Fix up build issue missed in rebasingJohn Stultz2018-05-023-26/+26
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 843b239004 Change-Id: Id6d6384184d495753a65e3bd17e8d8fbe21c85ae
| | * | | | | | | | 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 ↵Dmitry Shmidt2018-05-02206-2616/+9813
|\| | | | | | | | | | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libdrm am: 16adcbf47e am: c06fca4106 Change-Id: Id94ce953b15d915ea6e2a56f0574bece45bea241
| * | | | | | | | Merge remote-tracking branch 'aosp/upstream-aosp-merge-fdo-master' into libdrmDmitry Shmidt2018-05-02206-2616/+9813
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 16adcbf47e Change-Id: I01b8c6af2316c0f7e0ad7cdd18d491a040a5abb3
| | * | | | | | | 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>