Ozone GBM: support R_8 format to GpuMemoryBuffers

ui/ozone/platform/drm/common/drm_util.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/common/drm_util.h"
 
 #include <drm_fourcc.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <sys/mman.h>
 #include <xf86drmMode.h>
 #include <utility>
 
 #include "ui/display/util/edid_parser.h"
 
 #if !defined(DRM_MODE_CONNECTOR_DSI)
 #define DRM_MODE_CONNECTOR_DSI 16
 #endif
 
+// TODO(dshwang): after most linux and libdrm has this definition, remove it.
+#define DRM_FORMAT_R8 fourcc_code('R', '8', ' ', ' ')

[dnicoara, 2016/04/07 15:57:16]

Surround it with #if-defs to avoid warnings when it is added to libdrm.

[dshwang, 2016/04/07 17:35:55]

Done. guard by #ifndef DRM_FORMAT_R8

+
 namespace ui {
 
 namespace {
 
 bool IsCrtcInUse(uint32_t crtc,
                  const ScopedVector<HardwareDisplayControllerInfo>& displays) {
   for (size_t i = 0; i < displays.size(); ++i) {
     if (crtc == displays[i]->crtc()->crtc_id)
       return true;
   }
@@ skipping 254 matching lines @@
   if (!params.has_native_mode && !params.modes.empty()) {
     params.has_native_mode = true;
     params.native_mode = params.modes.front();
   }
 
   return params;
 }
 
 int GetFourCCFormatFromBufferFormat(gfx::BufferFormat format) {
   switch (format) {
+    case gfx::BufferFormat::R_8:
+      return DRM_FORMAT_R8;
     case gfx::BufferFormat::RGBA_8888:
       return DRM_FORMAT_ABGR8888;
     case gfx::BufferFormat::RGBX_8888:
       return DRM_FORMAT_XBGR8888;
     case gfx::BufferFormat::BGRA_8888:
       return DRM_FORMAT_ARGB8888;
     case gfx::BufferFormat::BGRX_8888:
       return DRM_FORMAT_XRGB8888;
     case gfx::BufferFormat::UYVY_422:
       return DRM_FORMAT_UYVY;
     default:
       NOTREACHED();
       return 0;
   }
 }
 
 gfx::BufferFormat GetBufferFormatFromFourCCFormat(int format) {
   switch (format) {
+    case DRM_FORMAT_R8:
+      return gfx::BufferFormat::R_8;
     case DRM_FORMAT_ABGR8888:
       return gfx::BufferFormat::RGBA_8888;
     case DRM_FORMAT_XBGR8888:
       return gfx::BufferFormat::RGBX_8888;
     case DRM_FORMAT_ARGB8888:
       return gfx::BufferFormat::BGRA_8888;
     case DRM_FORMAT_XRGB8888:
       return gfx::BufferFormat::BGRX_8888;
     case DRM_FORMAT_UYVY:
       return gfx::BufferFormat::UYVY_422;
     default:
       NOTREACHED();
       return gfx::BufferFormat::BGRA_8888;
   }
 }
 
 int GetFourCCFormatForFramebuffer(gfx::BufferFormat format) {

[dnicoara, 2016/04/07 15:57:16]

Shouldn't you add the format in here as well?

[dshwang, 2016/04/07 17:35:55]

This function is for scanout buffer, which is used for hardware overlay.
All vendor's DRM in kernel don't support hardware overlay for R8 and GR8.

   // Currently, drm supports 24 bitcolordepth for hardware overlay.
   switch (format) {
     case gfx::BufferFormat::RGBA_8888:
     case gfx::BufferFormat::RGBX_8888:
       return DRM_FORMAT_XBGR8888;
     case gfx::BufferFormat::BGRA_8888:
     case gfx::BufferFormat::BGRX_8888:
       return DRM_FORMAT_XRGB8888;
     case gfx::BufferFormat::UYVY_422:
       return DRM_FORMAT_UYVY;
     default:
       NOTREACHED();
       return 0;
   }
 }
 }  // namespace ui