summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYongWook Shin <yongwook.shin@samsung.com>2021-08-02 11:52:25 +0900
committerWeizhung Ding <weizhungding@google.com>2021-09-11 10:01:17 +0800
commitd6a0f1e668c8a76dbcdbb538ee753fefd2c67961 (patch)
treed0577fd7eb7cec451800013d9b8afa6394f4982b
parentbff5f6c9ae023614b89b2cb9a91466a720ba0917 (diff)
downloadgs101-d6a0f1e668c8a76dbcdbb538ee753fefd2c67961.tar.gz
libhwc2.1: Add cgc_lut property checker
cgc_lut property is changed for GS201. To prevent old style cgc configuration failure, property checking codes are added. Bug: 187006158 Signed-off-by: YongWook Shin <yongwook.shin@samsung.com> Change-Id: Ia539b48caa3e6a68b95e7660b6b14118851ffd67 Merged-In: Ia539b48caa3e6a68b95e7660b6b14118851ffd67
-rw-r--r--libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterfaceModule.cpp3
-rw-r--r--libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterfaceModule.h2
2 files changed, 3 insertions, 2 deletions
diff --git a/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterfaceModule.cpp b/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterfaceModule.cpp
index 569f656..93322a4 100644
--- a/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterfaceModule.cpp
+++ b/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterfaceModule.cpp
@@ -508,7 +508,8 @@ int32_t ExynosDisplayDrmInterfaceModule::setDisplayColorSetting(
int ret = NO_ERROR;
const IDisplayColorGS101::IDqe &dqe = display->getDqe();
- if ((ret = setDisplayColorBlob(mDrmCrtc->cgc_lut_property(),
+ if ((mDrmCrtc->cgc_lut_property().id() != 0) &&
+ (ret = setDisplayColorBlob(mDrmCrtc->cgc_lut_property(),
static_cast<uint32_t>(DqeBlobs::CGC),
dqe.Cgc(), dqe, drmReq) != NO_ERROR)) {
HWC_LOGE(mExynosDisplay, "%s: set Cgc blob fail", __func__);
diff --git a/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterfaceModule.h b/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterfaceModule.h
index 55671c4..d0d1b46 100644
--- a/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterfaceModule.h
+++ b/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterfaceModule.h
@@ -66,7 +66,7 @@ class ExynosDisplayDrmInterfaceModule : public ExynosDisplayDrmInterface {
uint32_t &blobId);
int32_t createOetfBlobFromIDpp(const IDisplayColorGS101::IDpp &dpp,
uint32_t &blobId);
- private:
+ protected:
class SaveBlob {
public:
~SaveBlob();