summaryrefslogtreecommitdiff
path: root/drmhwctwo.cpp
diff options
context:
space:
mode:
authorSean Paul <seanpaul@chromium.org>2017-02-28 13:17:34 -0500
committerRobert Foss <robert.foss@collabora.com>2017-09-28 18:31:57 +0200
commited45a8eb01d5927e36e34acd7bac46abbbecb304 (patch)
tree7ab7a00d92ab70310dbd63d4bf550472149f4056 /drmhwctwo.cpp
parenta1ade4e404430fc8d880f160cb8acf2c874b431f (diff)
drm_hwcomposer: Remove threading
Since HWC2 doesn't require the use of threads to implement correct synchronization, remove some of these threads. Signed-off-by: Sean Paul <seanpaul@chromium.org> Signed-off-by: Robert Foss <robert.foss@collabora.com>
Diffstat (limited to 'drmhwctwo.cpp')
-rw-r--r--drmhwctwo.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/drmhwctwo.cpp b/drmhwctwo.cpp
index 00bedd0..89399bf 100644
--- a/drmhwctwo.cpp
+++ b/drmhwctwo.cpp
@@ -559,7 +559,7 @@ HWC2::Error DrmHwcTwo::HwcDisplay::PresentDisplay(int32_t *retire_fence) {
AddFenceToRetireFence(composition->take_out_fence());
- ret = compositor_.QueueComposition(std::move(composition));
+ ret = compositor_.ApplyComposition(std::move(composition));
if (ret) {
ALOGE("Failed to apply the frame composition ret=%d", ret);
return HWC2::Error::BadParameter;
@@ -588,7 +588,7 @@ HWC2::Error DrmHwcTwo::HwcDisplay::SetActiveConfig(hwc2_config_t config) {
compositor_.CreateComposition();
composition->Init(drm_, crtc_, importer_.get(), planner_.get(), frame_no_);
int ret = composition->SetDisplayMode(*mode);
- ret = compositor_.QueueComposition(std::move(composition));
+ ret = compositor_.ApplyComposition(std::move(composition));
if (ret) {
ALOGE("Failed to queue dpms composition on %d", ret);
return HWC2::Error::BadConfig;
@@ -668,7 +668,7 @@ HWC2::Error DrmHwcTwo::HwcDisplay::SetPowerMode(int32_t mode_in) {
compositor_.CreateComposition();
composition->Init(drm_, crtc_, importer_.get(), planner_.get(), frame_no_);
composition->SetDpmsMode(dpms_value);
- int ret = compositor_.QueueComposition(std::move(composition));
+ int ret = compositor_.ApplyComposition(std::move(composition));
if (ret) {
ALOGE("Failed to apply the dpms composition ret=%d", ret);
return HWC2::Error::BadParameter;