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

drm_hwcomposer: Fixup downstream cherry-picks

Browse source 
Wrap Android16 APIs in an if block to prevent breaking Android15
integration.

s/AidlHdcpLevels/drm::HdcpLevels

Add support for external HDR displays (dropped in previous cleanup).

clang-format-diff-19 nits

Change-Id: I897e0b42e0065a61ecfe28c280094b6c375d8a72
Signed-off-by: Sasha McIntosh <sashamcintosh@google.com>
This commit is contained in:
Sasha McIntosh 2024-11-07 14:40:45 -05:00
parent 447858ca48
commit c469d14a19
4 changed files with 38 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

13
hwc2_device/HwcDisplay.cpp
View file

@ -172,7 +172,7 @@ auto HwcDisplay::GetLastRequestedConfig() const -> const HwcDisplayConfig * {
HWC2::Error HwcDisplay::SetOutputType(uint32_t hdr_output_type) {
switch (hdr_output_type) {
case 3: { // HDR10
case 3: { // HDR10
auto ret = SetHdrOutputMetadata(ui::Hdr::HDR10);
if (ret != HWC2::Error::None)
return ret;
@ -180,7 +180,7 @@ HWC2::Error HwcDisplay::SetOutputType(uint32_t hdr_output_type) {
colorspace_ = Colorspace::kBt2020Rgb;
break;
}
case 1: { // SYSTEM
case 1: { // SYSTEM
std::vector<ui::Hdr> hdr_types;
GetEdid()->GetSupportedHdrTypes(hdr_types);
if (!hdr_types.empty()) {
@ -190,9 +190,8 @@ HWC2::Error HwcDisplay::SetOutputType(uint32_t hdr_output_type) {
min_bpc_ = 8;
colorspace_ = Colorspace::kBt2020Rgb;
break;
} else {
[[fallthrough]];
}
[[fallthrough]];
}
case 0: // INVALID
[[fallthrough]];
@ -303,6 +302,12 @@ auto HwcDisplay::QueueConfig(hwc2_config_t config, int64_t desired_time,
staged_mode_change_time_ = out_timing->refresh_time_ns;
staged_mode_config_id_ = config;
// Allow HDR only on external displays
if (current_config && !IsInHeadlessMode() &&
GetPipe().connector->Get()->IsExternal()) {
SetOutputType(current_config->output_type);
}
// Enable vsync events until the mode has been applied.
vsync_worker_->SetVsyncTimestampTracking(true);