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

drm_hwcomposer: Remove SetColorTransform GetHdrCapabilities HWC2 API

Browse source 
Remove HWC2 errors from HwcDisplay::SetOutputType and
SetHdrOutputMetadata.

Change-Id: I67333210abcc4ab9f320cc8d4451564e59db777e
Signed-off-by: Sasha McIntosh <sashamcintosh@google.com>
This commit is contained in:
Sasha McIntosh 2025-05-06 12:56:30 -04:00
parent 9624a8ea11
commit 3b548894ac
4 changed files with 55 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

61
hwc2_device/HwcDisplay.cpp
View file

@ -169,12 +169,10 @@ auto HwcDisplay::GetLastRequestedConfig() const -> const HwcDisplayConfig * {
return GetConfig(staged_mode_config_id_.value_or(configs_.active_config_id));
}
HWC2::Error HwcDisplay::SetOutputType(uint32_t hdr_output_type) {
void HwcDisplay::SetOutputType(uint32_t hdr_output_type) {
switch (hdr_output_type) {
case 3: { // HDR10
auto ret = SetHdrOutputMetadata(ui::Hdr::HDR10);
if (ret != HWC2::Error::None)
return ret;
SetHdrOutputMetadata(ui::Hdr::HDR10);
min_bpc_ = 8;
colorspace_ = Colorspace::kBt2020Rgb;
break;
@ -183,9 +181,7 @@ HWC2::Error HwcDisplay::SetOutputType(uint32_t hdr_output_type) {
std::vector<ui::Hdr> hdr_types;
GetEdid()->GetSupportedHdrTypes(hdr_types);
if (!hdr_types.empty()) {
auto ret = SetHdrOutputMetadata(hdr_types.front());
if (ret != HWC2::Error::None)
return ret;
SetHdrOutputMetadata(hdr_types.front());
min_bpc_ = 8;
colorspace_ = Colorspace::kBt2020Rgb;
break;
@ -201,8 +197,6 @@ HWC2::Error HwcDisplay::SetOutputType(uint32_t hdr_output_type) {
min_bpc_ = 6;
colorspace_ = Colorspace::kDefault;
}
return HWC2::Error::None;
}
HwcDisplay::ConfigError HwcDisplay::SetConfig(hwc2_config_t config) {
@ -685,41 +679,15 @@ void HwcDisplay::SetColorMode(ColorMode mode) {
}
}
HWC2::Error HwcDisplay::GetHdrCapabilities(uint32_t *num_types, int32_t *types,
float *max_luminance,
float *max_average_luminance,
float *min_luminance) {
if (IsInHeadlessMode()) {
*num_types = 0;
return HWC2::Error::None;
}
void HwcDisplay::GetHdrCapabilities(std::vector<ui::Hdr> *types,
float *max_luminance,
float *max_average_luminance,
float *min_luminance) {
if (IsInHeadlessMode())
return;
if (!types) {
std::vector<ui::Hdr> temp_types;
float lums[3] = {0.F};
GetEdid()->GetHdrCapabilities(temp_types, &lums[0], &lums[1], &lums[2]);
*num_types = temp_types.size();
return HWC2::Error::None;
}
std::vector<ui::Hdr> temp_types;
std::vector<int32_t> out_types(types, types + *num_types);
GetEdid()->GetHdrCapabilities(temp_types, max_luminance,
max_average_luminance, min_luminance);
for (auto &t : temp_types) {
switch (t) {
case ui::Hdr::HDR10:
out_types.emplace_back(HAL_HDR_HDR10);
break;
case ui::Hdr::HLG:
out_types.emplace_back(HAL_HDR_HLG);
break;
default:
// Ignore any other HDR types
break;
}
}
return HWC2::Error::None;
GetEdid()->GetHdrCapabilities(*types, max_luminance, max_average_luminance,
min_luminance);
}
AtomicCommitArgs HwcDisplay::CreateModesetCommit(
@ -1023,7 +991,7 @@ static uint64_t ToU16ColorValue(float in) {
return static_cast<uint64_t>(kPrimariesFixedPoint * in);
}
HWC2::Error HwcDisplay::SetHdrOutputMetadata(ui::Hdr type) {
void HwcDisplay::SetHdrOutputMetadata(ui::Hdr type) {
hdr_metadata_ = std::make_shared<hdr_output_metadata>();
hdr_metadata_->metadata_type = 0;
auto *m = &hdr_metadata_->hdmi_metadata_type1;
@ -1037,7 +1005,8 @@ HWC2::Error HwcDisplay::SetHdrOutputMetadata(ui::Hdr type) {
m->eotf = 3; // HLG
break;
default:
return HWC2::Error::Unsupported;
ALOGW("HDR type %d is not supported.", type);
return;
}
// Most luminance values are coded as an unsigned 16-bit value in units of 1
@ -1067,8 +1036,6 @@ HWC2::Error HwcDisplay::SetHdrOutputMetadata(ui::Hdr type) {
auto whitePoint = gamut.getWhitePoint();
m->white_point.x = ToU16ColorValue(whitePoint.x);
m->white_point.y = ToU16ColorValue(whitePoint.y);
return HWC2::Error::None;
}
const Backend *HwcDisplay::backend() const {

11
hwc2_device/HwcDisplay.h
View file

@ -154,11 +154,8 @@ class HwcDisplay {
auto GetColorModes() -> std::vector<ColorMode>;
void SetColorMode(ColorMode color_mode);
// HWC2 Hooks - these should not be used outside of the hwc2 device.
HWC2::Error GetHdrCapabilities(uint32_t *num_types, int32_t *types,
float *max_luminance,
float *max_average_luminance,
float *min_luminance);
void GetHdrCapabilities(std::vector<ui::Hdr> *types, float *max_luminance,
float *max_average_luminance, float *min_luminance);
bool IsWritebackSupported();
bool SetWritebackEnabled(bool enabled);
@ -279,8 +276,8 @@ class HwcDisplay {
bool Init();
HWC2::Error SetHdrOutputMetadata(ui::Hdr hdrType);
HWC2::Error SetOutputType(uint32_t hdr_output_type);
void SetHdrOutputMetadata(ui::Hdr hdrType);
void SetOutputType(uint32_t hdr_output_type);
auto GetEdid() -> EdidWrapperUnique & {
return GetPipe().connector->Get()->GetParsedEdid();

39
hwc2_device/hwc2_device.cpp
View file

@ -699,6 +699,40 @@ static int32_t AcceptDisplayChanges(hwc2_device_t *device,
return 0;
}
static int32_t GetHdrCapabilities(hwc2_device_t *device, hwc2_display_t display,
uint32_t *num_types, int32_t *types,
float *max_luminance,
float *max_average_luminance,
float *min_luminance) {
ALOGV("GetHdrCapabilities");
LOCK_COMPOSER(device);
GET_DISPLAY(display);
std::vector<ui::Hdr> temp_types;
idisplay->GetHdrCapabilities(&temp_types, max_luminance,
max_average_luminance, min_luminance);
uint32_t i = 0;
for (auto &t : temp_types) {
switch (t) {
case ui::Hdr::HDR10:
// NOLINTNEXTLINE(cppcoreguidelines-pro-bounds-pointer-arithmetic):
types[i++] = HAL_HDR_HDR10;
break;
case ui::Hdr::HLG:
// NOLINTNEXTLINE(cppcoreguidelines-pro-bounds-pointer-arithmetic):
types[i++] = HAL_HDR_HLG;
break;
default:
// Ignore any other HDR types
break;
}
}
*num_types = i;
return 0;
}
static int32_t GetReleaseFences(hwc2_device_t *device, hwc2_display_t display,
uint32_t *out_num_elements,
hwc2_layer_t *out_layers, int32_t *out_fences) {
@ -1338,10 +1372,7 @@ static hwc2_function_pointer_t HookDevGetFunction(struct hwc2_device * /*dev*/,
case HWC2::FunctionDescriptor::GetDozeSupport:
return (hwc2_function_pointer_t)GetDozeSupport;
case HWC2::FunctionDescriptor::GetHdrCapabilities:
return ToHook<HWC2_PFN_GET_HDR_CAPABILITIES>(
DisplayHook<decltype(&HwcDisplay::GetHdrCapabilities),
&HwcDisplay::GetHdrCapabilities, uint32_t *, int32_t *,
float *, float *, float *>);
return (hwc2_function_pointer_t)GetHdrCapabilities;
case HWC2::FunctionDescriptor::GetReleaseFences:
return (hwc2_function_pointer_t)GetReleaseFences;
case HWC2::FunctionDescriptor::PresentDisplay:

23
hwc3/ComposerClient.cpp
View file

@ -1087,27 +1087,8 @@ ndk::ScopedAStatus ComposerClient::getHdrCapabilities(int64_t display_id,
return ToBinderStatus(hwc3::Error::kBadDisplay);
}
uint32_t num_types = 0;
hwc3::Error error = Hwc2toHwc3Error(
display->GetHdrCapabilities(&num_types, nullptr, nullptr, nullptr,
nullptr));
if (error != hwc3::Error::kNone) {
return ToBinderStatus(error);
}
std::vector<int32_t> out_types(num_types);
error = Hwc2toHwc3Error(
display->GetHdrCapabilities(&num_types, out_types.data(),
&caps->maxLuminance,
&caps->maxAverageLuminance,
&caps->minLuminance));
if (error != hwc3::Error::kNone) {
return ToBinderStatus(error);
}
caps->types.reserve(num_types);
for (const auto type : out_types)
caps->types.emplace_back(Hwc2HdrTypeToHwc3(type));
display->GetHdrCapabilities(&caps->types, &caps->maxLuminance,
&caps->maxAverageLuminance, &caps->minLuminance);
return ndk::ScopedAStatus::ok();
}