Merge "sde-drm: Fix max_scalar_linewidth for planes"
diff --git a/include/display_properties.h b/include/display_properties.h
index 1b9f199..a116b0e 100644
--- a/include/display_properties.h
+++ b/include/display_properties.h
@@ -104,6 +104,8 @@
#define DISABLE_DEFER_POWER_STATE DISPLAY_PROP("disable_defer_power_state")
#define ENABLE_DROP_REFRESH DISPLAY_PROP("enable_drop_refresh")
#define DISABLE_PARALLEL_CACHE DISPLAY_PROP("disable_parallel_cache")
+// Disable 3d tonemap support for UI layers
+#define DISABLE_UI_3D_TONEMAP DISPLAY_PROP("disable_ui_3d_tonemap")
// Add all vendor.display properties above
diff --git a/sdm/include/core/layer_stack.h b/sdm/include/core/layer_stack.h
index e8ea272..e84770c 100644
--- a/sdm/include/core/layer_stack.h
+++ b/sdm/include/core/layer_stack.h
@@ -175,10 +175,8 @@
uint32_t flip_buffer: 1; //!< This flag will be set by SDM when the layer needs FBT flip
uint32_t dest_tone_map : 1; //!< This flag will be set by SDM when the layer needs
//!< destination tone map
- uint32_t src_3d_tone_map: 1; //!< This flag will be set by SDM when the layer needs
- //!< 3d tonemap
- uint32_t src_1d_tone_map: 1; //!< This flag will be set by SDM when the layer needs
- //!< 1d tone map
+ uint32_t src_tone_map: 1; //!< This flag will be set by SDM when the layer needs
+ //!< source tone map.
};
uint32_t request_flags = 0; //!< For initialization purpose only.
//!< Shall not be refered directly.
diff --git a/sdm/include/private/hw_info_types.h b/sdm/include/private/hw_info_types.h
index d197743..0f5f94c 100644
--- a/sdm/include/private/hw_info_types.h
+++ b/sdm/include/private/hw_info_types.h
@@ -153,6 +153,7 @@
};
enum HWSrcTonemap {
+ kSrcTonemapNone,
kSrcTonemap1d, // DMA
kSrcTonemap3d, // VIG
};
@@ -588,6 +589,7 @@
HWPipeCscInfo dgm_csc_info = {};
std::vector<HWPipeTonemapLutInfo> lut_info = {};
LayerTransform transform;
+ HWSrcTonemap tonemap = kSrcTonemapNone;
};
struct HWSolidfillStage {