diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-08-30 13:05:55 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-08-30 13:05:55 -0700 |
| commit | 4796d2bbc6559ecda4951c17468665c0feec6eb6 (patch) | |
| tree | 0a13823687d295af06b60ea27857721fc09ee9d5 | |
| parent | 7ef1a992b71b63d34c84a9a3aea6727e7923232d (diff) | |
| parent | 045b22b208f00f23468e94f0f0ed6da23f46ed40 (diff) | |
| download | android_hardware_qcom_sdm710_display-4796d2bbc6559ecda4951c17468665c0feec6eb6.tar.gz android_hardware_qcom_sdm710_display-4796d2bbc6559ecda4951c17468665c0feec6eb6.tar.bz2 android_hardware_qcom_sdm710_display-4796d2bbc6559ecda4951c17468665c0feec6eb6.zip | |
Merge "hwc2: Wait for retire fence after populating it from layer stack"
| -rw-r--r-- | sdm/libs/hwc2/hwc_display_primary.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sdm/libs/hwc2/hwc_display_primary.cpp b/sdm/libs/hwc2/hwc_display_primary.cpp index 9653fa82..1a6944b2 100644 --- a/sdm/libs/hwc2/hwc_display_primary.cpp +++ b/sdm/libs/hwc2/hwc_display_primary.cpp @@ -445,6 +445,11 @@ HWC2::Error HWCDisplayPrimary::GetReadbackBufferFence(int32_t *release_fence) { } HWC2::Error HWCDisplayPrimary::PostCommitLayerStack(int32_t *out_retire_fence) { + auto status = HWCDisplay::PostCommitLayerStack(out_retire_fence); + if (status != HWC2::Error::None) { + return status; + } + if (pmic_notification_pending_) { // Wait for current commit to complete if (*out_retire_fence >= 0) { @@ -456,7 +461,7 @@ HWC2::Error HWCDisplayPrimary::PostCommitLayerStack(int32_t *out_retire_fence) { pmic_intf_->Notify(false /* secure_display_start */); pmic_notification_pending_ = false; } - return HWCDisplay::PostCommitLayerStack(out_retire_fence); + return HWC2::Error::None; } int HWCDisplayPrimary::Perform(uint32_t operation, ...) { |