diff options
| author | Ramkumar Radhakrishnan <ramkumar@codeaurora.org> | 2018-08-16 15:10:55 -0700 |
|---|---|---|
| committer | Ramkumar Radhakrishnan <ramkumar@codeaurora.org> | 2018-08-17 11:54:20 -0700 |
| commit | 045b22b208f00f23468e94f0f0ed6da23f46ed40 (patch) | |
| tree | 81157ce4d4e3ec7cbd3dffe440eb66660e2d9841 | |
| parent | 9ec9547d998cd5f4af4226593930bba53d8c66e1 (diff) | |
| download | android_hardware_qcom_sdm710_display-045b22b208f00f23468e94f0f0ed6da23f46ed40.tar.gz android_hardware_qcom_sdm710_display-045b22b208f00f23468e94f0f0ed6da23f46ed40.tar.bz2 android_hardware_qcom_sdm710_display-045b22b208f00f23468e94f0f0ed6da23f46ed40.zip | |
hwc2: Wait for retire fence after populating it from layer stack
Wait for retire fence and notify pmic about secure display end after
populating the retire fence from layer stack.
Change-Id: I61661d2b4939bbd184aeb8dac310ff156026800c
CRs-Fixed: 2298981
| -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 56b612f6..9b5354c3 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, ...) { |