Merge lp://staging/~kdub/mir/hwc10-support into lp://staging/~mir-team/mir/trunk
Proposed by
Kevin DuBois
| Status: | Merged |
|---|---|
| Approved by: | Robert Ancell |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 624 |
| Proposed branch: | lp://staging/~kdub/mir/hwc10-support |
| Merge into: | lp://staging/~mir-team/mir/trunk |
| Diff against target: |
2311 lines (+1064/-439) 38 files modified
include/server/mir/graphics/display_buffer.h (+1/-1) include/test/mir_test_doubles/mock_display_buffer.h (+1/-1) include/test/mir_test_doubles/mock_fb_hal_device.h (+3/-3) include/test/mir_test_doubles/mock_hwc_composer_device_1.h (+26/-6) include/test/mir_test_doubles/mock_hwc_interface.h (+1/-1) include/test/mir_test_doubles/mock_hwc_organizer.h (+43/-0) include/test/mir_test_doubles/null_display_buffer.h (+1/-1) src/server/graphics/android/CMakeLists.txt (+2/-0) src/server/graphics/android/android_display.cpp (+10/-6) src/server/graphics/android/android_display.h (+4/-3) src/server/graphics/android/android_display_factory.cpp (+10/-4) src/server/graphics/android/android_display_factory.h (+1/-0) src/server/graphics/android/android_hwc_factory.cpp (+8/-0) src/server/graphics/android/android_hwc_factory.h (+4/-0) src/server/graphics/android/default_framebuffer_factory.cpp (+1/-2) src/server/graphics/android/hwc10_device.cpp (+79/-0) src/server/graphics/android/hwc10_device.h (+53/-0) src/server/graphics/android/hwc11_device.cpp (+9/-58) src/server/graphics/android/hwc11_device.h (+3/-19) src/server/graphics/android/hwc_common_device.cpp (+97/-0) src/server/graphics/android/hwc_common_device.h (+72/-0) src/server/graphics/android/hwc_device.h (+2/-1) src/server/graphics/android/hwc_display.cpp (+2/-4) src/server/graphics/android/hwc_display.h (+1/-1) src/server/graphics/android/hwc_factory.h (+4/-0) src/server/graphics/gbm/gbm_display_buffer.cpp (+4/-6) src/server/graphics/gbm/gbm_display_buffer.h (+1/-1) tests/integration-tests/graphics/android/test_display_integration.cpp (+53/-47) tests/unit-tests/graphics/android/CMakeLists.txt (+2/-0) tests/unit-tests/graphics/android/test_android_display_factory.cpp (+38/-26) tests/unit-tests/graphics/android/test_android_fb.cpp (+7/-1) tests/unit-tests/graphics/android/test_fb_device.cpp (+1/-1) tests/unit-tests/graphics/android/test_gpu_display.cpp (+7/-14) tests/unit-tests/graphics/android/test_hwc10_device.cpp (+161/-0) tests/unit-tests/graphics/android/test_hwc11_device.cpp (+242/-0) tests/unit-tests/graphics/android/test_hwc_device.cpp (+80/-197) tests/unit-tests/graphics/android/test_hwc_display.cpp (+26/-31) tests/unit-tests/graphics/gbm/test_gbm_display.cpp (+4/-4) |
| To merge this branch: | bzr merge lp://staging/~kdub/mir/hwc10-support |
| Related bugs: | |
| Related blueprints: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| PS Jenkins bot (community) | continuous-integration | Approve | |
| Daniel van Vugt | Needs Fixing | ||
| Robert Ancell | Approve | ||
|
Review via email:
|
|||
Commit message
Add HWC device version 1.0 support for GPU composition and vsync timings.
Fixes: LP: #1118680
Description of the change
add HWC device version 1.0 support for gpu composition and vsync timings.
also, the mg::Display's post_update function was reporting failure via rc, so change that to report via throws
fixes: lp1118680
To post a comment you must log in.
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
PASSED: Continuous integration, rev:698
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild:
http://