Gitiles
Code Review Sign In
gerrit.omnirom.org / android_external_drm_hwcomposer / b4cf01b8eab70b554b3ddcad10cade7b6f0ffe0f
commitb4cf01b8eab70b554b3ddcad10cade7b6f0ffe0f[log] [tgz]
authorSean Paul <seanpaul@chromium.org>Wed Jun 22 22:48:22 2016 -0400
committerSean Paul <seanpaul@chromium.org>Thu Jun 23 00:01:26 2016 -0400
treef7f588249aedc426a205e70755e067aee9b511ce
parent8cc4e2a2de3c0cf932226a5a6042de5d830fa24a [diff]
DO NOT MERGE: drm_hwcomposer: On error, free active composition

If we drop a frame while compositing, free the active composition.

Assume a frame pipeline of A->B->A. If we drop frame B, it will become
the active composition, which means the fences for A will not be released,
causing us to block A on A --> DEADLOCK.

BUG=b/29122961
TEST=Tested on smaug, no longer hangs

Change-Id: I98817bb361f1d0669395ddac5d96cf4f19d4b26a
Signed-off-by: Sean Paul <seanpaul@chromium.org>
(cherry picked from commit 137a6a8e9bea5c90a6832e9ed3e630f47041ab15)
Signed-off-by: Sean Paul <seanpaul@chromium.org>
2 files changed
tree: f7f588249aedc426a205e70755e067aee9b511ce
  1. .clang-format
  2. Android.mk
  3. autofd.h
  4. autogl.h
  5. autolock.cpp
  6. autolock.h
  7. drmcomposition.cpp
  8. drmcomposition.h
  9. drmcompositor.cpp
  10. drmcompositor.h
  11. drmcompositorworker.cpp
  12. drmcompositorworker.h
  13. drmconnector.cpp
  14. drmconnector.h
  15. drmcrtc.cpp
  16. drmcrtc.h
  17. drmdisplaycomposition.cpp
  18. drmdisplaycomposition.h
  19. drmdisplaycompositor.cpp
  20. drmdisplaycompositor.h
  21. drmencoder.cpp
  22. drmencoder.h
  23. drmeventlistener.cpp
  24. drmeventlistener.h
  25. drmframebuffer.h
  26. drmhwcgralloc.h
  27. drmhwcomposer.h
  28. drmmode.cpp
  29. drmmode.h
  30. drmplane.cpp
  31. drmplane.h
  32. drmproperty.cpp
  33. drmproperty.h
  34. drmresources.cpp
  35. drmresources.h
  36. glworker.cpp
  37. glworker.h
  38. hwcomposer.cpp
  39. OWNERS
  40. platform.cpp
  41. platform.h
  42. platformdrmgeneric.cpp
  43. platformdrmgeneric.h
  44. platformnv.cpp
  45. platformnv.h
  46. separate_rects.cpp
  47. separate_rects.h
  48. virtualcompositorworker.cpp
  49. virtualcompositorworker.h
  50. vsyncworker.cpp
  51. vsyncworker.h
  52. worker.cpp
  53. worker.h