Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(210)

Unified Diff: ui/ozone/platform/drm/gpu/hardware_display_plane_manager.cc

Issue 1314553002: Move Format checks to HardwareDisplayPlane (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Review fixes Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/ozone/platform/drm/gpu/hardware_display_plane_manager.cc
diff --git a/ui/ozone/platform/drm/gpu/hardware_display_plane_manager.cc b/ui/ozone/platform/drm/gpu/hardware_display_plane_manager.cc
index 7759ff9c1ee51109b2e245828dd97e6458e0a261..fa595e60761ba87695e83879317df34d1534cc61 100644
--- a/ui/ozone/platform/drm/gpu/hardware_display_plane_manager.cc
+++ b/ui/ozone/platform/drm/gpu/hardware_display_plane_manager.cc
@@ -101,7 +101,7 @@ bool HardwareDisplayPlaneManager::Initialize(DrmDevice* drm) {
for (uint32_t j = 0; j < formats_size; j++)
supported_formats.push_back(drm_plane->formats[j]);
- if (plane->Initialize(drm, supported_formats, false)) {
+ if (plane->Initialize(drm, supported_formats, false, false)) {
// CRTC controllers always assume they have a cursor plane and the cursor
// plane is updated via cursor specific DRM API. Hence, we dont keep
// track of Cursor plane here to avoid re-using it for any other purpose.
@@ -119,7 +119,8 @@ bool HardwareDisplayPlaneManager::Initialize(DrmDevice* drm) {
if (plane_ids.find(resources->crtcs[i] - 1) == plane_ids.end()) {
scoped_ptr<HardwareDisplayPlane> dummy_plane(
CreatePlane(resources->crtcs[i] - 1, (1 << i)));
- if (dummy_plane->Initialize(drm, std::vector<uint32_t>(), true)) {
+ if (dummy_plane->Initialize(drm, std::vector<uint32_t>(), true,
+ false)) {
planes_.push_back(dummy_plane.Pass());
}
}
@@ -182,8 +183,8 @@ bool HardwareDisplayPlaneManager::AssignOverlayPlanes(
size_t plane_idx = 0;
for (const auto& plane : overlay_list) {
- HardwareDisplayPlane* hw_plane =
- FindNextUnusedPlane(&plane_idx, crtc_index, plane.buffer->GetFormat());
+ HardwareDisplayPlane* hw_plane = FindNextUnusedPlane(
+ &plane_idx, crtc_index, plane.buffer->GetFramebufferPixelFormat());
if (!hw_plane) {
LOG(ERROR) << "Failed to find a free plane for crtc " << crtc_id;
return false;

Powered by Google App Engine
This is Rietveld 408576698