summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libs/gui/BLASTBufferQueue.cpp73
-rw-r--r--libs/gui/include/gui/BLASTBufferQueue.h12
-rw-r--r--services/surfaceflinger/BufferStateLayer.cpp2
-rw-r--r--services/surfaceflinger/BufferStateLayer.h1
4 files changed, 8 insertions, 80 deletions
diff --git a/libs/gui/BLASTBufferQueue.cpp b/libs/gui/BLASTBufferQueue.cpp
index 9cb7c88956..9080822f92 100644
--- a/libs/gui/BLASTBufferQueue.cpp
+++ b/libs/gui/BLASTBufferQueue.cpp
@@ -58,22 +58,13 @@ namespace android {
ALOGE("[%s](f:%u,a:%u) " x, mName.c_str(), mNumFrameAvailable, mNumAcquired, ##__VA_ARGS__)
void BLASTBufferItemConsumer::onDisconnect() {
- {
- Mutex::Autolock lock(mMutex);
- mPreviouslyConnected = mCurrentlyConnected;
- mCurrentlyConnected = false;
- if (mPreviouslyConnected) {
- mDisconnectEvents.push(mCurrentFrameNumber);
- }
- mFrameEventHistory.onDisconnect();
- }
-
- {
- std::scoped_lock lock(mBufferQueueMutex);
- if (mBLASTBufferQueue != nullptr) {
- mBLASTBufferQueue->onProducerDisconnect();
- }
+ Mutex::Autolock lock(mMutex);
+ mPreviouslyConnected = mCurrentlyConnected;
+ mCurrentlyConnected = false;
+ if (mPreviouslyConnected) {
+ mDisconnectEvents.push(mCurrentFrameNumber);
}
+ mFrameEventHistory.onDisconnect();
}
void BLASTBufferItemConsumer::addAndGetFrameTimestamps(const NewFrameEventsEntry* newTimestamps,
@@ -211,11 +202,7 @@ void BLASTBufferQueue::update(const sp<SurfaceControl>& surface, uint32_t width,
}
SurfaceComposerClient::Transaction t;
- bool setBackpressureFlag = false;
- if (!SurfaceControl::isSameSurface(mSurfaceControl, surface)) {
- mSurfaceControlSwapCount++;
- setBackpressureFlag = true;
- }
+ const bool setBackpressureFlag = !SurfaceControl::isSameSurface(mSurfaceControl, surface);
bool applyTransaction = false;
// Always update the native object even though they might have the same layer handle, so we can
@@ -401,19 +388,6 @@ void BLASTBufferQueue::releaseBufferCallback(
std::unique_lock _lock{mMutex};
BQA_LOGV("releaseBufferCallback %s", id.to_string().c_str());
- const auto it = mFreedBuffers.find(id);
- if (it != mFreedBuffers.end()) {
- mFreedBuffers.erase(it);
- BQA_LOGV("releaseBufferCallback ignoring freed buffer %s", id.to_string().c_str());
- return;
- }
-
- if (mFreedBuffers.size() != 0 && mLogMissingReleaseCallback) {
- BQA_LOGD("Unexpected out of order buffer release. mFreedBuffer count=%d",
- static_cast<uint32_t>(mFreedBuffers.size()));
- mLogMissingReleaseCallback = false;
- }
-
// Calculate how many buffers we need to hold before we release them back
// to the buffer queue. This will prevent higher latency when we are running
// on a lower refresh rate than the max supported. We only do that for EGL
@@ -619,12 +593,6 @@ void BLASTBufferQueue::onFrameAvailable(const BufferItem& item) {
ATRACE_CALL();
std::unique_lock _lock{mMutex};
- if ((mSurfaceControlSwapCount > mProducerDisconnectCount) && mLogScSwap) {
- BQA_LOGD("Expected producer disconnect sc swap count=%d bq disconnect count=%d",
- mSurfaceControlSwapCount, mProducerDisconnectCount);
- mLogScSwap = false;
- }
-
const bool nextTransactionSet = mNextTransaction != nullptr;
BQA_LOGV("onFrameAvailable-start nextTransactionSet=%s", boolToString(nextTransactionSet));
if (nextTransactionSet) {
@@ -991,31 +959,4 @@ uint64_t BLASTBufferQueue::getLastAcquiredFrameNum() {
return mLastAcquiredFrameNumber;
}
-// When the producer disconnects, all buffers in the queue will be freed. So clean up the bbq
-// acquire state and handle any pending release callbacks. If we do get a release callback for a
-// pending buffer for a disconnected queue, we cannot release the buffer back to the queue. So track
-// these separately and drop the release callbacks as they come.
-
-// Transaction callbacks are still expected to come in the order they were submitted regardless of
-// buffer queue state. So we can continue to handles the pending transactions and transaction
-// complete callbacks. When the queue is reconnected, the queue will increment the framenumbers
-// starting from the last queued framenumber.
-void BLASTBufferQueue::onProducerDisconnect() {
- BQA_LOGV("onProducerDisconnect");
- std::scoped_lock _lock{mMutex};
- // reset counts since the queue has been disconnected and all buffers have been freed.
- mNumFrameAvailable = 0;
- mNumAcquired = 0;
-
- // Track submitted buffers in a different container so we can handle any pending release buffer
- // callbacks without affecting the BBQ acquire state.
- mFreedBuffers.insert(mSubmitted.begin(), mSubmitted.end());
- mSubmitted.clear();
- mPendingRelease.clear();
- mProducerDisconnectCount++;
- mCallbackCV.notify_all();
- mLogMissingReleaseCallback = true;
- mLogScSwap = true;
-}
-
} // namespace android
diff --git a/libs/gui/include/gui/BLASTBufferQueue.h b/libs/gui/include/gui/BLASTBufferQueue.h
index 72567e3f93..3881620f3d 100644
--- a/libs/gui/include/gui/BLASTBufferQueue.h
+++ b/libs/gui/include/gui/BLASTBufferQueue.h
@@ -109,8 +109,6 @@ public:
uint32_t getLastTransformHint() const;
uint64_t getLastAcquiredFrameNum();
- void onProducerDisconnect();
-
virtual ~BLASTBufferQueue();
private:
@@ -158,12 +156,6 @@ private:
std::unordered_map<ReleaseCallbackId, BufferItem, ReleaseBufferCallbackIdHash> mSubmitted
GUARDED_BY(mMutex);
- // Keep a reference to the submitted buffers that were freed so we can drop the buffer quietly
- // when we get the release callback from flinger. This can happen if the client had disconnected
- // from the queue.
- std::unordered_map<ReleaseCallbackId, BufferItem, ReleaseBufferCallbackIdHash> mFreedBuffers
- GUARDED_BY(mMutex);
-
// Keep a queue of the released buffers instead of immediately releasing
// the buffers back to the buffer queue. This would be controlled by SF
// setting the max acquired buffer count.
@@ -248,10 +240,6 @@ private:
uint32_t mCurrentMaxAcquiredBufferCount;
bool mWaitForTransactionCallback = false;
- bool mLogScSwap = true;
- bool mLogMissingReleaseCallback = true;
- uint32_t mSurfaceControlSwapCount = 0;
- uint32_t mProducerDisconnectCount = 0;
};
} // namespace android
diff --git a/services/surfaceflinger/BufferStateLayer.cpp b/services/surfaceflinger/BufferStateLayer.cpp
index 25fb6ce2ae..c0753f9d47 100644
--- a/services/surfaceflinger/BufferStateLayer.cpp
+++ b/services/surfaceflinger/BufferStateLayer.cpp
@@ -404,7 +404,7 @@ bool BufferStateLayer::setBuffer(const BufferData& bufferData, nsecs_t postTime,
nsecs_t desiredPresentTime, bool isAutoTimestamp,
std::optional<nsecs_t> dequeueTime,
const FrameTimelineInfo& info) {
- ATRACE_NAME(mSetBufferTraceTag.c_str());
+ ATRACE_CALL();
const std::shared_ptr<renderengine::ExternalTexture>& buffer =
getBufferFromBufferData(bufferData);
diff --git a/services/surfaceflinger/BufferStateLayer.h b/services/surfaceflinger/BufferStateLayer.h
index 3aa60826d0..eea700cf7b 100644
--- a/services/surfaceflinger/BufferStateLayer.h
+++ b/services/surfaceflinger/BufferStateLayer.h
@@ -153,7 +153,6 @@ private:
static constexpr int kPendingClassificationMaxSurfaceFrames = 25;
const std::string mBlastTransactionName{"BufferTX - " + mName};
- const std::string mSetBufferTraceTag{"setBuffer - " + mName};
// This integer is incremented everytime a buffer arrives at the server for this layer,
// and decremented when a buffer is dropped or latched. When changed the integer is exported
// to systrace with ATRACE_INT and mBlastTransactionName. This way when debugging perf it is
generated by cgit v1.2.3-59-g8ed1b (git 2.39.0) at 2025-11-01 18:55:17 +0000