ozone: Avoid using gbm_bo_import until import and destroy can be synchronized.

ui/ozone/platform/drm/gpu/gbm_buffer.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/gbm_buffer.h"
 
 #include <drm.h>
 #include <fcntl.h>
 #include <gbm.h>
 #include <xf86drm.h>
@@ skipping 11 matching lines @@
 #include "ui/ozone/platform/drm/gpu/gbm_surfaceless.h"
 #include "ui/ozone/public/ozone_platform.h"
 #include "ui/ozone/public/surface_factory_ozone.h"
 
 namespace ui {
 
 GbmBuffer::GbmBuffer(const scoped_refptr<GbmDevice>& gbm,
                      gbm_bo* bo,
                      gfx::BufferFormat format,
                      gfx::BufferUsage usage,
-                     base::ScopedFD fd)
+                     base::ScopedFD fd,
+                     int stride)
     : GbmBufferBase(gbm, bo, format, usage),
       format_(format),
       usage_(usage),
-      fd_(std::move(fd)) {}
+      fd_(std::move(fd)),
+      stride_(stride) {}
 
 GbmBuffer::~GbmBuffer() {
   if (bo())
     gbm_bo_destroy(bo());
 }
 
 int GbmBuffer::GetFd() const {
   return fd_.get();
 }
 
 int GbmBuffer::GetStride() const {
-  return gbm_bo_get_stride(bo());
+  return stride_;
 }
 
 // static
 scoped_refptr<GbmBuffer> GbmBuffer::CreateBuffer(
     const scoped_refptr<GbmDevice>& gbm,
     gfx::BufferFormat format,
     const gfx::Size& size,
     gfx::BufferUsage usage) {
   TRACE_EVENT2("drm", "GbmBuffer::CreateBuffer", "device",
                gbm->device_path().value(), "size", size.ToString());
@@ skipping 18 matching lines @@
 
   // The fd returned by gbm_bo_get_fd is not ref-counted and need to be
   // kept open for the lifetime of the buffer.
   base::ScopedFD fd(gbm_bo_get_fd(bo));
   if (!fd.is_valid()) {
     PLOG(ERROR) << "Failed to export buffer to dma_buf";
     gbm_bo_destroy(bo);
     return nullptr;
   }
 
-  scoped_refptr<GbmBuffer> buffer(
-      new GbmBuffer(gbm, bo, format, usage, std::move(fd)));
+  scoped_refptr<GbmBuffer> buffer(new GbmBuffer(
+      gbm, bo, format, usage, std::move(fd), gbm_bo_get_stride(bo)));
   if (usage == gfx::BufferUsage::SCANOUT && !buffer->GetFramebufferId())
     return nullptr;
 
   return buffer;
 }
 
 // static
 scoped_refptr<GbmBuffer> GbmBuffer::CreateBufferFromFD(
     const scoped_refptr<GbmDevice>& gbm,
     gfx::BufferFormat format,
     const gfx::Size& size,
     base::ScopedFD fd,
     int stride) {
   TRACE_EVENT2("drm", "GbmBuffer::CreateBufferFromFD", "device",
                gbm->device_path().value(), "size", size.ToString());
 
-  struct gbm_import_fd_data fd_data;
-  fd_data.fd = fd.get();
-  fd_data.width = size.width();
-  fd_data.height = size.height();
-  fd_data.stride = stride;
-  fd_data.format = GetFourCCFormatFromBufferFormat(format);
-
-  // Use scanout if supported.
-  const std::vector<uint32_t>& scanout_formats =
-      gbm->plane_manager()->GetSupportedFormats();
-  bool use_scanout = std::find(scanout_formats.begin(), scanout_formats.end(),
-                               fd_data.format) != scanout_formats.end();
-  unsigned flags = 0;
-  if (use_scanout)
-    flags = GBM_BO_USE_SCANOUT | GBM_BO_USE_RENDERING;
-
-  // The fd passed to gbm_bo_import is not ref-counted and need to be
-  // kept open for the lifetime of the buffer.
-  gbm_bo* bo = gbm_bo_import(gbm->device(), GBM_BO_IMPORT_FD, &fd_data, flags);
-  if (!bo)
-    return nullptr;
-
-  scoped_refptr<GbmBuffer> buffer(new GbmBuffer(
-      gbm, bo, format,
-      use_scanout ? gfx::BufferUsage::SCANOUT : gfx::BufferUsage::GPU_READ,
-      std::move(fd)));
-  if (use_scanout && !buffer->GetFramebufferId())
-    return nullptr;
-
-  return buffer;
+  // TODO(reveman): Use gbm_bo_import after making buffers survive
+  // GPU process crashes. crbug.com/597932
+  return make_scoped_refptr(new GbmBuffer(
+      gbm, nullptr, format, gfx::BufferUsage::GPU_READ, std::move(fd), stride));
 }
 
 GbmPixmap::GbmPixmap(GbmSurfaceFactory* surface_manager,
                      const scoped_refptr<GbmBuffer>& buffer)
     : surface_manager_(surface_manager), buffer_(buffer) {}
 
 void GbmPixmap::SetProcessingCallback(
     const ProcessingCallback& processing_callback) {
   DCHECK(processing_callback_.is_null());
   processing_callback_ = processing_callback;
@@ skipping 78 matching lines @@
   DCHECK(!processing_callback_.is_null());
   if (!processing_callback_.Run(this, processed_pixmap_)) {
     LOG(ERROR) << "Failed processing NativePixmap";
     return nullptr;
   }
 
   return processed_pixmap_->buffer();
 }
 
 }  // namespace ui