[automerger skipped] Merge Android 24Q2 Release (ab/11526283) to aosp-main-future am: cb052073a1 -s ours
am skip reason: Merged-In I15ce7fea77d37640212a6c2572a4d6cc11245482 with SHA-1 5b054f82fa is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/graphics/gs101/+/27273842
Change-Id: I3b6e340ce49f68a47e3f41037131ed4697b1a808
Signed-off-by: Automerger Merge Worker <[email protected]>
diff --git a/include/gs101/displaycolor/displaycolor_gs101.h b/include/gs101/displaycolor/displaycolor_gs101.h
index e339e2f..a1fe611 100644
--- a/include/gs101/displaycolor/displaycolor_gs101.h
+++ b/include/gs101/displaycolor/displaycolor_gs101.h
@@ -114,7 +114,7 @@
// To avoid updating legacy source code after separate lut and rgb2y,
// use inheritance instead of composition.
- struct DtmConfigType : public FlexLutConfigType<uint16_t, uint32_t, 33>,
+ struct DtmConfigType : public FlexLutConfigType<uint32_t, uint32_t, 33>,
public Rgb2YData {};
public:
@@ -183,7 +183,7 @@
/// CGC dither register value
union {
DitherConfigType cgc_dither_reg = {};
- uint8_t cgc_dither; // only lowest 8 bit is used
+ uint16_t cgc_dither; // only lowest 16 bit is used
};
/// flag to use disp_dither
@@ -317,8 +317,9 @@
};
/// Get pipeline color data for specified display type
- virtual const IDisplayPipelineData* GetPipelineData(
- DisplayType display) const = 0;
+ // deprecated by the 'int64_t display' version
+ virtual const IDisplayPipelineData* GetPipelineData(DisplayType display) const = 0;
+ virtual const IDisplayPipelineData* GetPipelineData(const int64_t display) const = 0;
virtual ~IDisplayColorGS101() {}
};
diff --git a/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterfaceModule.cpp b/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterfaceModule.cpp
index 7431091..f5e63f1 100644
--- a/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterfaceModule.cpp
+++ b/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterfaceModule.cpp
@@ -406,8 +406,11 @@
return 0;
}
-ExynosDisplayDrmInterfaceModule::SaveBlob::~SaveBlob()
-{
+ExynosDisplayDrmInterfaceModule::SaveBlob::~SaveBlob() {
+ clearBlobs();
+}
+
+void ExynosDisplayDrmInterfaceModule::SaveBlob::clearBlobs() {
for (auto &it: blobs) {
mDrmDevice->DestroyPropertyBlob(it);
}
diff --git a/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterfaceModule.h b/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterfaceModule.h
index 70e963b..ba3613c 100644
--- a/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterfaceModule.h
+++ b/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterfaceModule.h
@@ -60,6 +60,8 @@
int32_t setHistogramControl(hidl_histogram_control_t enabled);
virtual int32_t setHistogramData(void *bin);
+ void clearOldCrtcBlobs() override { mOldDqeBlobs.clearBlobs(); }
+
protected:
class SaveBlob {
public:
@@ -70,6 +72,8 @@
};
void addBlob(uint32_t type, uint32_t blob);
uint32_t getBlob(uint32_t type);
+ void clearBlobs();
+
private:
DrmDevice *mDrmDevice = NULL;
std::vector<uint32_t> blobs;
diff --git a/libhwc2.1/libexternaldisplay/ExynosExternalDisplayModule.cpp b/libhwc2.1/libexternaldisplay/ExynosExternalDisplayModule.cpp
index 59844f4..04420b9 100644
--- a/libhwc2.1/libexternaldisplay/ExynosExternalDisplayModule.cpp
+++ b/libhwc2.1/libexternaldisplay/ExynosExternalDisplayModule.cpp
@@ -130,3 +130,14 @@
return ret;
}
+
+void ExynosExternalDisplayModule::invalidate() {
+ ExynosExternalDisplay::invalidate();
+
+ // invalidate() is invoked when we handle hotplug event for the external display.
+ // we need to call clear() here to ensure both layerDataMappingInfo and
+ // prev_layerDataMappingInfo are clearead in DisplaySceneInfo, otherwise old
+ // mappings preserved in prev_layerDataMappingInfo will be re-used after the
+ // next hotplug, causing color issues (see b/325549729).
+ getDisplaySceneInfo().clear();
+}
diff --git a/libhwc2.1/libexternaldisplay/ExynosExternalDisplayModule.h b/libhwc2.1/libexternaldisplay/ExynosExternalDisplayModule.h
index fcffc44..5475094 100644
--- a/libhwc2.1/libexternaldisplay/ExynosExternalDisplayModule.h
+++ b/libhwc2.1/libexternaldisplay/ExynosExternalDisplayModule.h
@@ -50,6 +50,8 @@
void setForceColorUpdate(bool force) { mForceColorUpdate = force; }
int deliverWinConfigData() override;
+ void invalidate() override;
+
private:
std::unique_ptr<ColorManager> mColorManager;
diff --git a/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp b/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp
index 2a273e6..d08ee3d 100644
--- a/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp
+++ b/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp
@@ -14,6 +14,8 @@
* limitations under the License.
*/
+#define ATRACE_TAG (ATRACE_TAG_GRAPHICS | ATRACE_TAG_HAL)
+
#include "ExynosPrimaryDisplayModule.h"
#include <android-base/file.h>
@@ -213,6 +215,8 @@
forceDisplayColorSetting);
}
+ checkAtcHdrMode();
+
ret = ExynosDisplay::deliverWinConfigData();
checkAtcAnimation();
@@ -407,6 +411,7 @@
}
int32_t ExynosPrimaryDisplayModule::setAtcMode(std::string mode_name) {
+ ATRACE_CALL();
auto mode_data = mAtcModeSetting.find(mode_name);
uint32_t ambient_light = 0;
uint32_t strength = 0;
@@ -458,8 +463,11 @@
}
void ExynosPrimaryDisplayModule::setLbeState(LbeState state) {
if (!mAtcInit) return;
+
std::string modeStr;
bool enhanced_hbm = false;
+ bool fullHdrLayer = isFullScreenHdrLayer();
+
switch (state) {
case LbeState::OFF:
mCurrentLux = 0;
@@ -482,7 +490,8 @@
return;
}
- if (setAtcMode(modeStr) != NO_ERROR) return;
+ if (fullHdrLayer && state != LbeState::OFF) checkAtcHdrMode();
+ else if (setAtcMode(modeStr) != NO_ERROR) return;
mBrightnessController->processEnhancedHbm(enhanced_hbm);
mBrightnessController->setOutdoorVisibility(state);
@@ -626,3 +635,32 @@
return (device->getActiveDisplay() != mIndex) && (prevMode == HWC_POWER_MODE_OFF) &&
(mode != HWC_POWER_MODE_OFF);
}
+
+void ExynosPrimaryDisplayModule::checkAtcHdrMode() {
+ ATRACE_CALL();
+ if (!mAtcInit) return;
+
+ auto it = mAtcModeSetting.find(kAtcModeHdrStr);
+ if (it == mAtcModeSetting.end()) {
+ return;
+ }
+
+ bool hdrModeActive = (mCurrentAtcModeName == kAtcModeHdrStr);
+ bool fullHdrLayer = isFullScreenHdrLayer();
+
+ if (fullHdrLayer) {
+ if (!hdrModeActive && (mCurrentLbeState != LbeState::OFF)) {
+ setAtcMode(kAtcModeHdrStr);
+ ALOGI("HdrLayer on to set atc hdr mode");
+ }
+ } else {
+ if (hdrModeActive) {
+ setLbeState(mCurrentLbeState);
+ ALOGI("HdrLayer off to restore Lbe State");
+ }
+ }
+}
+
+bool ExynosPrimaryDisplayModule::isFullScreenHdrLayer() {
+ return mBrightnessController->getHdrLayerState() == HdrLayerState::kHdrLarge;
+}
diff --git a/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.h b/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.h
index 3adc9dc..69585a4 100644
--- a/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.h
+++ b/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.h
@@ -48,6 +48,7 @@
constexpr char kAtcModeNormalStr[] = "normal";
constexpr char kAtcModeHbmStr[] = "hbm";
constexpr char kAtcModePowerSaveStr[] = "power_save";
+constexpr char kAtcModeHdrStr[] = "hdr";
#define ATC_AMBIENT_LIGHT_FILE_NAME "/sys/class/dqe%d/atc/ambient_light"
#define ATC_ST_FILE_NAME "/sys/class/dqe%d/atc/st"
@@ -174,6 +175,7 @@
int32_t setAtcStDimming(uint32_t target);
int32_t setAtcEnable(bool enable);
void checkAtcAnimation();
+ void checkAtcHdrMode();
bool isInAtcAnimation() {
if (mAtcStStepCount > 0)
return true;
@@ -208,6 +210,7 @@
bool mPendingAtcOff;
bool mForceColorUpdate = false;
bool mLbeSupported = false;
+ bool isFullScreenHdrLayer();
protected:
virtual int32_t setPowerMode(int32_t mode) override;
