lineage-rockchip/android_external_drm_hwcomposer
1
0
Fork 0
Code Activity Actions

drm_hwcomposer: Change HwcDisplay::Init return value

Browse source 
Rather than a HWC2::Error, return a bool to indicate success or failure.
Additionally, check the return value in SetPipeline and log when Init
has failed.

Change-Id: I9918284f101281a98165eca7c1aef13a251f84d4
Signed-off-by: Drew Davenport <ddavenport@google.com>
This commit is contained in:
Drew Davenport 2025-04-06 15:48:29 -06:00
parent 95beff230b
commit 52c8fd71d7
2 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
hwc2_device/HwcDisplay.cpp
View file

@ -531,7 +531,8 @@ void HwcDisplay::SetPipeline(std::shared_ptr<DrmDisplayPipeline> pipeline) {
pipeline_ = std::move(pipeline);
if (pipeline_ != nullptr || handle_ == kPrimaryDisplay) {
Init();
bool success = Init();
ALOGE_IF(!success, "Failed to init HwcDisplay after setting pipeline.");
hwc_->ScheduleHotplugEvent(handle_, DrmHwc::kConnected);
} else {
hwc_->ScheduleHotplugEvent(handle_, DrmHwc::kDisconnected);
@ -563,14 +564,14 @@ void HwcDisplay::Deinit() {
client_layer_.ClearSlots();
}
HWC2::Error HwcDisplay::Init() {
bool HwcDisplay::Init() {
ChosePreferredConfig();
if (!is_virtual_) {
vsync_worker_ = VSyncWorker::CreateInstance(pipeline_);
if (!vsync_worker_) {
ALOGE("Failed to create event worker for d=%d\n", int(handle_));
return HWC2::Error::BadDisplay;
return false;
}
}
@ -578,7 +579,7 @@ HWC2::Error HwcDisplay::Init() {
auto ret = BackendManager::GetInstance().SetBackendForDisplay(this);
if (ret) {
ALOGE("Failed to set backend for d=%d %d\n", int(handle_), ret);
return HWC2::Error::BadDisplay;
return false;
}
auto flatcbk = (struct FlatConCallbacks){
.trigger = [this]() { hwc_->SendRefreshEventToClient(handle_); }};
@ -591,7 +592,7 @@ HWC2::Error HwcDisplay::Init() {
SetColorMatrixToIdentity();
return HWC2::Error::None;
return true;
}
std::optional<PanelOrientation> HwcDisplay::getDisplayPhysicalOrientation() {

2
hwc2_device/HwcDisplay.h
View file

@ -306,7 +306,7 @@ class HwcDisplay {
void SetColorMatrixToIdentity();
HWC2::Error Init();
bool Init();
HWC2::Error SetActiveConfigInternal(uint32_t config, int64_t change_time);
HWC2::Error SetHdrOutputMetadata(ui::Hdr hdrType);