Reland of: [Ozone-GBM] Handle GPU crashes

ui/ozone/platform/dri/screen_manager.cc

Index: ui/ozone/platform/dri/screen_manager.cc
diff --git a/ui/ozone/platform/dri/screen_manager.cc b/ui/ozone/platform/dri/screen_manager.cc
index fa0ad3de760d58d160e0a7a10dea1017538dde0f..440071112f4152b20081186b290b31a429eaa512 100644
--- a/ui/ozone/platform/dri/screen_manager.cc
+++ b/ui/ozone/platform/dri/screen_manager.cc
@@ -24,6 +24,21 @@ ScreenManager::ScreenManager(DriWrapper* dri,
 ScreenManager::~ScreenManager() {
 }
 
+void ScreenManager::AddDisplayController(uint32_t crtc, uint32_t connector) {
+  HardwareDisplayControllers::iterator it = FindDisplayController(crtc);
+  // TODO(dnicoara): Turn this into a DCHECK when async display configuration is
+  // properly supported. (When there can't be a race between forcing initial
+  // display configuration in ScreenManager and NativeDisplayDelegate creating
+  // the display controllers.)
+  if (it != controllers_.end()) {
+    LOG(WARNING) << "Display controller (crtc=" << crtc << ") already present.";
+    return;
+  }
+
+  controllers_.push_back(new HardwareDisplayController(
+      dri_, scoped_ptr<CrtcState>(new CrtcState(dri_, crtc, connector))));
+}
+
 void ScreenManager::RemoveDisplayController(uint32_t crtc) {
   HardwareDisplayControllers::iterator it = FindDisplayController(crtc);
   if (it != controllers_.end()) {
@@ -41,48 +56,34 @@ bool ScreenManager::ConfigureDisplayController(uint32_t crtc,
   gfx::Rect modeset_bounds(
       origin.x(), origin.y(), mode.hdisplay, mode.vdisplay);
   HardwareDisplayControllers::iterator it = FindDisplayController(crtc);
-  HardwareDisplayController* controller = NULL;
-  if (it != controllers_.end()) {
-    controller = *it;
-    // If nothing changed just enable the controller. Note, we perform an exact
-    // comparison on the mode since the refresh rate may have changed.
-    if (SameMode(mode, controller->get_mode()) &&
-        origin == controller->origin() && !controller->IsDisabled())
-      return controller->Enable();
-
-    // Either the mode or the location of the display changed, so exit mirror
-    // mode and configure the display independently. If the caller still wants
-    // mirror mode, subsequent calls configuring the other controllers will
-    // restore mirror mode.
-    if (controller->IsMirrored()) {
-      controller =
-          new HardwareDisplayController(dri_, controller->RemoveCrtc(crtc));
-      controllers_.push_back(controller);
-      it = --controllers_.end();
-    }
-
-    HardwareDisplayControllers::iterator mirror =
-        FindActiveDisplayControllerByLocation(modeset_bounds);
-    // Handle mirror mode.
-    if (mirror != controllers_.end() && it != mirror)
-      return HandleMirrorMode(it, mirror, crtc, connector);
-  } else {
-    HardwareDisplayControllers::iterator mirror =
-        FindActiveDisplayControllerByLocation(modeset_bounds);
-    if (mirror != controllers_.end()) {
-      (*mirror)->AddCrtc(
-          scoped_ptr<CrtcState>(new CrtcState(dri_, crtc, connector)));
-      return (*mirror)->Enable();
-    }
-  }
-
-  if (!controller) {
-    controller = new HardwareDisplayController(
-        dri_,
-        scoped_ptr<CrtcState>(new CrtcState(dri_, crtc, connector)));
+  DCHECK(controllers_.end() != it) << "Display controller (crtc=" << crtc
+                                   << ") doesn't exist.";
+
+  HardwareDisplayController* controller = *it;
+  controller = *it;
+  // If nothing changed just enable the controller. Note, we perform an exact
+  // comparison on the mode since the refresh rate may have changed.
+  if (SameMode(mode, controller->get_mode()) &&
+      origin == controller->origin() && !controller->IsDisabled())
+    return controller->Enable();
+
+  // Either the mode or the location of the display changed, so exit mirror
+  // mode and configure the display independently. If the caller still wants
+  // mirror mode, subsequent calls configuring the other controllers will
+  // restore mirror mode.
+  if (controller->IsMirrored()) {
+    controller =
+        new HardwareDisplayController(dri_, controller->RemoveCrtc(crtc));
     controllers_.push_back(controller);
+    it = --controllers_.end();

[spang, 2014/09/09 14:44:25]

This is subtle and isn't guaranteed to work.

it = controllers_.end() - 1;

or

it = controllers_.end();
--it;

[dnicoara, 2014/09/09 15:10:00]

Done.

   }
 
+  HardwareDisplayControllers::iterator mirror =
+      FindActiveDisplayControllerByLocation(modeset_bounds);
+  // Handle mirror mode.
+  if (mirror != controllers_.end() && it != mirror)
+    return HandleMirrorMode(it, mirror, crtc, connector);
+
   return ModesetDisplayController(controller, origin, mode);
 }
 
@@ -116,6 +117,12 @@ base::WeakPtr<HardwareDisplayController> ScreenManager::GetDisplayController(
   if (it != controllers_.end())
     return (*it)->AsWeakPtr();
 
+  // If no active controllers then pick the first controller at the location.
+  // TODO(dnicoara): Remove once async display configuration is fully supported.
+  it = FindDisplayControllerByLocation(bounds);
+  if (it != controllers_.end())
+    return (*it)->AsWeakPtr();
+
   return base::WeakPtr<HardwareDisplayController>();
 }
 
@@ -146,6 +153,21 @@ ScreenManager::FindActiveDisplayControllerByLocation(const gfx::Rect& bounds) {
   return controllers_.end();
 }
 
+ScreenManager::HardwareDisplayControllers::iterator
+ScreenManager::FindDisplayControllerByLocation(const gfx::Rect& bounds) {
+  for (HardwareDisplayControllers::iterator it = controllers_.begin();
+       it != controllers_.end();
+       ++it) {
+    gfx::Rect controller_bounds((*it)->origin(), (*it)->GetModeSize());
+    // We don't perform a strict check since content_shell will have windows
+    // smaller than the display size.
+    if (controller_bounds.Contains(bounds))
+      return it;
+  }
+
+  return controllers_.end();
+}
+
 void ScreenManager::ForceInitializationOfPrimaryDisplay() {
   LOG(WARNING) << "Forcing initialization of primary display.";
   ScopedVector<HardwareDisplayControllerInfo> displays =
@@ -160,6 +182,8 @@ void ScreenManager::ForceInitializationOfPrimaryDisplay() {
                       dpms->prop_id,
                       DRM_MODE_DPMS_ON);
 
+  AddDisplayController(displays[0]->crtc()->crtc_id,
+                       displays[0]->connector()->connector_id);
   ConfigureDisplayController(displays[0]->crtc()->crtc_id,
                              displays[0]->connector()->connector_id,
                              gfx::Point(),