ozone: gbm: Add overlay support

ui/ozone/platform/dri/hardware_display_controller.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/ozone/platform/dri/hardware_display_controller.h"
 
 #include <drm.h>
 #include <errno.h>
 #include <string.h>
 #include <xf86drm.h>
 
 #include "base/basictypes.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/time/time.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/ozone/platform/dri/dri_buffer.h"
 #include "ui/ozone/platform/dri/dri_wrapper.h"
 #include "ui/ozone/platform/dri/scanout_surface.h"
+#include "ui/ozone/public/native_pixmap.h"
 
 namespace ui {
 
 namespace {
 
 // DRM callback on page flip events. This callback is triggered after the
 // page flip has happened and the backbuffer is now the new frontbuffer
 // The old frontbuffer is no longer used by the hardware and can be used for
 // future draw operations.
 //
@@ skipping 73 matching lines @@
   }
 
   return true;
 }
 
 void HardwareDisplayController::Disable() {
   drm_->SetCrtc(crtc_id_, 0, 0, NULL);
   is_disabled_ = true;
 }
 
-bool HardwareDisplayController::SchedulePageFlip() {
-  CHECK(surface_);
-  if (!is_disabled_ && !drm_->PageFlip(crtc_id_,
-                                       surface_->GetFramebufferId(),
-                                       this)) {
+ScanoutSurface* HardwareDisplayController::AssignOverlayPlanes(
+    std::vector<OzoneOverlayPlane>* overlays) {

[alexst (slow to review), 2014/07/08 17:22:32]

If you are not modifying this vector please pass it as const ref.

+  ScanoutSurface* primary = surface_.get();
+  if (!overlays)
+    return primary;
+  for (size_t i = 0; i < overlays->size(); i++) {
+    const OzoneOverlayPlane& plane = (*overlays)[i];
+    if (plane.z_order == 0) {
+      primary = plane.scanout;
+    } else {
+      // TODO: assign overlay planes.
+    }
+  }
+
+  return primary;
+}
+
+bool HardwareDisplayController::SchedulePageFlip(
+    std::vector<OzoneOverlayPlane>* overlays,
+    std::vector<scoped_refptr<NativePixmap> >* references) {
+  ScanoutSurface* primary = AssignOverlayPlanes(overlays);

[alexst (slow to review), 2014/07/08 17:22:32]

This is only dealing with one plane right now, can you rename it to something
like GetPrimaryPlane?

[achaulk, 2014/07/08 18:16:37]

Alright, but why make more work for the future when we want to change it back?

+  CHECK(primary);
+
+  primary->PreSwapBuffers();
+
+  if (!is_disabled_ &&
+      !drm_->PageFlip(crtc_id_, primary->GetFramebufferId(), this)) {
     LOG(ERROR) << "Cannot page flip: " << strerror(errno);
     return false;
   }
 
+  if (overlays) {
+    CHECK(references);
+    current_overlay_references_.clear();
+    current_overlay_references_.swap(*references);
+
+    for (size_t i = 0; i < overlays->size(); i++) {
+      const OzoneOverlayPlane& plane = (*overlays)[i];
+      if (!plane.overlay_plane)
+        continue;
+      if (!drm_->PageFlipOverlay(crtc_id_,
+                                 plane.scanout->GetFramebufferId(),
+                                 plane.display_bounds,
+                                 plane.crop_rect,
+                                 plane.overlay_plane)) {
+        LOG(ERROR) << "Cannot display on overlay: " << strerror(errno);
+        return false;
+      }
+    }
+  }
+
   return true;
 }
 
 void HardwareDisplayController::WaitForPageFlipEvent() {
   TRACE_EVENT0("dri", "WaitForPageFlipEvent");
 
   if (is_disabled_)
     return;
 
   drmEventContext drm_event;
@@ skipping 29 matching lines @@
 }
 
 bool HardwareDisplayController::MoveCursor(const gfx::Point& location) {
   if (is_disabled_)
     return true;
 
   return drm_->MoveCursor(crtc_id_, location.x(), location.y());
 }
 
 }  // namespace ui