ui: gbm_wrapper: use gbm_bo_map2

We'll eventually go back to gbm_bo_map and hopefully get rid of the
ifdef statements.

BUG=b:145747350
TEST=CQ will test

Change-Id: I70f0c4f947886f32cc533cebbdf1649bb62c1e01
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2088796Reviewed-by: Daniele Castagna <dcastagna@chromium.org>
Commit-Queue: Gurchetan Singh <gurchetansingh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#749345}

DEPS

@@ -1108,7 +1108,7 @@ deps = {
 
   # Userspace interface to kernel DRM services.
   'src/third_party/libdrm/src': {
-      'url': Var('chromium_git') + '/chromiumos/third_party/libdrm.git' + '@' + '0061b1f244574e615c415479725046ab2951f09a',
+      'url': Var('chromium_git') + '/chromiumos/third_party/libdrm.git' + '@' + '0190f49a139e7069d7cad6a6890832831da1aa8b',
       'condition': 'checkout_linux',
   },
 
@@ -1182,7 +1182,7 @@ deps = {
 
   # Graphics buffer allocator for Chrome OS.
   'src/third_party/minigbm/src': {
-      'url': Var('chromium_git') + '/chromiumos/platform/minigbm.git' + '@' + '3d856025f8f057d29361e753ef712993d218d6e9',
+      'url': Var('chromium_git') + '/chromiumos/platform/minigbm.git' + '@' + 'c5352e6b363e47e2f3ad6765ad95c94d4e9c7923',
       'condition': 'checkout_linux',
   },
 

ui/gfx/linux/gbm_wrapper.cc

@@ -210,8 +210,8 @@ class Buffer final : public ui::GbmBuffer {
     void* addr;
     addr =
 #if defined(MINIGBM)
-        gbm_bo_map(bo_, 0, 0, gbm_bo_get_width(bo_), gbm_bo_get_height(bo_),
-                   GBM_BO_TRANSFER_READ_WRITE, &stride, &mmap_data_, 0);
+        gbm_bo_map2(bo_, 0, 0, gbm_bo_get_width(bo_), gbm_bo_get_height(bo_),
+                    GBM_BO_TRANSFER_READ_WRITE, &stride, &mmap_data_, 0);
 #else
         gbm_bo_map(bo_, 0, 0, gbm_bo_get_width(bo_), gbm_bo_get_height(bo_),
                    GBM_BO_TRANSFER_READ_WRITE, &stride, &mmap_data_);

ui/ozone/platform/drm/gpu/hardware_display_controller.cc

@@ -29,6 +29,12 @@
 #include "ui/ozone/platform/drm/gpu/hardware_display_plane.h"
 #include "ui/ozone/platform/drm/gpu/page_flip_request.h"
 
+// Vendor ID for downstream, interim ChromeOS specific modifiers.
+#define DRM_FORMAT_MOD_VENDOR_CHROMEOS 0xf0
+// TODO(gurchetansingh) Remove once DRM_FORMAT_MOD_ARM_AFBC is used by all
+// kernels and allocators.
+#define DRM_FORMAT_MOD_CHROMEOS_ROCKCHIP_AFBC fourcc_mod_code(CHROMEOS, 1)
+
 namespace ui {
 
 namespace {