Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 16:09:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "SetColorMode is not available for vendor hwc less than 1.4" into pi-dev am: 308d390720

Browse Source 
am: 715a9092b0

Change-Id: I24dd9cf4e36dc305fb3572e1f9abf353df67c5a4
This commit is contained in:
huans
2018-06-05 22:00:46 -07:00
committed by android-build-merger
parent 06b48a7c25 715a9092b0
commit 1be9461f7a
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
graphics/composer/2.1/utils/hwc2on1adapter/HWC2On1Adapter.cpp
View File

@@ -858,18 +858,20 @@ Error HWC2On1Adapter::Display::setColorMode(android_color_mode_t mode) {
return Error::Unsupported;
}
uint32_t hwc1Config = 0;
auto error = mActiveConfig->getHwc1IdForColorMode(mode, &hwc1Config);
if (error != Error::None) {
return error;
}
if (mDevice.mHwc1MinorVersion >= 4) {
uint32_t hwc1Config = 0;
auto error = mActiveConfig->getHwc1IdForColorMode(mode, &hwc1Config);
if (error != Error::None) {
return error;
}
ALOGV("[%" PRIu64 "] Setting HWC1 config %u", mId, hwc1Config);
int intError = mDevice.mHwc1Device->setActiveConfig(mDevice.mHwc1Device,
mHwc1Id, hwc1Config);
if (intError != 0) {
ALOGE("[%" PRIu64 "] Failed to set HWC1 config (%d)", mId, intError);
return Error::Unsupported;
ALOGV("[%" PRIu64 "] Setting HWC1 config %u", mId, hwc1Config);
int intError =
mDevice.mHwc1Device->setActiveConfig(mDevice.mHwc1Device, mHwc1Id, hwc1Config);
if (intError != 0) {
ALOGE("[%" PRIu64 "] Failed to set HWC1 config (%d)", mId, intError);
return Error::Unsupported;
}
}
mActiveColorMode = mode;