Merge "display: add support to enable, disable demura during TUI"
diff --git a/sdm/include/core/buffer_allocator.h b/sdm/include/core/buffer_allocator.h
index 63b9f8c..fb05db8 100644
--- a/sdm/include/core/buffer_allocator.h
+++ b/sdm/include/core/buffer_allocator.h
@@ -81,6 +81,17 @@
bool trusted_ui = false; //!< Specifies buffer to be allocated from non-secure
//!< contiguous memory.
BufferAccessControlMap access_control; //!< Specifies the access permission for this buffer
+
+ bool operator!=(const BufferConfig& config) const {
+ return width != config.width ||
+ height != config.height ||
+ format != config.format ||
+ secure != config.secure ||
+ cache != config.cache ||
+ secure_camera != config.secure_camera ||
+ gfx_client != config.gfx_client ||
+ trusted_ui != config.trusted_ui;
+ }
};
/*! @brief Holds the information about the allocated buffer.
diff --git a/sdm/include/private/resource_interface.h b/sdm/include/private/resource_interface.h
index 95e0969..630b140 100644
--- a/sdm/include/private/resource_interface.h
+++ b/sdm/include/private/resource_interface.h
@@ -141,7 +141,7 @@
virtual void HandleSkipValidate(Handle display_ctx) = 0;
virtual std::string Dump() = 0;
virtual uint32_t GetMixerCount() = 0;
- virtual void HandleTUITransition(bool tui_active) = 0;
+ virtual void HandleTUITransition(Handle display_ctx, bool tui_active) = 0;
};
} // namespace sdm
diff --git a/sdm/libs/core/comp_manager.cpp b/sdm/libs/core/comp_manager.cpp
index da69d9a..be7639c 100755
--- a/sdm/libs/core/comp_manager.cpp
+++ b/sdm/libs/core/comp_manager.cpp
@@ -777,12 +777,12 @@
display_comp_ctx->display_resource_ctx);
}
if (secure_event == kTUITransitionStart) {
- resource_intf_->HandleTUITransition(true);
+ resource_intf_->HandleTUITransition(display_comp_ctx->display_resource_ctx, true);
}
if (secure_event == kTUITransitionEnd) {
resource_intf_->Perform(ResourceInterface::kCmdResetLUT,
display_comp_ctx->display_resource_ctx);
- resource_intf_->HandleTUITransition(false);
+ resource_intf_->HandleTUITransition(display_comp_ctx->display_resource_ctx, false);
safe_mode_ = false;
}
safe_mode_ = (secure_event == kTUITransitionStart) ? true : safe_mode_;
diff --git a/sdm/libs/core/display_base.cpp b/sdm/libs/core/display_base.cpp
index 6cc9c55..56abd07 100644
--- a/sdm/libs/core/display_base.cpp
+++ b/sdm/libs/core/display_base.cpp
@@ -3807,12 +3807,12 @@
SetPendingPowerState(state);
}
+ comp_manager_->HandleSecureEvent(display_comp_ctx_, secure_event);
err = hw_intf_->HandleSecureEvent(secure_event, cached_qos_data_);
if (err != kErrorNone) {
return err;
}
- comp_manager_->HandleSecureEvent(display_comp_ctx_, secure_event);
secure_event_ = secure_event;
if (secure_event == kTUITransitionEnd) {
DisplayState pending_state;
diff --git a/sdm/libs/core/display_builtin.cpp b/sdm/libs/core/display_builtin.cpp
index 637b24c..66cec7c 100644
--- a/sdm/libs/core/display_builtin.cpp
+++ b/sdm/libs/core/display_builtin.cpp
@@ -169,18 +169,19 @@
return error;
}
- if ((error = SetupDemura()) != kErrorNone) {
+ DisplayError tmp = kErrorNone;
+ if ((tmp = SetupDemura()) != kErrorNone) {
// Non-fatal but not expected, log error
DLOGE("Demura failed to initialize on display %d-%d, Error = %d", display_id_,
- display_type_, error);
+ display_type_, tmp);
comp_manager_->FreeDemuraFetchResources(display_id_);
comp_manager_->SetDemuraStatusForDisplay(display_id_, false);
if (demura_) {
SetDemuraIntfStatus(false);
}
} else if (demuratn_factory_) {
- if ((error = SetupDemuraTn()) != kErrorNone) {
- DLOGW("Failed to setup DemuraTn, Error = %d", error);
+ if ((tmp = SetupDemuraTn()) != kErrorNone) {
+ DLOGW("Failed to setup DemuraTn, Error = %d", tmp);
}
}
} else {
diff --git a/sdm/libs/core/display_virtual.cpp b/sdm/libs/core/display_virtual.cpp
index 433537a..4316f8b 100644
--- a/sdm/libs/core/display_virtual.cpp
+++ b/sdm/libs/core/display_virtual.cpp
@@ -120,6 +120,9 @@
return error;
}
+ uint32_t active_index = 0;
+ hw_intf_->GetActiveConfig(&active_index);
+ hw_intf_->GetDisplayAttributes(active_index, &display_attributes);
hw_intf_->GetHWPanelInfo(&hw_panel_info);
if (set_max_lum_ != -1.0 || set_min_lum_ != -1.0) {
diff --git a/sdm/libs/core/resource_default.cpp b/sdm/libs/core/resource_default.cpp
index f76ab6f..5aaed31 100644
--- a/sdm/libs/core/resource_default.cpp
+++ b/sdm/libs/core/resource_default.cpp
@@ -392,7 +392,7 @@
return 0;
}
-void ResourceDefault::HandleTUITransition(bool tui_active) {
+void ResourceDefault::HandleTUITransition(Handle display_ctx, bool tui_active) {
}
DisplayError ResourceDefault::PostCommit(Handle display_ctx, DispLayerStack *disp_layer_stack) {
diff --git a/sdm/libs/core/resource_default.h b/sdm/libs/core/resource_default.h
index e2dc222..b246ecc 100644
--- a/sdm/libs/core/resource_default.h
+++ b/sdm/libs/core/resource_default.h
@@ -141,7 +141,7 @@
virtual void HandleSkipValidate(Handle display_ctx);
virtual std::string Dump();
virtual uint32_t GetMixerCount();
- virtual void HandleTUITransition(bool tui_active);
+ virtual void HandleTUITransition(Handle display_ctx, bool tui_active);
private:
enum PipeOwner {
diff --git a/sdm/libs/dal/hw_tv_drm.cpp b/sdm/libs/dal/hw_tv_drm.cpp
index ccafa85..7cc72da 100644
--- a/sdm/libs/dal/hw_tv_drm.cpp
+++ b/sdm/libs/dal/hw_tv_drm.cpp
@@ -257,6 +257,12 @@
// LP connecter prop N/A for External
drm_atomic_intf_->Perform(DRMOps::CRTC_SET_ACTIVE, token_.crtc_id, 0);
}
+
+ if (cwb_config_.cwb_disp_id == display_id_ && cwb_config_.enabled) {
+ drm_atomic_intf_->Perform(DRMOps::CONNECTOR_SET_CRTC, cwb_config_.token.conn_id, 0);
+ DLOGI("Teardown CWB on %d-%d", display_id_, disp_type_);
+ }
+
ClearSolidfillStages();
int ret = drm_atomic_intf_->Commit(true /* synchronous */, false /* retain_planes*/);
if (ret) {
diff --git a/sdm/libs/dal/hw_virtual_drm.cpp b/sdm/libs/dal/hw_virtual_drm.cpp
index f6f3de5..37d323f 100644
--- a/sdm/libs/dal/hw_virtual_drm.cpp
+++ b/sdm/libs/dal/hw_virtual_drm.cpp
@@ -70,6 +70,7 @@
#include <utils/utils.h>
#include <algorithm>
#include <vector>
+#include <cmath>
#include "hw_device_drm.h"
#include "hw_virtual_drm.h"
#include "hw_info_drm.h"
@@ -139,7 +140,8 @@
mode.vdisplay = mode.vsync_start = mode.vsync_end = mode.vtotal =
UINT16(display_attributes.y_pixels);
mode.vrefresh = UINT32(display_attributes.fps);
- mode.clock = (mode.htotal * mode.vtotal * mode.vrefresh) / 1000;
+
+ mode.clock = std::round(FLOAT(mode.htotal * mode.vtotal * mode.vrefresh) / 1000.00f);
snprintf(mode.name, DRM_DISPLAY_MODE_LEN, "%dx%d", mode.hdisplay, mode.vdisplay);
modes.push_back(mode);
for (auto &item : connector_info_.modes) {