libhwc2.1: remove the if defined guard for histogram

When landing the multi channel histogram, we use the if defined guard
to prevent the build breakage due to older kernel. Now all the kernel
prebuilts are merged, the if defined guard can be removed.

Bug: 295990513
Test: build pass
Change-Id: If65f9cee656d9181fbbef5f6bd8ea2bb414d5c5e
Signed-off-by: Leo Chen <yinchiuan@google.com>

4 files changed, 1 insertions, 13 deletions

diff --git a/libhwc2.1/libdevice/HistogramController.cpp b/libhwc2.1/libdevice/HistogramController.cpp
index 6cf6f78..8af0fa1 100644
--- a/libhwc2.1/libdevice/HistogramController.cpp
+++ b/libhwc2.1/libdevice/HistogramController.cpp
@@ -21,8 +21,6 @@ void HistogramController::initPlatformHistogramCapability() {
     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 {
@@ -70,4 +68,3 @@ int HistogramController::parseDrmEvent(void* event, uint8_t& channelId, char16_t
     buffer = (char16_t*)&histogram_channel_event->bins;
     return NO_ERROR;
 }
-#endif
diff --git a/libhwc2.1/libdevice/HistogramController.h b/libhwc2.1/libdevice/HistogramController.h
index a895bdd..de60bf1 100644
--- a/libhwc2.1/libdevice/HistogramController.h
+++ b/libhwc2.1/libdevice/HistogramController.h
@@ -22,12 +22,9 @@ class HistogramController : public HistogramDevice {
 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
 };
diff --git a/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterfaceModule.cpp b/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterfaceModule.cpp
index 987cd90..e4f8f08 100644
--- a/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterfaceModule.cpp
+++ b/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterfaceModule.cpp
@@ -52,8 +52,6 @@ ExynosPrimaryDisplayDrmInterfaceModule::ExynosPrimaryDisplayDrmInterfaceModule(E
             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;
 
@@ -73,4 +71,3 @@ int32_t ExynosPrimaryDisplayDrmInterfaceModule::sendHistogramChannelIoctl(Histog
         return BAD_VALUE;
     }
 }
-#endif
diff --git a/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterfaceModule.h b/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterfaceModule.h
index f654d4b..c32d343 100644
--- a/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterfaceModule.h
+++ b/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterfaceModule.h
@@ -26,12 +26,9 @@ namespace zuma {
 class ExynosPrimaryDisplayDrmInterfaceModule
       : public gs201::ExynosPrimaryDisplayDrmInterfaceModule {
 public:
-    ExynosPrimaryDisplayDrmInterfaceModule(ExynosDisplay *exynosDisplay);
-// TODO: b/295990513 - Remove the if defined after kernel prebuilts are merged.
-#if defined(EXYNOS_HISTOGRAM_CHANNEL_REQUEST)
+    ExynosPrimaryDisplayDrmInterfaceModule(ExynosDisplay* exynosDisplay);
     virtual int32_t sendHistogramChannelIoctl(HistogramChannelIoctl_t control,
                                               uint8_t channelId) const override;
-#endif
 };
 
 using ExynosExternalDisplayDrmInterfaceModule = gs201::ExynosExternalDisplayDrmInterfaceModule;