Merge "SurfaceFlinger: Add SmoMo support" into r-keystone-qcom-dev
diff --git a/services/surfaceflinger/Android.bp b/services/surfaceflinger/Android.bp
index c6f1f7e..093264d 100644
--- a/services/surfaceflinger/Android.bp
+++ b/services/surfaceflinger/Android.bp
@@ -82,6 +82,7 @@
"android.hardware.graphics.composer@2.2-command-buffer",
"android.hardware.graphics.composer@2.3-command-buffer",
"android.hardware.graphics.composer@2.4-command-buffer",
+ "display_intf_headers",
],
export_static_lib_headers: [
"libcompositionengine",
diff --git a/services/surfaceflinger/BufferQueueLayer.cpp b/services/surfaceflinger/BufferQueueLayer.cpp
index c84b15d..1e8c46d 100644
--- a/services/surfaceflinger/BufferQueueLayer.cpp
+++ b/services/surfaceflinger/BufferQueueLayer.cpp
@@ -33,6 +33,8 @@
#include "FrameTracer/FrameTracer.h"
#include "TimeStats/TimeStats.h"
+#include "smomo_interface.h"
+
namespace android {
BufferQueueLayer::BufferQueueLayer(const LayerCreationArgs& args) : BufferLayer(args) {}
@@ -120,7 +122,17 @@
mFlinger->mTimeStats->incrementBadDesiredPresent(getSequence());
}
- const bool isDue = addedTime < expectedPresentTime;
+ bool isDue = addedTime < expectedPresentTime;
+
+ if (isDue && mFlinger->mSmoMo) {
+ smomo::SmomoBufferStats bufferStats;
+ bufferStats.id = getSequence();
+ bufferStats.queued_frames = getQueuedFrameCount();
+ bufferStats.auto_timestamp = mQueueItems[0].mIsAutoTimestamp;
+ bufferStats.timestamp = mQueueItems[0].mTimestamp;
+ isDue = mFlinger->mSmoMo->ShouldPresentNow(bufferStats, expectedPresentTime);
+ }
+
return isDue || !isPlausible;
}
@@ -442,6 +454,15 @@
mFlinger->mInterceptor->saveBufferUpdate(layerId, item.mGraphicBuffer->getWidth(),
item.mGraphicBuffer->getHeight(), item.mFrameNumber);
+ if (mFlinger->mSmoMo) {
+ smomo::SmomoBufferStats bufferStats;
+ bufferStats.id = getSequence();
+ bufferStats.queued_frames = getQueuedFrameCount();
+ bufferStats.auto_timestamp = item.mIsAutoTimestamp;
+ bufferStats.timestamp = item.mTimestamp;
+ mFlinger->mSmoMo->CollectLayerStats(bufferStats);
+ }
+
mFlinger->signalLayerUpdate();
mConsumer->onBufferAvailable(item);
}
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index dd570d0..a97c1c7 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -125,6 +125,8 @@
#include "android-base/parseint.h"
#include "android-base/stringprintf.h"
+#include "smomo_interface.h"
+
namespace android {
using namespace std::string_literals;
@@ -260,6 +262,45 @@
SurfaceFlingerBE::SurfaceFlingerBE() : mHwcServiceName(getHwcServiceName()) {}
+bool SmomoWrapper::init() {
+ mSmoMoLibHandle = dlopen(SMOMO_LIBRARY_NAME, RTLD_NOW);
+ if (!mSmoMoLibHandle) {
+ ALOGE("Unable to open SmoMo lib: %s", dlerror());
+ return false;
+ }
+
+ mSmoMoCreateFunc =
+ reinterpret_cast<CreateSmoMoFuncPtr>(dlsym(mSmoMoLibHandle,
+ CREATE_SMOMO_INTERFACE_NAME));
+ mSmoMoDestroyFunc =
+ reinterpret_cast<DestroySmoMoFuncPtr>(dlsym(mSmoMoLibHandle,
+ DESTROY_SMOMO_INTERFACE_NAME));
+
+ if (!mSmoMoCreateFunc || !mSmoMoDestroyFunc) {
+ ALOGE("Can't load SmoMo symbols: %s", dlerror());
+ dlclose(mSmoMoLibHandle);
+ return false;
+ }
+
+ if (!mSmoMoCreateFunc(SMOMO_VERSION_TAG, &mInst)) {
+ ALOGE("Unable to create SmoMo interface");
+ dlclose(mSmoMoLibHandle);
+ return false;
+ }
+
+ return true;
+}
+
+SmomoWrapper::~SmomoWrapper() {
+ if (mInst) {
+ mSmoMoDestroyFunc(mInst);
+ }
+
+ if (mSmoMoLibHandle) {
+ dlclose(mSmoMoLibHandle);
+ }
+}
+
SurfaceFlinger::SurfaceFlinger(Factory& factory, SkipInitializationTag)
: mFactory(factory),
mInterceptor(mFactory.createSurfaceInterceptor(this)),
@@ -708,6 +749,27 @@
ALOGE("Unable to open Perf Lib: %s", dlerror());
}
+ char smomoProp[PROPERTY_VALUE_MAX];
+ property_get("vendor.display.use_smooth_motion", smomoProp, "0");
+ if (atoi(smomoProp) && mSmoMo.init()) {
+ mSmoMo->SetChangeRefreshRateCallback(
+ [this](int32_t refreshRate) {
+ setRefreshRateTo(refreshRate);
+ });
+
+ std::vector<float> refreshRates;
+ auto iter = mRefreshRateConfigs->getAllRefreshRates().cbegin();
+ while (iter != mRefreshRateConfigs->getAllRefreshRates().cend()) {
+ if (iter->second->fps > 0) {
+ refreshRates.push_back(iter->second->fps);
+ }
+ ++iter;
+ }
+ mSmoMo->SetDisplayRefreshRates(refreshRates);
+
+ ALOGI("SmoMo is enabled");
+ }
+
ALOGV("Done initializing");
}
@@ -1643,6 +1705,23 @@
setDesiredActiveConfig({refreshRate.configId, event});
}
+void SurfaceFlinger::setRefreshRateTo(int32_t refreshRate) {
+ auto& currentRefreshRate = mRefreshRateConfigs->getCurrentRefreshRate();
+
+ auto iter = mRefreshRateConfigs->getAllRefreshRates().cbegin();
+ while (iter != mRefreshRateConfigs->getAllRefreshRates().cend()) {
+ if (std::abs(iter->second->fps - refreshRate) <
+ scheduler::RefreshRateConfigs::RefreshRate::FPS_EPSILON) {
+ break;
+ }
+ ++iter;
+ }
+
+ if (currentRefreshRate != *iter->second) {
+ changeRefreshRate(*iter->second, Scheduler::ConfigEvent::Changed);
+ }
+}
+
void SurfaceFlinger::onHotplugReceived(int32_t sequenceId, hwc2_display_t hwcDisplayId,
HWC2::Connection connection) {
ALOGV("%s(%d, %" PRIu64 ", %s)", __FUNCTION__, sequenceId, hwcDisplayId,
@@ -2331,6 +2410,29 @@
mRegionSamplingThread->notifyNewContent();
}
+ if (mSmoMo) {
+ ATRACE_NAME("SmoMoUpdateState");
+ Mutex::Autolock lock(mStateLock);
+
+ uint32_t fps = 0;
+ std::vector<smomo::SmomoLayerStats> layers;
+
+ // Disable SmoMo by passing empty layer stack in multiple display case
+ if (mDisplays.size() == 1) {
+ for (auto& layer : mLayersWithQueuedFrames) {
+ smomo::SmomoLayerStats layerStats;
+ layerStats.id = layer->getSequence();
+ layerStats.name = layer->getName();
+ layers.push_back(layerStats);
+ }
+
+ fps = mRefreshRateConfigs->getCurrentRefreshRate().fps;
+ }
+
+ mSmoMo->UpdateSmomoState(layers, fps);
+ }
+
+
// Even though ATRACE_INT64 already checks if tracing is enabled, it doesn't prevent the
// side-effect of getTotalSize(), so we check that again here
if (ATRACE_ENABLED()) {
diff --git a/services/surfaceflinger/SurfaceFlinger.h b/services/surfaceflinger/SurfaceFlinger.h
index 4c2d925..2fcdd33 100644
--- a/services/surfaceflinger/SurfaceFlinger.h
+++ b/services/surfaceflinger/SurfaceFlinger.h
@@ -84,6 +84,12 @@
using namespace android::surfaceflinger;
+namespace smomo {
+class SmomoIntf;
+} // namespace smomo
+
+using smomo::SmomoIntf;
+
namespace android {
class Client;
@@ -172,6 +178,29 @@
int32_t mComposerSequenceId = 0;
};
+class SmomoWrapper {
+public:
+ SmomoWrapper() {}
+ ~SmomoWrapper();
+
+ bool init();
+
+ SmomoIntf* operator->() { return mInst; }
+ operator bool() { return mInst != nullptr; }
+
+ SmomoWrapper(const SmomoWrapper&) = delete;
+ SmomoWrapper& operator=(const SmomoWrapper&) = delete;
+
+private:
+ SmomoIntf *mInst = nullptr;
+ void *mSmoMoLibHandle = nullptr;
+
+ using CreateSmoMoFuncPtr = std::add_pointer<bool(uint16_t, SmomoIntf**)>::type;
+ using DestroySmoMoFuncPtr = std::add_pointer<void(SmomoIntf*)>::type;
+ CreateSmoMoFuncPtr mSmoMoCreateFunc;
+ DestroySmoMoFuncPtr mSmoMoDestroyFunc;
+};
+
class SurfaceFlinger : public BnSurfaceComposer,
public PriorityDumper,
public ClientCache::ErasedRecipient,
@@ -845,6 +874,8 @@
void changeRefreshRateLocked(const RefreshRate&, Scheduler::ConfigEvent event)
REQUIRES(mStateLock);
+ void setRefreshRateTo(int32_t refreshRate);
+
bool isDisplayConfigAllowed(HwcConfigIndexType configId) const REQUIRES(mStateLock);
// Gets the fence for the previous frame.
@@ -1282,6 +1313,8 @@
void *mPerfLibHandle = nullptr;
int (*mPerfLockReleaseFunc)(int handle) = nullptr;
int (*mPerfHintFunc)(int hintId, const char *package, int duration, int refreshRate) = nullptr;
+
+ SmomoWrapper mSmoMo;
};
} // namespace android