Commit e211720a authored by Daniele Castagna's avatar Daniele Castagna Committed by Commit Bot

ozone: Avoid scheduling an invalid framebuffer

AddFramebuffer2 can fail for buffers coming via exo.
We should not use an invalid fb when pageflipping in those cases
otherwise the GPU process will crash.

Bug: 779356
Test: wayland_simple_client with crrev.com/c/1056018
Change-Id: I179ce2ddbe1fb5080f9d00989ccf96ddf3f94d68
Reviewed-on: https://chromium-review.googlesource.com/1056017Reviewed-by: default avatarDavid Reveman <reveman@chromium.org>
Commit-Queue: Daniele Castagna <dcastagna@chromium.org>
Cr-Commit-Position: refs/heads/master@{#558140}
parent 0c07cb9a
...@@ -390,9 +390,11 @@ bool GbmPixmap::ScheduleOverlayPlane(gfx::AcceleratedWidget widget, ...@@ -390,9 +390,11 @@ bool GbmPixmap::ScheduleOverlayPlane(gfx::AcceleratedWidget widget,
gfx::GpuFence* gpu_fence) { gfx::GpuFence* gpu_fence) {
DCHECK(buffer_->GetFlags() & GBM_BO_USE_SCANOUT); DCHECK(buffer_->GetFlags() & GBM_BO_USE_SCANOUT);
surface_manager_->GetSurface(widget)->QueueOverlayPlane( if (buffer_->GetFramebufferId()) {
OverlayPlane(buffer_, plane_z_order, plane_transform, display_bounds, surface_manager_->GetSurface(widget)->QueueOverlayPlane(
crop_rect, enable_blend, base::kInvalidPlatformFile)); OverlayPlane(buffer_, plane_z_order, plane_transform, display_bounds,
crop_rect, enable_blend, base::kInvalidPlatformFile));
}
return true; return true;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment