diff options
| author | Gurpreet Singh Dhami <quic_gdhami@quicinc.com> | 2019-04-02 11:45:10 -0400 |
|---|---|---|
| committer | Valerie Hau <vhau@google.com> | 2019-04-08 12:50:26 -0700 |
| commit | 4b79746541c20cc2b9e9e418792dc396ce20a97b (patch) | |
| tree | 0b74b684e5b6b1c4a4af03dc456c4cfb12fad569 | |
| parent | 57ae6067fa315aa05fb3abf019a9e6ca8d509d19 (diff) | |
| download | android_hardware_qcom_sdm845_display-4b79746541c20cc2b9e9e418792dc396ce20a97b.tar.gz android_hardware_qcom_sdm845_display-4b79746541c20cc2b9e9e418792dc396ce20a97b.tar.bz2 android_hardware_qcom_sdm845_display-4b79746541c20cc2b9e9e418792dc396ce20a97b.zip | |
Revert "sdm: Fix Concurrent Writeback fence handling"
This reverts commit 468c1e1ba74179022a55d1e4c79e511693ca276e.
Bug: 118337749
Test: VtsHalGraphicsComposerV2_2TargetTest
Change-Id: Ice33e8f950e5ddee567d8b56500f1b073d1270c3
| -rw-r--r-- | sdm/libs/core/drm/hw_peripheral_drm.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/sdm/libs/core/drm/hw_peripheral_drm.cpp b/sdm/libs/core/drm/hw_peripheral_drm.cpp index 71437d48..0e0aa9b0 100644 --- a/sdm/libs/core/drm/hw_peripheral_drm.cpp +++ b/sdm/libs/core/drm/hw_peripheral_drm.cpp @@ -165,13 +165,6 @@ void HWPeripheralDRM::SetupConcurrentWriteback(const HWLayersInfo &hw_layer_info if (enable) { // Set DRM properties for Concurrent Writeback. ConfigureConcurrentWriteback(hw_layer_info.stack); - - if (!validate) { - // Set GET_RETIRE_FENCE property to get Concurrent Writeback fence. - int *fence = &hw_layer_info.stack->output_buffer->release_fence_fd; - drm_atomic_intf_->Perform(DRMOps::CONNECTOR_GET_RETIRE_FENCE, - cwb_config_.token.conn_id, fence); - } } else { // Tear down the Concurrent Writeback topology. drm_atomic_intf_->Perform(DRMOps::CONNECTOR_SET_CRTC, cwb_config_.token.conn_id, 0); @@ -246,7 +239,11 @@ void HWPeripheralDRM::ConfigureConcurrentWriteback(LayerStack *layer_stack) { void HWPeripheralDRM::PostCommitConcurrentWriteback(LayerBuffer *output_buffer) { bool enabled = hw_resource_.has_concurrent_writeback && output_buffer; - if (!enabled) { + if (enabled) { + // Get Concurrent Writeback fence + int *fence = &output_buffer->release_fence_fd; + drm_atomic_intf_->Perform(DRMOps::CONNECTOR_GET_RETIRE_FENCE, cwb_config_.token.conn_id, fence); + } else { drm_mgr_intf_->UnregisterDisplay(cwb_config_.token); cwb_config_.enabled = false; } |