commit ab8e3087fbe3bc30138666d782154a31fa28ca28
author Padmanabhan Komanduru <pkomandu@codeaurora.org> Tue Feb 09 17:29:08 2021 +0530
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Mar 24 21:47:40 2021 -0700
tree 0791361a44f004d03bc0d07e541826d6c1a75d33
parent b2c6fb5d0e9d953e213af40ab5de96628c2604b8

sde-drm: reset color LUT state in case of failures

Change-Id: I1e8c152ae33c7d47fc495cfacdeb7bcfcfcba080

sde-drm/drm_plane.cpp

diff --git a/sde-drm/drm_plane.cpp b/sde-drm/drm_plane.cpp
index c1c5da6..ee9c382 100644
--- a/sde-drm/drm_plane.cpp
+++ b/sde-drm/drm_plane.cpp
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2019-2020, The Linux Foundation. All rights reserved.
+* Copyright (c) 2019-2021, The Linux Foundation. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are
@@ -832,9 +832,12 @@
   DRM_LOGD("Plane %d: Setting decimation %d", drm_plane_->plane_id, prop_value);
 }
 
-void DRMPlane::PostValidate(uint32_t crtc_id, bool /*success*/) {
+void DRMPlane::PostValidate(uint32_t crtc_id, bool success) {
   if (requested_crtc_id_ == crtc_id) {
     SetRequestedCrtc(0);
+    if (!success) {
+      ResetColorLUTs(true, nullptr);
+    }
     tmp_prop_val_map_ = committed_prop_val_map_;
   }
 }
@@ -1223,18 +1226,18 @@
   return false;
 }
 
-void DRMPlane::ResetColorLUTs(bool is_commit, drmModeAtomicReq *req) {
+void DRMPlane::ResetColorLUTs(bool update_state, drmModeAtomicReq *req) {
   // Reset the color luts if they were set and update the state only if its a Commit as Unset
   // is called in Validate as well.
   for (int i = 0; i <= (int32_t)(DRMTonemapLutType::VIG_3D_GAMUT); i++) {
     auto itr = plane_type_info_.tonemap_lut_version_map.find(static_cast<DRMTonemapLutType>(i));
     if (itr != plane_type_info_.tonemap_lut_version_map.end()) {
-      ResetColorLUTState(static_cast<DRMTonemapLutType>(i), is_commit, req);
+      ResetColorLUTState(static_cast<DRMTonemapLutType>(i), update_state, req);
     }
   }
 }
 
-void DRMPlane::ResetColorLUTState(DRMTonemapLutType lut_type, bool is_commit,
+void DRMPlane::ResetColorLUTState(DRMTonemapLutType lut_type, bool update_state,
                                   drmModeAtomicReq *req) {
   DRMPlaneLutState *lut_state = nullptr;
   DRMPPFeatureID feature_id = {};
@@ -1279,14 +1282,16 @@
     return;
   }
 
-  if (is_commit) {
+  if (update_state) {
     DRM_LOGD("Plane %d Clearing %s Lut, moving from (%d) -> (%d)", drm_plane_->plane_id,
               GetColorLutString(lut_type), *lut_state, target_state);
 
     *lut_state = target_state;
   }
 
-  ResetColorLUT(feature_id, req);
+  if (req) {
+    ResetColorLUT(feature_id, req);
+  }
 }
 
 void DRMPlane::ResetColorLUT(DRMPPFeatureID id, drmModeAtomicReq *req) {

sde-drm/drm_plane.h

diff --git a/sde-drm/drm_plane.h b/sde-drm/drm_plane.h
index 18d1e41..393b6ba 100644
--- a/sde-drm/drm_plane.h
+++ b/sde-drm/drm_plane.h
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2019-2020, The Linux Foundation. All rights reserved.
+* Copyright (c) 2019-2021, The Linux Foundation. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are
@@ -82,8 +82,8 @@
   void PostCommit(uint32_t crtc_id, bool success);
   bool SetDgmCscConfig(drmModeAtomicReq *req, uint64_t handle);
   void UpdatePPLutFeatureInuse(DRMPPFeatureInfo *data);
-  void ResetColorLUTs(bool is_commit, drmModeAtomicReq *req);
-  void ResetColorLUTState(DRMTonemapLutType lut_type, bool is_commit, drmModeAtomicReq *req);
+  void ResetColorLUTs(bool update_state, drmModeAtomicReq *req);
+  void ResetColorLUTState(DRMTonemapLutType lut_type, bool update_state, drmModeAtomicReq *req);
   void ResetColorLUT(DRMPPFeatureID id, drmModeAtomicReq *req);
   void ResetCache(drmModeAtomicReq *req);
   void GetIndex(uint8_t *index) { *index = plane_type_info_.pipe_idx; }