Revert "SurfaceFlinger: send VSYNC power hints to IPowerManager"
This reverts commit d469a1c3285b974cf2637517cc25727da8f82668.
diff --git a/services/surfaceflinger/Android.mk b/services/surfaceflinger/Android.mk
index 8141b99..0834c80 100644
--- a/services/surfaceflinger/Android.mk
+++ b/services/surfaceflinger/Android.mk
@@ -96,8 +96,7 @@
libGLESv2 \
libbinder \
libui \
- libgui \
- libpowermanager
+ libgui
LOCAL_MODULE:= libsurfaceflinger
diff --git a/services/surfaceflinger/DisplayHardware/PowerHAL.cpp b/services/surfaceflinger/DisplayHardware/PowerHAL.cpp
index bd50b4a..e41fbbc 100644
--- a/services/surfaceflinger/DisplayHardware/PowerHAL.cpp
+++ b/services/surfaceflinger/DisplayHardware/PowerHAL.cpp
@@ -20,30 +20,38 @@
#include <cutils/log.h>
#include <utils/Errors.h>
-#include <binder/IServiceManager.h>
-#include <powermanager/IPowerManager.h>
-#include <powermanager/PowerManager.h>
-
#include "PowerHAL.h"
namespace android {
// ---------------------------------------------------------------------------
+PowerHAL::PowerHAL() : mPowerModule(0), mVSyncHintEnabled(false) {
+ int err = hw_get_module(POWER_HARDWARE_MODULE_ID,
+ (const hw_module_t **)&mPowerModule);
+ ALOGW_IF(err, "%s module not found", POWER_HARDWARE_MODULE_ID);
+}
+
+PowerHAL::~PowerHAL() {
+}
+
+status_t PowerHAL::initCheck() const {
+ return mPowerModule ? NO_ERROR : NO_INIT;
+}
+
status_t PowerHAL::vsyncHint(bool enabled) {
- Mutex::Autolock _l(mlock);
- if (mPowerManager == NULL) {
- const String16 serviceName("power");
- sp<IBinder> bs = defaultServiceManager()->checkService(serviceName);
- if (bs == NULL) {
- return NAME_NOT_FOUND;
+ if (!mPowerModule) {
+ return NO_INIT;
+ }
+ if (mPowerModule->common.module_api_version >= POWER_MODULE_API_VERSION_0_2) {
+ if (mPowerModule->powerHint) {
+ if (mVSyncHintEnabled != bool(enabled)) {
+ mPowerModule->powerHint(mPowerModule,
+ POWER_HINT_VSYNC, (void*)enabled);
+ mVSyncHintEnabled = bool(enabled);
+ }
}
- mPowerManager = interface_cast<IPowerManager>(bs);
}
- status_t status = mPowerManager->powerHint(POWER_HINT_VSYNC, enabled ? 1 : 0);
- if(status == DEAD_OBJECT) {
- mPowerManager = NULL;
- }
- return status;
+ return NO_ERROR;
}
// ---------------------------------------------------------------------------
diff --git a/services/surfaceflinger/DisplayHardware/PowerHAL.h b/services/surfaceflinger/DisplayHardware/PowerHAL.h
index e5f82a9..ef67b8f 100644
--- a/services/surfaceflinger/DisplayHardware/PowerHAL.h
+++ b/services/surfaceflinger/DisplayHardware/PowerHAL.h
@@ -19,9 +19,7 @@
#include <stdint.h>
#include <sys/types.h>
-#include <utils/Mutex.h>
-#include <powermanager/IPowerManager.h>
#include <hardware/power.h>
namespace android {
@@ -30,11 +28,15 @@
class PowerHAL
{
public:
+ PowerHAL();
+ ~PowerHAL();
+
+ status_t initCheck() const;
status_t vsyncHint(bool enabled);
private:
- sp<IPowerManager> mPowerManager;
- Mutex mlock;
+ power_module_t* mPowerModule;
+ bool mVSyncHintEnabled;
};
// ---------------------------------------------------------------------------
diff --git a/services/surfaceflinger/EventThread.cpp b/services/surfaceflinger/EventThread.cpp
index 9b6360e..d868f32 100644
--- a/services/surfaceflinger/EventThread.cpp
+++ b/services/surfaceflinger/EventThread.cpp
@@ -35,21 +35,12 @@
// ---------------------------------------------------------------------------
namespace android {
// ---------------------------------------------------------------------------
-// time to wait between VSYNC requests before sending a VSYNC OFF power hint: 40msec.
-const long vsyncHintOffDelay = 40000000;
-
-static void vsyncOffCallback(union sigval val) {
- EventThread *ev = (EventThread *)val.sival_ptr;
- ev->sendVsyncHintOff();
- return;
-}
EventThread::EventThread(const sp<VSyncSource>& src)
: mVSyncSource(src),
mUseSoftwareVSync(false),
mVsyncEnabled(false),
- mDebugVsyncEnabled(false),
- mVsyncHintSent(false) {
+ mDebugVsyncEnabled(false) {
for (int32_t i=0 ; i<DisplayDevice::NUM_BUILTIN_DISPLAY_TYPES ; i++) {
mVSyncEvent[i].header.type = DisplayEventReceiver::DISPLAY_EVENT_VSYNC;
@@ -57,31 +48,6 @@
mVSyncEvent[i].header.timestamp = 0;
mVSyncEvent[i].vsync.count = 0;
}
- struct sigevent se;
- se.sigev_notify = SIGEV_THREAD;
- se.sigev_value.sival_ptr = this;
- se.sigev_notify_function = vsyncOffCallback;
- se.sigev_notify_attributes = NULL;
- timer_create(CLOCK_MONOTONIC, &se, &mTimerId);
-}
-
-void EventThread::sendVsyncHintOff() {
- Mutex::Autolock _l(mLock);
- mPowerHAL.vsyncHint(false);
- mVsyncHintSent = false;
-}
-
-void EventThread::sendVsyncHintOnLocked() {
- struct itimerspec ts;
- if(!mVsyncHintSent) {
- mPowerHAL.vsyncHint(true);
- mVsyncHintSent = true;
- }
- ts.it_value.tv_sec = 0;
- ts.it_value.tv_nsec = vsyncHintOffDelay;
- ts.it_interval.tv_sec = 0;
- ts.it_interval.tv_nsec = 0;
- timer_settime(mTimerId, 0, &ts, NULL);
}
void EventThread::onFirstRef() {
@@ -341,16 +307,17 @@
mVsyncEnabled = true;
mVSyncSource->setCallback(static_cast<VSyncSource::Callback*>(this));
mVSyncSource->setVSyncEnabled(true);
+ mPowerHAL.vsyncHint(true);
}
}
mDebugVsyncEnabled = true;
- sendVsyncHintOnLocked();
}
void EventThread::disableVSyncLocked() {
if (mVsyncEnabled) {
mVsyncEnabled = false;
mVSyncSource->setVSyncEnabled(false);
+ mPowerHAL.vsyncHint(false);
mDebugVsyncEnabled = false;
}
}
diff --git a/services/surfaceflinger/EventThread.h b/services/surfaceflinger/EventThread.h
index d1c4fcd..f6ab4a7 100644
--- a/services/surfaceflinger/EventThread.h
+++ b/services/surfaceflinger/EventThread.h
@@ -97,7 +97,6 @@
DisplayEventReceiver::Event* event);
void dump(String8& result) const;
- void sendVsyncHintOff();
private:
virtual bool threadLoop();
@@ -108,7 +107,6 @@
void removeDisplayEventConnection(const wp<Connection>& connection);
void enableVSyncLocked();
void disableVSyncLocked();
- void sendVsyncHintOnLocked();
// constants
sp<VSyncSource> mVSyncSource;
@@ -126,9 +124,6 @@
// for debugging
bool mDebugVsyncEnabled;
-
- bool mVsyncHintSent;
- timer_t mTimerId;
};
// ---------------------------------------------------------------------------