Merge lp:~hikiko/mir/mir.bug-1206633 into lp:~mir-team/mir/trunk
Status: | Work in progress |
---|---|
Proposed branch: | lp:~hikiko/mir/mir.bug-1206633 |
Merge into: | lp:~mir-team/mir/trunk |
Diff against target: |
159 lines (+58/-3) 2 files modified
src/server/graphics/gbm/gbm_display_helpers.cpp (+49/-1) tests/unit-tests/graphics/gbm/test_gbm_display.cpp (+9/-2) |
To merge this branch: | bzr merge lp:~hikiko/mir/mir.bug-1206633 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Needs Fixing | |
Mir development team | Pending | ||
Review via email: mp+184520@code.launchpad.net |
Commit message
This branch seems to fix the bug #1206633.
Changes:
- added significant messages to all errors in open_drm_device (not only those with errno)
- added drmSetMaster drmDropMaster around the drmSetInterface
- added a call to drmSetMaster right before returning the selected and opened drm device to avoid the crash (some operations that need mir to be the master take place before we call drmSetMaster otherwise)
Question:
I think that the drmSetInterface
Description of the change
This branch seems to fix the bug #1206633.
Changes:
- added significant messages to all errors in open_drm_device (not only those with errno)
- added drmSetMaster drmDropMaster around the drmSetInterface
- added a call to drmSetMaster right before returning the selected and opened drm device to avoid the crash (some operations that need mir to be the master take place before we call drmSetMaster otherwise)
Question:
I think that the drmSetInterface
FAILED: Continuous integration, rev:1055 jenkins. qa.ubuntu. com/job/ mir-ci/ 1448/ jenkins. qa.ubuntu. com/job/ mir-android- saucy-i386- build/1956 jenkins. qa.ubuntu. com/job/ mir-clang- saucy-amd64- build/1841 jenkins. qa.ubuntu. com/job/ mir-saucy- amd64-ci/ 686/console
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins: 8080/job/ mir-ci/ 1448/rebuild
http://