diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-05-06 05:34:52 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-06 05:34:52 +0000 |
commit | d3897fd9fb65021b651e9a753093b531fed91d45 (patch) | |
tree | 0068dd0351f2e33ec9b57372f41473490d0768bf | |
parent | 1df91541ff9617dd299407cbfae9ffb96db40086 (diff) | |
parent | 96334c56f6a7ec5c6a1a41d06df6316de81579f6 (diff) | |
download | crosvm-d3897fd9fb65021b651e9a753093b531fed91d45.tar.gz |
Merge "Not remove surface when resource_id is 0" am: 96334c56f6
Original change: https://android-review.googlesource.com/c/platform/external/crosvm/+/1696174
Change-Id: I2f0c2bc1ea6308164cdd37ab172edfaa915ec5fc
-rw-r--r-- | devices/src/virtio/gpu/virtio_gpu.rs | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/devices/src/virtio/gpu/virtio_gpu.rs b/devices/src/virtio/gpu/virtio_gpu.rs index 00086903a..2e7abb32d 100644 --- a/devices/src/virtio/gpu/virtio_gpu.rs +++ b/devices/src/virtio/gpu/virtio_gpu.rs @@ -215,14 +215,13 @@ impl VirtioGpu { scanout_data: Option<VirtioScanoutBlobData>, ) -> VirtioGpuResult { let mut display = self.display.borrow_mut(); - if resource_id == 0 { - if let Some(surface_id) = self.scanout_surface_id.take() { - display.release_surface(surface_id); - } - self.scanout_resource_id = None; - return Ok(OkNoData); - } - + /// b/186580833. + /// Remove the part of deleting surface when resource_id is 0. + /// This is a workaround to solve the issue of black display. + /// Observation is when Surfaceflinger falls back to client composition, + /// host receives set_scanout 0 0, and then set scanout 0 <some valid resid>. + /// The first 0 0 removes the surface, the second creates a new surface + /// with id++, which will be more than 0 and be ignorned in vnc or webrtc let resource = self .resources .get_mut(&resource_id) |