Clean up HWC state when releasing a DisplayDevice
DisplayDevices can be released when DisplayManager removes them from
the display list, or (for virtual displays) when the surface is set to
NULL. We were only cleaning up HWC resources associated with the
display in the first case.
Bug: 8384764
Change-Id: Id3d226dd7178fbe6d0a2ac4e2660b864ee073de3
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 0a210f7..ed6574a 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -1102,12 +1102,14 @@
// Call makeCurrent() on the primary display so we can
// be sure that nothing associated with this display
// is current.
- const sp<const DisplayDevice> hw(getDefaultDisplayDevice());
- DisplayDevice::makeCurrent(mEGLDisplay, hw, mEGLContext);
- mDisplays.removeItem(draw.keyAt(i));
- getHwComposer().disconnectDisplay(draw[i].type);
+ const sp<const DisplayDevice> defaultDisplay(getDefaultDisplayDevice());
+ DisplayDevice::makeCurrent(mEGLDisplay, defaultDisplay, mEGLContext);
+ sp<DisplayDevice> hw(getDisplayDevice(draw.keyAt(i)));
+ if (hw != NULL)
+ hw->disconnect(getHwComposer());
if (draw[i].type < DisplayDevice::NUM_DISPLAY_TYPES)
mEventThread->onHotplugReceived(draw[i].type, false);
+ mDisplays.removeItem(draw.keyAt(i));
} else {
ALOGW("trying to remove the main display");
}
@@ -1120,6 +1122,9 @@
// recreating the DisplayDevice, so we just remove it
// from the drawing state, so that it get re-added
// below.
+ sp<DisplayDevice> hw(getDisplayDevice(display));
+ if (hw != NULL)
+ hw->disconnect(getHwComposer());
mDisplays.removeItem(display);
mDrawingState.displays.removeItemsAt(i);
dc--; i--;
@@ -1150,9 +1155,13 @@
const DisplayDeviceState& state(curr[i]);
sp<DisplaySurface> dispSurface;
- int32_t hwcDisplayId = allocateHwcDisplayId(state.type);
+ int32_t hwcDisplayId = -1;
if (state.isVirtualDisplay()) {
+ // Virtual displays without a surface are dormant:
+ // they have external state (layer stack, projection,
+ // etc.) but no internal state (i.e. a DisplayDevice).
if (state.surface != NULL) {
+ hwcDisplayId = allocateHwcDisplayId(state.type);
dispSurface = new VirtualDisplaySurface(
*mHwc, hwcDisplayId, state.surface,
state.displayName);
@@ -1162,7 +1171,7 @@
"adding a supported display, but rendering "
"surface is provided (%p), ignoring it",
state.surface.get());
-
+ hwcDisplayId = allocateHwcDisplayId(state.type);
// for supported (by hwc) displays we provide our
// own rendering surface
dispSurface = new FramebufferSurface(*mHwc, state.type);