aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-04-03Merge master@5406228 into git_qt-dev-plus-aosp.android-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r10android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseBill Rassieur
am: c8f5bbabed Change-Id: If7bf6ad62a4399b437b51ea7afc22fff0c93cbd3
2019-03-29Move hwcomposer.drm_hikey and hwcomposer.drm_hikey960 am: 2f49f81c06 am: ↵Colin Cross
d4080f9f75 am: 829f3bcd06 Change-Id: I661f98732680bfd26d7d3fb46393bdcd59095e09
2019-03-29Move hwcomposer.drm_hikey and hwcomposer.drm_hikey960 am: 2f49f81c06Colin Cross
am: d4080f9f75 Change-Id: I8c8ffe17ba8fb63fe94031c7e742dc9e062fe801
2019-03-29Move hwcomposer.drm_hikey and hwcomposer.drm_hikey960Colin Cross
am: 2f49f81c06 Change-Id: I7745b517d16c4efacb0c9c50aae9e70cb08b8348
2019-03-29Move hwcomposer.drm_hikey and hwcomposer.drm_hikey960android-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5Colin Cross
Prevent external/drm_hwcomposer from referencing device/linaro/hikey, which may not exist in all trees, by compiling most of drm_hwcomposer as a static library and then compiling just the source files that are affected by device-specific #defines and #includes in device/linary/hikey/gralloc*. Fixes: 129543119 Test: m hwcomposer.drm_hikey hwcomposer.drm_hikey960 MODULES-IN-external-drm_hwcomposer Change-Id: I800b147a40c4e368ce1a74273728f5941f6b63c4
2019-03-29Merge master@5406228 into git_qt-dev-plus-aosp.Bill Rassieur
Change-Id: Ibaeaf918de950d67dcd5eb3a0633a85dbdccb460 BUG: 129345239
2019-03-27Merge "Convert external/drm_hwcomposer to Android.bp" am: 02f1096918 am: ↵Alistair Strachan
11530be6c0 am: d27478aaa2 Change-Id: Id5e3c94a44ef8061c33d1852c7eadf0a9b148f56
2019-03-27Merge "Convert external/drm_hwcomposer to Android.bp" am: 02f1096918Alistair Strachan
am: 11530be6c0 Change-Id: Ia0ab41b7cd0268150d9a2bca7e54ad124fe4ffd5
2019-03-27Merge "Convert external/drm_hwcomposer to Android.bp"Alistair Strachan
am: 02f1096918 Change-Id: Ifb2d7ba0df04bb96e88285451d02da05423a8f1d
2019-03-27Merge "Convert external/drm_hwcomposer to Android.bp"linaro-pieAlistair Strachan
2019-03-22Merge remote-tracking branch 'aosp/upstream-master' into HEAD am: 077ac9bc38 ↵John Stultz
am: 6a56e171ac am: ccf3198d48 Change-Id: I00b6951fc40d8483495eb2def1a214cf39afc4f7
2019-03-22Merge remote-tracking branch 'aosp/upstream-master' into HEAD am: 077ac9bc38John Stultz
am: 6a56e171ac Change-Id: If0c0bdd0948d9a2809874cbebc877b90aafcc1c6
2019-03-22Merge remote-tracking branch 'aosp/upstream-master' into HEADJohn Stultz
am: 077ac9bc38 Change-Id: I07668e5f9eb4c98c6193e89429d4a4c6d14ac0a0
2019-03-22Convert external/drm_hwcomposer to Android.bpColin Cross
See build/soong/README.md for more information. This replaces the product and BoardConfig.mk variable conditionals with different versions of the HAL for each product, which will also allow checkbuild to verify that they build even on products that don't use them. Fixes: 122332597 Test: mma Change-Id: I8d2c8ac1bb58dcbc81ae75c2bb2c97d4485909b4
2019-03-22Merge remote-tracking branch 'aosp/upstream-master' into HEADJohn Stultz
Merge in freedesktop upstream changes * aosp/upstream-master: Revert "drm_hwcomposer: platformgeneric: Fix build" drm_hwcomposer: Set zpos relative to the minimum possible value drm_hwcomposer: Rename DrmProperty::immutable() drm_hwcomposer: Change return type of DrmProperty::value() to tuple drm_hwcomposer: Use proper commit for author/committer check drm_hwcomposer: platformgeneric: Fix build drm_hwcomposer: Chose preferred mode with type DRM_MODE_TYPE_PREFERRED drm_hwcomposer: Added hotplug support of the external display drm_hwcomposer: Fix VSYNC control Change-Id: Ib66a89d151ff47cb490ba82f0dae0ef3ffcfa51c Signed-off-by: John Stultz <john.stultz@linaro.org>
2019-03-19Revert "drm_hwcomposer: platformgeneric: Fix build"Sean Paul
This reverts commit 112903781ca34a39320d99bc68bd9f971182aa27. Per discussion in !47 [1], this is not needed. Signed-off-by: Sean Paul <seanpaul@chromium.org> [1]- https://gitlab.freedesktop.org/drm-hwcomposer/drm-hwcomposer/merge_requests/47
2019-03-18drm_hwcomposer: Set zpos relative to the minimum possible valueAlexandru Gheorghe
Current implementation doesn't handle properly the cases where zpos range starts from 1. See https://gitlab.freedesktop.org/drm-hwcomposer/drm-hwcomposer/issues/19#note_100622 Fixes: ea1c5e5a ("drm_hwcomposer: Add z order support") Signed-off-by: Alexandru Gheorghe <alexc.g1.ro@gmail.com> [seanpaul converted to std::tuple return type] Signed-off-by: Sean Paul <seanpaul@chromium.org> Change-Id: I35dc2c1cfd0e38ca3a47cf4e668eeb5f3c470ddb
2019-03-18drm_hwcomposer: Rename DrmProperty::immutable()Sean Paul
To be a little more precise, add an 'is_' prefix Change-Id: Idd8fe45a4dfba1cd778b4ed6b761ec489697c31a Signed-off-by: Sean Paul <seanpaul@chromium.org>
2019-03-18drm_hwcomposer: Change return type of DrmProperty::value() to tupleSean Paul
To keep consistent with other functions Change-Id: I11ba07eabcee08f3db09b3a5422bc480482a62c1 Signed-off-by: Sean Paul <seanpaul@chromium.org>
2019-03-15drm_hwcomposer: Use proper commit for author/committer checkSean Paul
The script uses the author/committer of HEAD instead of the commit it is inspecting. This fails when a patch set has different authors/committers (such as https://gitlab.freedesktop.org/drm-hwcomposer/drm-hwcomposer/merge_requests/46) Change-Id: I0fcd724cf372fad435c7614777f13e015c204c3d Signed-off-by: Sean Paul <seanpaul@chromium.org>
2019-03-06drm_hwcomposer: platformgeneric: Fix buildAndrii Chepurnyi
Propagate correct include path for gralloc_handle.h Signed-off-by: Andrii Chepurnyi <andrii_chepurnyi@epam.com>
2019-03-06drm_hwcomposer: Chose preferred mode with type DRM_MODE_TYPE_PREFERREDAndrii Chepurnyi
According to the Linux Kernel: "DRM_MODE_TYPE_PREFERRED: Preferred mode, usually the native resolution of an LCD panel. There should only be one preferred mode per connector at any given time." Will use it during preferred mode choice. Tested-by: John Stultz <john.stultz@linaro.org> Signed-off-by: Andrii Chepurnyi <andrii_chepurnyi@epam.com>
2019-03-06drm_hwcomposer: Added hotplug support of the external displayAndrii Chepurnyi
Unplug of the main display will not work because of Activity Manager code(ActivityStackSupervisor.java:handleDisplayRemoved). Only one display can be connected as an external display (see SurfaceFlinger::determineDisplayType). Tested-by: John Stultz <john.stultz@linaro.org> Signed-off-by: Andrii Chepurnyi <andrii_chepurnyi@epam.com>
2019-03-05drm_hwcomposer: Fix VSYNC controlAndrii Chepurnyi
Use HWC2_VSYNC_ENABLE for correct state recognition. Tested-by: John Stultz <john.stultz@linaro.org> Signed-off-by: Andrii Chepurnyi <andrii_chepurnyi@epam.com>
2019-03-04Merge remote-tracking branch 'aosp/upstream-master' into HEAD am: bea3b4ca9b ↵John Stultz
am: b47b6bc2e9 am: 12652897f7 Change-Id: Iaf075c1251ff59b0f4e52949f1b26be1542637c0
2019-03-04Merge remote-tracking branch 'aosp/upstream-master' into HEAD am: bea3b4ca9bJohn Stultz
am: b47b6bc2e9 Change-Id: I9269f44427555987f5e5c169d9bfa68bde07c964
2019-03-04Merge remote-tracking branch 'aosp/upstream-master' into HEADJohn Stultz
am: bea3b4ca9b Change-Id: Id61605e47032a1fc45657dd2bbab0e8a5caed414
2019-03-04Merge remote-tracking branch 'aosp/upstream-master' into HEADandroid-q-preview-1android-o-mr1-iot-release-1.0.10John Stultz
* aosp/upstream-master: drm_hwcomposer: Initialize buffer_ pointer to NULL drm_hwcomposer: platformhisi: Conditionalize some of the AFBC support drm_hwcomposer: Add support for Arm Framebuffer Compression (AFBC) modifiers. drm_hwcomposer: Fix check commit script to ignore case and extra spaces Change-Id: Ia0cad33541d783bea37bc6458a03024d696a30c3 Signed-off-by: John Stultz <john.stultz@linaro.org>
2019-02-28drm_hwcomposer: Initialize buffer_ pointer to NULLJohn Stultz
In some cases, we've seen drm_hwcomposer start to try to compose frames before anything has called SetClientTarget(). This seems to be some sort of a race, which for some reason we only see with certain dummy HDMI dongles (which provide fake EDID data) which allow our lab machines to run headless. I'm still trying to understand more about why this happens only in this case. The net of the issue is we see CreateComposition() being called, which adds the client_layer_ to the zmap. Then it creates the DrmHwcLayers copying the non-initialized buffer_ value as the sf_handle. This then later causes a crash in ImportBuffer() when we traverse the non-null (but invalid) hnd value. Thus, this patch simply initilizes the buffer_ pointer to NULL so that we error out properly in the case of the race. Reported-by: YongQin Liu <yongqin.liu@linaro.org> Signed-off-by: John Stultz <john.stultz@linaro.org> Change-Id: I5fde3fccde86519edb04e61cbc2842eda395ade4
2019-02-28drm_hwcomposer: platformhisi: Conditionalize some of the AFBC supportJohn Stultz
Unfortunately with the AFBC support patches, I validated with the hikey960 (which has a gralloc that supports AFBC), but not with the original hikey board (which does not support AFBC). Since we use the same importer for both boards, conditionalize the AFBC logic if those values are not defined. This patch will also need a tweak to the hikey gralloc to add support for the handle->internal_format reference (which doesn't currently exist on hikey's gralloc). Change-Id: I31aea82b321ff7dd7608c6a3522cbc93bb629319 Signed-off-by: John Stultz <john.stultz@linaro.org>
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
am: 82e2c2d2c2 Change-Id: Ie106480fd63a93a63a0ff2e429c3492cdec7d5f3
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
Bug: 126125118 Change-Id: Idfa16a3f9e74da763418cd37d542572369bd8ad0
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li
Bug: 120848293 Change-Id: Icddbc908df616807208c0b4418510b444b2473f1
2019-01-31drm_hwcomposer: Add support for Arm Framebuffer Compression (AFBC) modifiers.Ayan Kumar Halder
One needs to translate the Gralloc buffer flags for AFBC (eg MALI_GRALLOC_INTFMT_AFBC_BASIC) to the corresponding linux kernel drm modifiers. This gets passed to libdrm via drmModeAddFB2WithModifiers. Changes from v1:- - Moved ConvertGrallocFormatToDrmModifiers() and IsDrmFormatRgb() from 'DrmGenericImporter' to 'HisiImporter' as suggested by Sean paul - Check if the format is rgb and set AFBC_FORMAT_MOD_YTR only if any of the AFBC related Gralloc flags are set. Changes from v2:- - Changed ConvertGrallocFormatToDrmModifiers() and IsDrmFormatRgb() from 'public' to 'private' (suggested by Sean Paul) Changes from v3:- - Reordered the members of 'class HisiImporter'. Functions should go above member variables. (suggested by Sean Paul) Changes from v4:- - Rebased and some style changes (as suggested by gitlab-ci-checkcommit.sh) Signed-off-by: Ayan Kumar Halder <ayan.halder@arm.com> Reviewed-by: Sean Paul <seanpaul@chromium.org> /-- Note for reviewer I was able to get this working for hikey960 with aosp/master for kernel 4.14. The libdrm headers need to be updated as the AFBC modifiers are missing in the aosp/master's external/libdrm. --/ Change-Id: I66abaa08d19ce88169cc40522b167dfe5efc7036
2019-01-30drm_hwcomposer: Fix check commit script to ignore case and extra spacesSean Paul
Job 93709 [1] failed with missing committer sign-off. Ayan has their committer string set to "Ayan kumar halder <ayan.halder@arm.com>", and the Signed-off-by line on the commit was "Signed-off-by: Ayan Kumar Halder <ayan.halder@arm.com>". So grep did what we asked it to do and did not find the SoB since the case was incorrect. This patch changes to case-insensitive search and while we're at it, trims excess whitespace from both the commit body and the committer/author name. Finally, I've improved the error message so it's hopefully more clear why things fail in the future. [1]- https://gitlab.freedesktop.org/ayan.halder/drm-hwcomposer/-/jobs/93709 Signed-off-by: Sean Paul <seanpaul@chromium.org>
2019-01-15Merge remote-tracking branch 'aosp/upstream-master' into HEAD am: bdf5d72c1b ↵John Stultz
am: d487ba5aa5 am: 2a6465beb6 Change-Id: Ia461d2f654df3099aa1b32c60793afd123d47f5d
2019-01-15Merge remote-tracking branch 'aosp/upstream-master' into HEAD am: bdf5d72c1bJohn Stultz
am: d487ba5aa5 Change-Id: Icc8a60f2d28b516fc68877dee7885334c802d1db
2019-01-15Merge remote-tracking branch 'aosp/upstream-master' into HEADJohn Stultz
am: bdf5d72c1b Change-Id: I835efd69c4369f784088d1d9123393e8a6fb853e
2019-01-15Merge remote-tracking branch 'aosp/upstream-master' into HEADJohn Stultz
Merge in upstream-master branch from freedesktop. This syncs the AOSP tree completely with the upstream branch - with the exception of the OWNERS file. Change-Id: If87394e44fcec163daddcd51d7f7a451d49aec8c Signed-off-by: John Stultz <john.stultz@linaro.org>
2019-01-15drm_hwcomposer: Rework ValidateDisplay layer check to use if statement ↵John Stultz
rather then switch AOSP's toolchain throws errors on un-annotated switch case fallthroughs. Rather then adding [[fallthrough]] annotations, which would add C++17 syntax, switch to using a if statement instead. Change-Id: Id0b2bf6d365d50e637569f0c4353ceb4fda21c16 Signed-off-by: John Stultz <john.stultz@linaro.org> --- v2: Rework conditional to be more readable as suggested by seanpaul
2018-12-18Merge remote-tracking branch 'aosp/upstream-master' into HEAD am: 8345f0a664 ↵John Stultz
am: cfef6ba6f0 am: 0b75bdf641 Change-Id: I1ccf2d9574ca666a7c50897885f7f8f415cf9cab
2018-12-18Merge remote-tracking branch 'aosp/upstream-master' into HEAD am: 8345f0a664John Stultz
am: cfef6ba6f0 Change-Id: Id3f5b666330d1f98581b744f4c6d5a343fe652b7
2018-12-18Merge remote-tracking branch 'aosp/upstream-master' into HEADJohn Stultz
am: 8345f0a664 Change-Id: Ie81703709a36cc6cb3fc43d55245397ccbf5494d
2018-12-14drm_hwcomposer: Complete rename of DrmResources to DrmDeviceJorge E. Moreira
In AOSP/master, there was a structure renamed, so try to sync AOSP/master's build fix change to freedesktop/master. NOTE: I'm not sure how to best submit this, as the upstream freedesktop/master may have users outside of AOSP/master. But I'm not sure what devices on an official release are using drm_hwc so it seems like this would be more useful then not. Bug: 116154944 Test: builds Change-Id: I244bd049afae6ba8310f6b6bf2d3b1ee2e891de3 Signed-off-by: John Stultz <john.stultz@linaro.org>
2018-12-14Merge remote-tracking branch 'aosp/upstream-master' into HEADandroid-o-mr1-iot-release-1.0.8John Stultz
Re-sync w/ upstream freedesktop.org tree Change-Id: I1af2047bdf601cae19e29b6106c2b57a37b324a6 Signed-off-by: John Stultz <john.stultz@linaro.org>
2018-12-03drm_hwcomposer: platformhisi: Remove fake-importingAlexey Firago
With CanImportBuffer() in place we don't need fake importing anymore. Buffers should be checked before supplied to ImportBuffer() and plane planner. Instead of fake importing return -EINVAL for non HW_FB buffers in ImportBuffer() and skip non HW_FB in planner. Additionally, return error from planner if we didn't emplace any layer to force client compositing. Signed-off-by: Alexey Firago <alexey_firago@mentor.com>
2018-11-27drm_hwcomposer: Add checking if we can import a bufferAlexey Firago
Add CanImportBuffer() function to the Importer interface. Platform specific importer should check in this function if it can import given buffer_handle_t. For example platformhisi will return false for buffers without GRALLOC_USAGE_HW_FB. This function should be used on ValidateDisplay step to avoid the need of 'fake-importing' of buffers. Signed-off-by: Alexey Firago <alexey_firago@mentor.com>
2018-10-30Allow implicit-fallthrough warnings locally. am: 6caaa8724f am: b25f916a62Chih-Hung Hsieh
am: 8e5a222be6 Change-Id: I4f3e29c5746a7e04e1eeda7a5a0f9052cd15f397
2018-10-30Allow implicit-fallthrough warnings locally. am: 6caaa8724fChih-Hung Hsieh
am: b25f916a62 Change-Id: I1b7b371b3c744b473c1a2caff03ee3a10f311db3
2018-10-30Allow implicit-fallthrough warnings locally.Chih-Hung Hsieh
am: 6caaa8724f Change-Id: I07cda085eff3b1fec9a513d50fcd5c9af380f09b
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-15 20:28:03 +0000