diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-01-08 13:11:51 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-01-12 14:24:45 +0000 |
| commit | fa98118a45f7e169f8846086dc2c22c49a8ba310 (patch) | |
| tree | 3d21874df649136e2df0d6fc16da117d1484d93f /chromium/ui/ozone | |
| parent | 42165222878a38f10aaedf3a123ae7200a85a091 (diff) | |
| download | qtwebengine-chromium-fa98118a45f7e169f8846086dc2c22c49a8ba310.tar.gz | |
BASELINE: Update Chromium to 87.0.4280.144
Change-Id: I9c1b2ad99474c7252ee250024961d8ed86464e32
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/ui/ozone')
| -rw-r--r-- | chromium/ui/ozone/platform/drm/gpu/hardware_display_plane_manager_atomic.cc | 28 | ||||
| -rw-r--r-- | chromium/ui/ozone/platform/drm/gpu/hardware_display_plane_manager_unittest.cc | 2 |
2 files changed, 17 insertions, 13 deletions
diff --git a/chromium/ui/ozone/platform/drm/gpu/hardware_display_plane_manager_atomic.cc b/chromium/ui/ozone/platform/drm/gpu/hardware_display_plane_manager_atomic.cc index 7c3a287b4ca..725d20acc45 100644 --- a/chromium/ui/ozone/platform/drm/gpu/hardware_display_plane_manager_atomic.cc +++ b/chromium/ui/ozone/platform/drm/gpu/hardware_display_plane_manager_atomic.cc @@ -302,20 +302,24 @@ bool HardwareDisplayPlaneManagerAtomic::Commit( bool HardwareDisplayPlaneManagerAtomic::DisableOverlayPlanes( HardwareDisplayPlaneList* plane_list) { - for (HardwareDisplayPlane* plane : plane_list->old_plane_list) { - plane->set_in_use(false); - plane->set_owning_crtc(0); + bool ret = true; - HardwareDisplayPlaneAtomic* atomic_plane = - static_cast<HardwareDisplayPlaneAtomic*>(plane); - atomic_plane->AssignPlaneProps(0, 0, gfx::Rect(), gfx::Rect(), - gfx::OVERLAY_TRANSFORM_NONE, - base::kInvalidPlatformFile); - atomic_plane->SetPlaneProps(plane_list->atomic_property_set.get()); + if (!plane_list->old_plane_list.empty()) { + for (HardwareDisplayPlane* plane : plane_list->old_plane_list) { + plane->set_in_use(false); + plane->set_owning_crtc(0); + + HardwareDisplayPlaneAtomic* atomic_plane = + static_cast<HardwareDisplayPlaneAtomic*>(plane); + atomic_plane->AssignPlaneProps(0, 0, gfx::Rect(), gfx::Rect(), + gfx::OVERLAY_TRANSFORM_NONE, + base::kInvalidPlatformFile); + atomic_plane->SetPlaneProps(plane_list->atomic_property_set.get()); + } + ret = drm_->CommitProperties(plane_list->atomic_property_set.get(), + /*flags=*/0, 0 /*unused*/, nullptr); + PLOG_IF(ERROR, !ret) << "Failed to commit properties for page flip."; } - bool ret = drm_->CommitProperties(plane_list->atomic_property_set.get(), - DRM_MODE_ATOMIC_NONBLOCK, 0, nullptr); - PLOG_IF(ERROR, !ret) << "Failed to commit properties for page flip."; plane_list->atomic_property_set.reset(drmModeAtomicAlloc()); return ret; diff --git a/chromium/ui/ozone/platform/drm/gpu/hardware_display_plane_manager_unittest.cc b/chromium/ui/ozone/platform/drm/gpu/hardware_display_plane_manager_unittest.cc index 4d967114368..5a3eac0def0 100644 --- a/chromium/ui/ozone/platform/drm/gpu/hardware_display_plane_manager_unittest.cc +++ b/chromium/ui/ozone/platform/drm/gpu/hardware_display_plane_manager_unittest.cc @@ -516,7 +516,7 @@ TEST_P(HardwareDisplayPlaneManagerAtomicTest, DisableModeset) { EXPECT_TRUE(fake_drm_->plane_manager()->Commit( std::move(commit_request), DRM_MODE_ATOMIC_ALLOW_MODESET)); - EXPECT_EQ(2, fake_drm_->get_commit_count()); + EXPECT_EQ(1, fake_drm_->get_commit_count()); } TEST_P(HardwareDisplayPlaneManagerAtomicTest, CheckPropsAfterModeset) { |