summaryrefslogtreecommitdiff
path: root/hwc3
diff options
context:
space:
mode:
authorShubham Dubey <dubeyshubham@google.com>2022-02-16 04:47:05 +0000
committerShubham Dubey <dubeyshubham@google.com>2022-02-16 04:47:05 +0000
commit13c602ef2fa6ec36e9ec02633ec7727fd4427d3c (patch)
treec4beb98a395704dbb2b039a6528ace1d428b3688 /hwc3
parent91700d7c6e6cea728e3d8525745ddbf8a0517c98 (diff)
Revert "libhwc2.1: support setIdleTimerEnabled"
This reverts commit 91700d7c6e6cea728e3d8525745ddbf8a0517c98. Reason for revert: Introduced untracked linux denials BUG: 219857957 Change-Id: I924352333ff3c36e971c11a8f48831ab5cac75b3
Diffstat (limited to 'hwc3')
-rw-r--r--hwc3/ComposerClient.cpp10
-rw-r--r--hwc3/impl/HalImpl.cpp12
-rw-r--r--hwc3/impl/HalImpl.h1
-rw-r--r--hwc3/include/IComposerHal.h2
4 files changed, 3 insertions, 22 deletions
diff --git a/hwc3/ComposerClient.cpp b/hwc3/ComposerClient.cpp
index 49d0e80..848d1f7 100644
--- a/hwc3/ComposerClient.cpp
+++ b/hwc3/ComposerClient.cpp
@@ -162,16 +162,6 @@ ndk::ScopedAStatus ComposerClient::getDisplayCapabilities(int64_t display,
return TO_BINDER_STATUS(err);
}
- bool support = false;
- err = mHal->getDisplayIdleTimerSupport(display, support);
- if (err != ::android::OK) {
- LOG(ERROR) << "failed to getDisplayIdleTimerSupport: " << err;
- }
-
- if (support) {
- caps->push_back(DisplayCapability::DISPLAY_IDLE_TIMER);
- }
-
return TO_BINDER_STATUS(err);
}
diff --git a/hwc3/impl/HalImpl.cpp b/hwc3/impl/HalImpl.cpp
index e16aff9..c999d50 100644
--- a/hwc3/impl/HalImpl.cpp
+++ b/hwc3/impl/HalImpl.cpp
@@ -939,11 +939,12 @@ int32_t HalImpl::setVsyncEnabled(int64_t display, bool enabled) {
return halDisplay->setVsyncEnabled(hwcEnable);
}
-int32_t HalImpl::setIdleTimerEnabled(int64_t display, int32_t timeout) {
+int32_t HalImpl::setIdleTimerEnabled(int64_t display, int32_t __unused timeout) {
ExynosDisplay* halDisplay;
RET_IF_ERR(getHalDisplay(display, halDisplay));
- return halDisplay->setDisplayIdleTimer(timeout);
+ // TODO(b/198808492): implement setIdleTimerEnabled
+ return HWC2_ERROR_UNSUPPORTED;
}
int32_t HalImpl::validateDisplay(int64_t display, std::vector<int64_t>* outChangedLayers,
@@ -1013,11 +1014,4 @@ int32_t HalImpl::getRCDLayerSupport(int64_t display, bool& outSupport) {
return halDisplay->getRCDLayerSupport(outSupport);
}
-int32_t HalImpl::getDisplayIdleTimerSupport(int64_t display, bool& outSupport) {
- ExynosDisplay* halDisplay;
- RET_IF_ERR(getHalDisplay(display, halDisplay));
-
- return halDisplay->getDisplayIdleTimerSupport(outSupport);
-}
-
} // namespace aidl::android::hardware::graphics::composer3::impl
diff --git a/hwc3/impl/HalImpl.h b/hwc3/impl/HalImpl.h
index 4b87b82..518870f 100644
--- a/hwc3/impl/HalImpl.h
+++ b/hwc3/impl/HalImpl.h
@@ -135,7 +135,6 @@ class HalImpl : public IComposerHal {
int32_t setReadbackBuffer(int64_t display, buffer_handle_t buffer,
const ndk::ScopedFileDescriptor& releaseFence) override;
int32_t setVsyncEnabled(int64_t display, bool enabled) override;
- int32_t getDisplayIdleTimerSupport(int64_t display, bool& outSupport) override;
int32_t setIdleTimerEnabled(int64_t display, int32_t timeout) override;
int32_t getRCDLayerSupport(int64_t display, bool& outSupport) override;
int32_t validateDisplay(int64_t display, std::vector<int64_t>* outChangedLayers,
diff --git a/hwc3/include/IComposerHal.h b/hwc3/include/IComposerHal.h
index 6f78f8e..a367868 100644
--- a/hwc3/include/IComposerHal.h
+++ b/hwc3/include/IComposerHal.h
@@ -119,8 +119,6 @@ class IComposerHal {
virtual int32_t getDisplayAttribute(int64_t display, int32_t config,
DisplayAttribute attribute, int32_t* outValue) = 0;
virtual int32_t getDisplayBrightnessSupport(int64_t display, bool& outSupport) = 0;
- virtual int32_t getDisplayIdleTimerSupport(int64_t display, bool& outSupport) = 0;
-
virtual int32_t getDisplayCapabilities(int64_t display,
std::vector<DisplayCapability>* caps) = 0;
virtual int32_t getDisplayConfigs(int64_t display, std::vector<int32_t>* configs) = 0;