| Index: ui/ozone/platform/dri/hardware_display_controller.cc
|
| diff --git a/ui/ozone/platform/dri/hardware_display_controller.cc b/ui/ozone/platform/dri/hardware_display_controller.cc
|
| index c7c3b7c00b25411f73bc86418b1cb91e2c4de231..82797497e78db9cdd0812bd4997beb38d0302e8a 100644
|
| --- a/ui/ozone/platform/dri/hardware_display_controller.cc
|
| +++ b/ui/ozone/platform/dri/hardware_display_controller.cc
|
| @@ -40,9 +40,6 @@ HardwareDisplayController::BindSurfaceToController(
|
| scoped_ptr<DriSurface> surface, drmModeModeInfo mode) {
|
| CHECK(surface);
|
|
|
| - if (!RegisterFramebuffers(surface.get(), mode))
|
| - return false;
|
| -
|
| if (!drm_->SetCrtc(crtc_id_,
|
| surface->GetFramebufferId(),
|
| &connector_id_,
|
| @@ -59,8 +56,6 @@ HardwareDisplayController::BindSurfaceToController(
|
| }
|
|
|
| void HardwareDisplayController::UnbindSurfaceFromController() {
|
| - if (surface_)
|
| - UnregisterFramebuffers(surface_.get());
|
| surface_.reset();
|
| }
|
|
|
| @@ -104,33 +99,4 @@ bool HardwareDisplayController::MoveCursor(const gfx::Point& location) {
|
| return drm_->MoveCursor(crtc_id_, location.x(), location.y());
|
| }
|
|
|
| -bool HardwareDisplayController::RegisterFramebuffers(DriSurface* surface,
|
| - drmModeModeInfo mode) {
|
| - // Register the buffers.
|
| - for (size_t i = 0; i < arraysize(surface->bitmaps_); ++i) {
|
| - uint32_t fb_id;
|
| - if (!drm_->AddFramebuffer(
|
| - mode,
|
| - surface->bitmaps_[i]->GetColorDepth(),
|
| - surface->bitmaps_[i]->canvas()->imageInfo().bytesPerPixel() << 3,
|
| - surface->bitmaps_[i]->stride(),
|
| - surface->bitmaps_[i]->handle(),
|
| - &fb_id)) {
|
| - DLOG(ERROR) << "Failed to register framebuffer: " << strerror(errno);
|
| - return false;
|
| - }
|
| - surface->bitmaps_[i]->set_framebuffer(fb_id);
|
| - }
|
| -
|
| - return true;
|
| -}
|
| -
|
| -void HardwareDisplayController::UnregisterFramebuffers(DriSurface* surface) {
|
| - // Unregister the buffers.
|
| - for (size_t i = 0; i < arraysize(surface->bitmaps_); ++i) {
|
| - if (!drm_->RemoveFramebuffer(surface->bitmaps_[i]->framebuffer()))
|
| - DLOG(ERROR) << "Failed to remove FB: " << strerror(errno);
|
| - }
|
| -}
|
| -
|
| } // namespace ui
|
|
|