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

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

Issue 1098093005: Revert of ozone: Add sync flag for atomic commit (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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/drm_device.cc
diff --git a/ui/ozone/platform/drm/gpu/drm_device.cc b/ui/ozone/platform/drm/gpu/drm_device.cc
index d3471f2f7b0faaa0ff5ad21770af32ae0cead723..b547b080874550287f0c9fd3090a19e38b05ba7d 100644
--- a/ui/ozone/platform/drm/gpu/drm_device.cc
+++ b/ui/ozone/platform/drm/gpu/drm_device.cc
@@ -488,31 +488,14 @@
bool DrmDevice::CommitProperties(drmModePropertySet* properties,
uint32_t flags,
- bool is_sync,
const PageFlipCallback& callback) {
#if defined(USE_DRM_ATOMIC)
- flags |= DRM_MODE_PAGE_FLIP_EVENT;
- if (!is_sync)
- flags |= DRM_MODE_PAGE_FLIP_ASYNC;
scoped_ptr<PageFlipPayload> payload(
new PageFlipPayload(base::ThreadTaskRunnerHandle::Get(), callback));
if (!drmModePropertySetCommit(file_.GetPlatformFile(), flags, payload.get(),
properties)) {
// If successful the payload will be removed by the event
ignore_result(payload.release());
-
- // If the flip was requested synchronous or if no watcher has been installed
- // yet, then synchronously handle the page flip events.
- if (is_sync || !watcher_) {
- TRACE_EVENT1("drm", "OnDrmEvent", "socket", file_.GetPlatformFile());
-
- drmEventContext event;
- event.version = DRM_EVENT_CONTEXT_VERSION;
- event.page_flip_handler = HandlePageFlipEventOnUI;
- event.vblank_handler = nullptr;
-
- drmHandleEvent(file_.GetPlatformFile(), &event);
- }
return true;
}
return false;
« no previous file with comments | « ui/ozone/platform/drm/gpu/drm_device.h ('k') | ui/ozone/platform/drm/gpu/hardware_display_plane_manager_atomic.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698