Chromium

I meant 56 not 46.

[Empty comment from Monorail migration]

Three patches that are needed are:

https://codereview.chromium.org/2533163002 (ozone: Create GbmBuffers from fourcc formats and gbm flags.)
https://codereview.chromium.org/2568243004 (ozone: Remove USE_LINEAR when allocating modeset buffers.)
https://codereview.chromium.org/2623963002 (ozone: Allocate scanout buffers according to KMS modifiers.)

We might be able to avoid merging back third_party changes since those are needed only for linux_chromium_chromeos_ozone_rel_ng trybot.

I'm trying to figure out if we build with linux ozone configuration on branches.

[Empty comment from Monorail migration]

marcheu@: Can you confirm if it's OK to merge to M56 CLs that depend on minigbm changes that haven't made it to third_party on M56 (but have been merged to M56 on cros).

AFAIK we don't run trybots (linux_chromium_chromeos_ozone_rel_ng) and we never build using third_party minigbm on branches, is that correct?

[Empty comment from Monorail migration]

Looks like CrOS to me.  All merge requests need OSes, please apply the right tags in the future.

Merge approved as per chat with dcastagna@

[Empty comment from Monorail migration]

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/7601afb62d79327acdc66f77114bb68023ba9c26

commit 7601afb62d79327acdc66f77114bb68023ba9c26
Author: Daniele Castagna <dcastagna@chromium.org>
Date: Fri Jan 13 00:15:12 2017

ozone: Remove USE_LINEAR when allocating modeset buffers.

crrev.com/2533163002 changed the way we allocate modeset buffers.
Unfortunately the new use flags introduced a regression that makes it
not possible to pageflip from a modeset buffer to a buffer queue buffer.
This CL restores the old modeset buffer use flags in order to fix the
regression, while we work on a long term solution.

BUG=673026,680510
TEST=manually tried the step described in the bug and verified it now works.

Review-Url: https://codereview.chromium.org/2568243004
Cr-Commit-Position: refs/heads/master@{#438193}
(cherry picked from commit a17cccbc2dbf0bf2a0df1d98ebbc773491e3e4b4)

Review-Url: https://codereview.chromium.org/2625323003 .
Cr-Commit-Position: refs/branch-heads/2924@{#750}
Cr-Branched-From: 3a87aecc31cd1ffe751dd72c04e5a96a1fc8108a-refs/heads/master@{#433059}

[modify] https://crrev.com/7601afb62d79327acdc66f77114bb68023ba9c26/ui/ozone/platform/drm/gpu/drm_thread.cc

This is the merge of the first patch. Not sure why it didn't show up in this bug: https://codereview.chromium.org/2627973006

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/18409015d6296cc33dfedcf1cb8ec70a5295c78d

commit 18409015d6296cc33dfedcf1cb8ec70a5295c78d
Author: Daniele Castagna <dcastagna@chromium.org>
Date: Fri Jan 13 00:19:54 2017

ozone: Allocate scanout buffers according to KMS modifiers.

KMS now advertises per plane buffer modifiers.
This patch uses that information to make an educated choice on which
modifiers to use when allocating scanout buffers for a specific crtcs.

patch from https://crbug.com/chromium/2576263002 at patchset 60001 (http://crrev.com/2576263002#ps60001)
BUG=680510,chrome-os-partner:56407

Review-Url: https://codereview.chromium.org/2623963002
Cr-Commit-Position: refs/heads/master@{#442979}
(cherry picked from commit f7f9a427b0d22429efb3cb62ff7d4f55f6f5176f)

Review-Url: https://codereview.chromium.org/2627193003 .
Cr-Commit-Position: refs/branch-heads/2924@{#751}
Cr-Branched-From: 3a87aecc31cd1ffe751dd72c04e5a96a1fc8108a-refs/heads/master@{#433059}

[modify] https://crrev.com/18409015d6296cc33dfedcf1cb8ec70a5295c78d/ui/ozone/platform/drm/gpu/crtc_controller.cc
[modify] https://crrev.com/18409015d6296cc33dfedcf1cb8ec70a5295c78d/ui/ozone/platform/drm/gpu/crtc_controller.h
[modify] https://crrev.com/18409015d6296cc33dfedcf1cb8ec70a5295c78d/ui/ozone/platform/drm/gpu/drm_buffer.cc
[modify] https://crrev.com/18409015d6296cc33dfedcf1cb8ec70a5295c78d/ui/ozone/platform/drm/gpu/drm_device.cc
[modify] https://crrev.com/18409015d6296cc33dfedcf1cb8ec70a5295c78d/ui/ozone/platform/drm/gpu/drm_device.h
[modify] https://crrev.com/18409015d6296cc33dfedcf1cb8ec70a5295c78d/ui/ozone/platform/drm/gpu/drm_thread.cc
[modify] https://crrev.com/18409015d6296cc33dfedcf1cb8ec70a5295c78d/ui/ozone/platform/drm/gpu/gbm_buffer.cc
[modify] https://crrev.com/18409015d6296cc33dfedcf1cb8ec70a5295c78d/ui/ozone/platform/drm/gpu/gbm_buffer.h
[modify] https://crrev.com/18409015d6296cc33dfedcf1cb8ec70a5295c78d/ui/ozone/platform/drm/gpu/gbm_buffer_base.cc
[modify] https://crrev.com/18409015d6296cc33dfedcf1cb8ec70a5295c78d/ui/ozone/platform/drm/gpu/gbm_buffer_base.h
[modify] https://crrev.com/18409015d6296cc33dfedcf1cb8ec70a5295c78d/ui/ozone/platform/drm/gpu/hardware_display_controller.cc
[modify] https://crrev.com/18409015d6296cc33dfedcf1cb8ec70a5295c78d/ui/ozone/platform/drm/gpu/hardware_display_controller.h
[modify] https://crrev.com/18409015d6296cc33dfedcf1cb8ec70a5295c78d/ui/ozone/platform/drm/gpu/hardware_display_plane.cc
[modify] https://crrev.com/18409015d6296cc33dfedcf1cb8ec70a5295c78d/ui/ozone/platform/drm/gpu/hardware_display_plane.h
[modify] https://crrev.com/18409015d6296cc33dfedcf1cb8ec70a5295c78d/ui/ozone/platform/drm/gpu/hardware_display_plane_manager.cc
[modify] https://crrev.com/18409015d6296cc33dfedcf1cb8ec70a5295c78d/ui/ozone/platform/drm/gpu/hardware_display_plane_manager.h
[modify] https://crrev.com/18409015d6296cc33dfedcf1cb8ec70a5295c78d/ui/ozone/platform/drm/gpu/mock_drm_device.cc
[modify] https://crrev.com/18409015d6296cc33dfedcf1cb8ec70a5295c78d/ui/ozone/platform/drm/gpu/mock_drm_device.h
[modify] https://crrev.com/18409015d6296cc33dfedcf1cb8ec70a5295c78d/ui/ozone/platform/drm/gpu/mock_hardware_display_plane_manager.cc

[Empty comment from Monorail migration]

[Empty comment from Monorail migration]

[Empty comment from Monorail migration]

This issue was migrated from crbug.com/chromium/680510?no_tracker_redirect=1