commit c87e2b02e2e5ca160e6a6439b1a12898ffeba858
author Tharaga Balachandran <tbalacha@codeaurora.org> Fri Nov 09 15:03:02 2018 -0500
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Nov 14 07:38:10 2018 -0800
tree 8906bd922a3cad17884b2e60a363bbe1d8702305
parent 42881b1ca8d58a4c49d209a23f0434e982ebf5b5

sdm: Clear solid fill stages upon flush

Solid fill stages persist after empty commit because the property
DIM_STAGES_V1 is set during solid fill creation but not cleared
by HWDeviceDRM::Flush(). This commit clears solid fill stages and
updates the property.

CRs-Fixed: 2348615
Change-Id: I017b44094286f89c315d16e0de6717f6ffae7b76

sdm/libs/core/drm/hw_device_drm.cpp

diff --git a/sdm/libs/core/drm/hw_device_drm.cpp b/sdm/libs/core/drm/hw_device_drm.cpp
index 627e008..40e0b22 100644
--- a/sdm/libs/core/drm/hw_device_drm.cpp
+++ b/sdm/libs/core/drm/hw_device_drm.cpp
@@ -1047,6 +1047,11 @@
   }
 }
 
+void HWDeviceDRM::ClearSolidfillStages() {
+  solid_fills_.clear();
+  SetSolidfillStages();
+}
+
 DisplayError HWDeviceDRM::Validate(HWLayers *hw_layers) {
   DTRACE_SCOPED();
 
@@ -1184,6 +1189,7 @@
 
 DisplayError HWDeviceDRM::Flush() {
   DTRACE_SCOPED();
+  ClearSolidfillStages();
   int ret = drm_atomic_intf_->Commit(false /* synchronous */, false /* retain_planes*/);
   if (ret) {
     DLOGE("failed with error %d", ret);

sdm/libs/core/drm/hw_device_drm.h

diff --git a/sdm/libs/core/drm/hw_device_drm.h b/sdm/libs/core/drm/hw_device_drm.h
index 63853c4..c4f06c3 100644
--- a/sdm/libs/core/drm/hw_device_drm.h
+++ b/sdm/libs/core/drm/hw_device_drm.h
@@ -126,6 +126,7 @@
   void UpdateMixerAttributes();
   void SetSolidfillStages();
   void AddSolidfillStage(const HWSolidfillStage &sf, uint32_t plane_alpha);
+  void ClearSolidfillStages();
   void SetBlending(const LayerBlending &source, sde_drm::DRMBlendType *target);
   void SetSrcConfig(const LayerBuffer &input_buffer, const HWRotatorMode &mode, uint32_t *config);
   void SelectCscType(const LayerBuffer &input_buffer, sde_drm::DRMCscType *type);