Skip to content
Open

Hdr #128

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions drm/DrmConnector.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -485,14 +485,14 @@ bool DrmConnector::GetHdrCapabilities(uint32_t *outNumTypes, int32_t *outTypes,
ALOGE("outNumTypes couldn't be NULL!");
return false;
}

#if 0
if (NULL == outTypes) {
ALOGE("outTypes couldn't be NULL!");
//TODO: clarify SF's logic here
//kindly skip this check now and return nothing if it's NULL
return false;
}

#endif
if (NULL == outMaxLuminance) {
ALOGE("outMaxLuminance couldn't be NULL!");
return false;
Expand Down Expand Up @@ -537,7 +537,7 @@ bool DrmConnector::GetHdrCapabilities(uint32_t *outNumTypes, int32_t *outTypes,
*outMinLuminance = float(outminluminance);

int ret = GetConnectorProperty(*drm_, *this, "HDR_OUTPUT_METADATA", &hdr_op_metadata_prop_);
if (ret) {
if (!ret) {
ALOGE("%s Could not get HDR_OUTPUT_METADATA property\n", __FUNCTION__);
}
return true;
Expand Down
2 changes: 1 addition & 1 deletion drm/DrmDevice.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ bool DrmDevice::IsHdrSupportedDevice() {
} else {
std::string name(ver->name);
ALOGD("drm device name is : %s\n", name.c_str());
if (name == "i915") {
if (name == "i915" || name == "xe") {
is_hdr_supported_ = true;
} else {
is_hdr_supported_ = false;
Expand Down
2 changes: 1 addition & 1 deletion hwc2_device/HwcDisplay.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -984,7 +984,7 @@ HWC2::Error HwcDisplay::GetRenderIntents(
int32_t mode, uint32_t *outNumIntents,
int32_t * /*android_render_intent_v1_1_t*/ outIntents) {

if (NULL == outNumIntents || mode < HAL_COLOR_MODE_NATIVE || mode > HAL_COLOR_MODE_DISPLAY_P3) {
if (NULL == outNumIntents || mode < HAL_COLOR_MODE_NATIVE || mode > HAL_COLOR_MODE_BT2100_HLG) {
return HWC2::Error::BadParameter;
}

Expand Down