Merge lp:~mir-team/mir/fix-1376324-0.8 into lp:mir/0.8
Proposed by
Daniel van Vugt
Status: | Merged |
---|---|
Approved by: | Cemil Azizoglu |
Approved revision: | no longer in the source branch. |
Merged at revision: | 1969 |
Proposed branch: | lp:~mir-team/mir/fix-1376324-0.8 |
Merge into: | lp:mir/0.8 |
Diff against target: |
368 lines (+186/-1) 16 files modified
CMakeLists.txt (+1/-1) debian/changelog (+10/-0) src/include/server/mir/compositor/buffer_stream.h (+1/-0) src/server/compositor/buffer_bundle.h (+1/-0) src/server/compositor/buffer_queue.cpp (+11/-0) src/server/compositor/buffer_queue.h (+2/-0) src/server/compositor/buffer_stream_surfaces.cpp (+5/-0) src/server/compositor/buffer_stream_surfaces.h (+1/-0) src/server/scene/basic_surface.cpp (+3/-0) tests/include/mir_test_doubles/mock_buffer_bundle.h (+1/-0) tests/include/mir_test_doubles/mock_buffer_stream.h (+1/-0) tests/include/mir_test_doubles/stub_buffer_stream.h (+1/-0) tests/integration-tests/CMakeLists.txt (+1/-0) tests/integration-tests/surface_composition.cpp (+125/-0) tests/integration-tests/test_exchange_buffer.cpp (+1/-0) tests/unit-tests/compositor/test_buffer_queue.cpp (+21/-0) |
To merge this branch: | bzr merge lp:~mir-team/mir/fix-1376324-0.8 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Cemil Azizoglu (community) | Approve | ||
Robert Carr (community) | Approve | ||
Review via email: mp+246280@code.launchpad.net |
Commit message
Backport fix for USC crash LP: #1376324
Description of the change
Because if you look closely, it's still crashing for RTM devices (Mir 0.8.0) that lack the fix:
https:/
Look closer again and you'll see evidence of vivid (Mir 0.9 devices) crashing too. But I think that's actually a different bug with the same basic signature -> bug 1401488 that only exists in 0.9 and later.
So in theory, this fix is all that's needed for 0.8 and RTM.
To post a comment you must log in.
Yeah I know it's probably too late for 0.8.1 now we have a revision in QA already. This might be a good idea for 0.8.2 later though.
Discuss.