ozone: drm: Restore cursor in CrtcController::Modeset

ui/ozone/platform/drm/gpu/crtc_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/drm/gpu/crtc_controller.h"
 
 #include "base/logging.h"
 #include "base/time/time.h"
 #include "ui/ozone/platform/drm/gpu/drm_device.h"
 #include "ui/ozone/platform/drm/gpu/page_flip_observer.h"
 #include "ui/ozone/platform/drm/gpu/scanout_buffer.h"
 
 namespace ui {
 
 CrtcController::CrtcController(const scoped_refptr<DrmDevice>& drm,
                                uint32_t crtc,
                                uint32_t connector)
     : drm_(drm),
       crtc_(crtc),
       connector_(connector),
       saved_crtc_(drm->GetCrtc(crtc)),
       is_disabled_(true),
       page_flip_pending_(false),
       time_of_last_flip_(0) {
 }
 
 CrtcController::~CrtcController() {
   if (!is_disabled_) {
     drm_->SetCrtc(saved_crtc_.get(), std::vector<uint32_t>(1, connector_));
-    UnsetCursor();
+    SetCursor(nullptr);
   }
 }
 
 bool CrtcController::Modeset(const OverlayPlane& plane, drmModeModeInfo mode) {
   if (!drm_->SetCrtc(crtc_, plane.buffer->GetFramebufferId(),
                      std::vector<uint32_t>(1, connector_), &mode)) {
     PLOG(ERROR) << "Failed to modeset: crtc=" << crtc_
                 << " connector=" << connector_
                 << " framebuffer_id=" << plane.buffer->GetFramebufferId()
                 << " mode=" << mode.hdisplay << "x" << mode.vdisplay << "@"
                 << mode.vrefresh;
     return false;
   }
 
   mode_ = mode;
   pending_planes_.clear();
   is_disabled_ = false;
 
   // drmModeSetCrtc has an immediate effect, so we can assume that the current
   // planes have been updated. However if a page flip is still pending, set the
   // pending planes to the same values so that the callback keeps the correct
   // state.
   current_planes_ = std::vector<OverlayPlane>(1, plane);
   if (page_flip_pending_)
     pending_planes_ = current_planes_;
 
+  if (!ResetCursor())
+    return false;
+
   return true;
 }
 
 bool CrtcController::Disable() {
   if (is_disabled_)
     return true;
 
   is_disabled_ = true;
   return drm_->DisableCrtc(crtc_);
 }
@@ skipping 44 matching lines @@
       static_cast<uint64_t>(seconds) * base::Time::kMicrosecondsPerSecond +
       useconds;
 
   current_planes_.clear();
   current_planes_.swap(pending_planes_);
 
   FOR_EACH_OBSERVER(PageFlipObserver, observers_, OnPageFlipEvent());
 }
 
 bool CrtcController::SetCursor(const scoped_refptr<ScanoutBuffer>& buffer) {
-  DCHECK(!is_disabled_);
+  DCHECK(!is_disabled_ || !buffer);
   cursor_buffer_ = buffer;
-  return drm_->SetCursor(crtc_, buffer->GetHandle(), buffer->GetSize());
-}
 
-bool CrtcController::UnsetCursor() {
-  bool state = drm_->SetCursor(crtc_, 0, gfx::Size());
-  cursor_buffer_ = NULL;
-  return state;
+  return ResetCursor();
 }
 
 bool CrtcController::MoveCursor(const gfx::Point& location) {
   DCHECK(!is_disabled_);
   return drm_->MoveCursor(crtc_, location);
 }
 
 void CrtcController::AddObserver(PageFlipObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void CrtcController::RemoveObserver(PageFlipObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
+bool CrtcController::ResetCursor() {
+  uint32_t handle = 0;
+  gfx::Size size;
+
+  if (cursor_buffer_) {
+    handle = cursor_buffer_->GetHandle();
+    size = cursor_buffer_->GetSize();
+  }
+
+  bool status = drm_->SetCursor(crtc_, handle, size);
+  if (!status) {
+    PLOG(ERROR) << "drmModeSetCursor: device " << drm_->device_path().value()
+                << " crtc " << crtc_ << " handle " << handle << " size "
+                << size.ToString();
+  }
+
+  return status;
+}
+
 }  // namespace ui