Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ui/ozone/platform/drm/gpu/hardware_display_plane_manager_atomic.h" | 5 #include "ui/ozone/platform/drm/gpu/hardware_display_plane_manager_atomic.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "ui/ozone/platform/drm/gpu/drm_device.h" | 8 #include "ui/ozone/platform/drm/gpu/drm_device.h" |
| 9 #include "ui/ozone/platform/drm/gpu/hardware_display_plane_atomic.h" | 9 #include "ui/ozone/platform/drm/gpu/hardware_display_plane_atomic.h" |
| 10 #include "ui/ozone/platform/drm/gpu/scanout_buffer.h" | 10 #include "ui/ozone/platform/drm/gpu/scanout_buffer.h" |
| (...skipping 23 matching lines...) Expand all Loading... | |
| 34 plane->set_in_use(false); | 34 plane->set_in_use(false); |
| 35 HardwareDisplayPlaneAtomic* atomic_plane = | 35 HardwareDisplayPlaneAtomic* atomic_plane = |
| 36 static_cast<HardwareDisplayPlaneAtomic*>(plane); | 36 static_cast<HardwareDisplayPlaneAtomic*>(plane); |
| 37 atomic_plane->SetPlaneData(plane_list->atomic_property_set.get(), 0, 0, | 37 atomic_plane->SetPlaneData(plane_list->atomic_property_set.get(), 0, 0, |
| 38 gfx::Rect(), gfx::Rect()); | 38 gfx::Rect(), gfx::Rect()); |
| 39 } | 39 } |
| 40 } | 40 } |
| 41 | 41 |
| 42 plane_list->plane_list.swap(plane_list->old_plane_list); | 42 plane_list->plane_list.swap(plane_list->old_plane_list); |
| 43 plane_list->plane_list.clear(); | 43 plane_list->plane_list.clear(); |
| 44 if (!drm_->CommitProperties(plane_list->atomic_property_set.get(), 0, | 44 if (!drm_->CommitProperties(plane_list->atomic_property_set.get(), 0, true, |
|
dnicoara
2015/04/24 19:47:49
Shouldn't we set this to 'false'? We'd rather not
achaulk
2015/04/24 19:50:41
Actually, it should be is_sync which has helpfully
dnicoara
2015/04/24 19:51:47
Thanks!
| |
| 45 base::Bind(&AtomicPageFlipCallback))) { | 45 base::Bind(&AtomicPageFlipCallback))) { |
| 46 PLOG(ERROR) << "Failed to commit properties"; | 46 PLOG(ERROR) << "Failed to commit properties"; |
| 47 return false; | 47 return false; |
| 48 } | 48 } |
| 49 return true; | 49 return true; |
| 50 } | 50 } |
| 51 | 51 |
| 52 bool HardwareDisplayPlaneManagerAtomic::AssignOverlayPlanes( | 52 bool HardwareDisplayPlaneManagerAtomic::AssignOverlayPlanes( |
| 53 HardwareDisplayPlaneList* plane_list, | 53 HardwareDisplayPlaneList* plane_list, |
| 54 const OverlayPlaneList& overlay_list, | 54 const OverlayPlaneList& overlay_list, |
| (...skipping 26 matching lines...) Expand all Loading... | |
| 81 } | 81 } |
| 82 | 82 |
| 83 scoped_ptr<HardwareDisplayPlane> HardwareDisplayPlaneManagerAtomic::CreatePlane( | 83 scoped_ptr<HardwareDisplayPlane> HardwareDisplayPlaneManagerAtomic::CreatePlane( |
| 84 uint32_t plane_id, | 84 uint32_t plane_id, |
| 85 uint32_t possible_crtcs) { | 85 uint32_t possible_crtcs) { |
| 86 return scoped_ptr<HardwareDisplayPlane>( | 86 return scoped_ptr<HardwareDisplayPlane>( |
| 87 new HardwareDisplayPlaneAtomic(plane_id, possible_crtcs)); | 87 new HardwareDisplayPlaneAtomic(plane_id, possible_crtcs)); |
| 88 } | 88 } |
| 89 | 89 |
| 90 } // namespace ui | 90 } // namespace ui |
| OLD | NEW |