gpu: Export/import buffers created by Ozone GMB factory.

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 125 matching lines @@
 scoped_refptr<GbmBuffer> GbmBuffer::CreateBufferFromFds(
     const scoped_refptr<GbmDevice>& gbm,
     gfx::BufferFormat format,
     const gfx::Size& size,
     std::vector<base::ScopedFD>&& fds,
     const std::vector<int>& strides,
     const std::vector<int>& offsets) {
   TRACE_EVENT2("drm", "GbmBuffer::CreateBufferFromFD", "device",
                gbm->device_path().value(), "size", size.ToString());
   DCHECK_EQ(fds.size(), strides.size());
-  // 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(fds), size, strides, offsets));
+  DCHECK_EQ(fds.size(), 1u);
+  DCHECK_EQ(offsets[0], 0u);
+
+  struct gbm_import_fd_data fd_data;
+  fd_data.fd = fds[0].get();
+  fd_data.width = size.width();
+  fd_data.height = size.height();
+  fd_data.stride = strides[0];
+  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(fds), size, strides, offsets));
+  if (use_scanout && !buffer->GetFramebufferId())

[Daniele Castagna, 2016/06/16 21:14:26]

nit: I'd add a comment explaning why the !framebufferid check.

[reveman, 2016/06/16 21:46:20]

Added a comment. The check is consistent with GbmBuffer::CreateBuffer and we
can't crash here as the buffer might come from an untrusted client.

+    return nullptr;
+
+  return buffer;
 }
 
 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 96 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