commit 39343c0828fafab7994686a88c0a3960490975f0
author Alessio Balsini <balsini@google.com> Wed Nov 22 13:58:04 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Nov 22 13:58:04 2023 +0000
tree 4310b78965c6960e9084fe1310f201c1dd25a1c8
parent 04178834b22eda6e2a5cd5a2d8759ef403cf94e3

Revert "libhwc2.1: remove the if defined guard for histogram"

This reverts commit 04178834b22eda6e2a5cd5a2d8759ef403cf94e3.

Reason for revert: b/312699412

Change-Id: I8b94e99467790af5d7e3ce1dac35d5be988c19b2

libhwc2.1/libdevice/HistogramController.cpp

diff --git a/libhwc2.1/libdevice/HistogramController.cpp b/libhwc2.1/libdevice/HistogramController.cpp
index 8af0fa1..6cf6f78 100644
--- a/libhwc2.1/libdevice/HistogramController.cpp
+++ b/libhwc2.1/libdevice/HistogramController.cpp
@@ -21,6 +21,8 @@
     mHistogramCapability.supportBlockingRoi = true;
 }
 
+// TODO: b/295990513 - Remove the if defined after kernel prebuilts are merged.
+#if defined(EXYNOS_HISTOGRAM_CHANNEL_REQUEST)
 int HistogramController::createHistogramDrmConfigLocked(const ChannelInfo& channel,
                                                         std::shared_ptr<void>& configPtr,
                                                         size_t& length) const {
@@ -68,3 +70,4 @@
     buffer = (char16_t*)&histogram_channel_event->bins;
     return NO_ERROR;
 }
+#endif

libhwc2.1/libdevice/HistogramController.h

diff --git a/libhwc2.1/libdevice/HistogramController.h b/libhwc2.1/libdevice/HistogramController.h
index de60bf1..a895bdd 100644
--- a/libhwc2.1/libdevice/HistogramController.h
+++ b/libhwc2.1/libdevice/HistogramController.h
@@ -22,9 +22,12 @@
 public:
     HistogramController(ExynosDisplay* display) : HistogramDevice(display, 4, {3}) {}
     virtual void initPlatformHistogramCapability() override;
+// TODO: b/295990513 - Remove the if defined after kernel prebuilts are merged.
+#if defined(EXYNOS_HISTOGRAM_CHANNEL_REQUEST)
     virtual int createHistogramDrmConfigLocked(const ChannelInfo& channel,
                                                std::shared_ptr<void>& configPtr,
                                                size_t& length) const override
             REQUIRES(channel.channelInfoMutex);
     virtual int parseDrmEvent(void* event, uint8_t& channelId, char16_t*& buffer) const override;
+#endif
 };

libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterfaceModule.cpp

diff --git a/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterfaceModule.cpp b/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterfaceModule.cpp
index e4f8f08..987cd90 100644
--- a/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterfaceModule.cpp
+++ b/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterfaceModule.cpp
@@ -52,6 +52,8 @@
             std::memcpy(mMonitorDescription.data(), panelModel.c_str(), mMonitorDescription.size());
 }
 
+// TODO: b/295990513 - Remove the if defined after kernel prebuilts are merged.
+#if defined(EXYNOS_HISTOGRAM_CHANNEL_REQUEST)
 int32_t ExynosPrimaryDisplayDrmInterfaceModule::sendHistogramChannelIoctl(HistogramChannelIoctl_t control, uint8_t channelId) const {
     struct exynos_drm_histogram_channel_request histogramRequest;
 
@@ -71,3 +73,4 @@
         return BAD_VALUE;
     }
 }
+#endif

libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterfaceModule.h

diff --git a/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterfaceModule.h b/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterfaceModule.h
index c32d343..f654d4b 100644
--- a/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterfaceModule.h
+++ b/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterfaceModule.h
@@ -26,9 +26,12 @@
 class ExynosPrimaryDisplayDrmInterfaceModule
       : public gs201::ExynosPrimaryDisplayDrmInterfaceModule {
 public:
-    ExynosPrimaryDisplayDrmInterfaceModule(ExynosDisplay* exynosDisplay);
+    ExynosPrimaryDisplayDrmInterfaceModule(ExynosDisplay *exynosDisplay);
+// TODO: b/295990513 - Remove the if defined after kernel prebuilts are merged.
+#if defined(EXYNOS_HISTOGRAM_CHANNEL_REQUEST)
     virtual int32_t sendHistogramChannelIoctl(HistogramChannelIoctl_t control,
                                               uint8_t channelId) const override;
+#endif
 };
 
 using ExynosExternalDisplayDrmInterfaceModule = gs201::ExynosExternalDisplayDrmInterfaceModule;