Merge changes from topic 'vrflinger-cleanup'
* changes:
libbufferhub: Fix native buffer.
libvrflinger: Move display request to avoid duplicate calls.
libvrflinger: Remove superfluous update to display manager.
libvrflinger: Move some tracing to a more verbose level.
libvrflinger: Add additional info to PDX dump.
diff --git a/libs/vr/libbufferhub/include/private/dvr/native_buffer.h b/libs/vr/libbufferhub/include/private/dvr/native_buffer.h
index a54579f..140ffc5 100644
--- a/libs/vr/libbufferhub/include/private/dvr/native_buffer.h
+++ b/libs/vr/libbufferhub/include/private/dvr/native_buffer.h
@@ -52,8 +52,6 @@
void operator=(NativeBuffer&) = delete;
};
-// NativeBufferProducer is an implementation of ANativeWindowBuffer backed by a
-// BufferProducer.
class NativeBufferProducer : public android::ANativeObjectBase<
ANativeWindowBuffer, NativeBufferProducer,
android::LightRefBase<NativeBufferProducer>> {
@@ -71,20 +69,25 @@
ANativeWindowBuffer::stride = buffer_->stride();
ANativeWindowBuffer::format = buffer_->format();
ANativeWindowBuffer::usage = buffer_->usage();
- handle = buffer_->native_handle();
+ ANativeWindowBuffer::handle = buffer_->native_handle();
+ if (display_) {
+ image_khr_ =
+ eglCreateImageKHR(display_, EGL_NO_CONTEXT, EGL_NATIVE_BUFFER_ANDROID,
+ static_cast<ANativeWindowBuffer*>(this), nullptr);
+ } else {
+ image_khr_ = EGL_NO_IMAGE_KHR;
+ }
}
explicit NativeBufferProducer(const std::shared_ptr<BufferProducer>& buffer)
: NativeBufferProducer(buffer, nullptr, 0) {}
virtual ~NativeBufferProducer() {
- for (EGLImageKHR egl_image : egl_images_) {
- if (egl_image != EGL_NO_IMAGE_KHR)
- eglDestroyImageKHR(display_, egl_image);
- }
+ if (image_khr_ != EGL_NO_IMAGE_KHR)
+ eglDestroyImageKHR(display_, image_khr_);
}
- EGLImageKHR image_khr(int index) const { return egl_images_[index]; }
+ EGLImageKHR image_khr() const { return image_khr_; }
std::shared_ptr<BufferProducer> buffer() const { return buffer_; }
int release_fence() const { return release_fence_.Get(); }
uint32_t surface_buffer_index() const { return surface_buffer_index_; }
@@ -112,7 +115,7 @@
std::shared_ptr<BufferProducer> buffer_;
pdx::LocalHandle release_fence_;
- std::vector<EGLImageKHR> egl_images_;
+ EGLImageKHR image_khr_;
uint32_t surface_buffer_index_;
EGLDisplay display_;
diff --git a/libs/vr/libvrflinger/acquired_buffer.cpp b/libs/vr/libvrflinger/acquired_buffer.cpp
index 7932a9c..fda9585 100644
--- a/libs/vr/libvrflinger/acquired_buffer.cpp
+++ b/libs/vr/libvrflinger/acquired_buffer.cpp
@@ -55,9 +55,9 @@
if (acquire_fence_) {
const int ret = sync_wait(acquire_fence_.Get(), 0);
ALOGD_IF(TRACE || (ret < 0 && errno != ETIME),
- "AcquiredBuffer::IsAvailable: acquire_fence_=%d sync_wait()=%d "
- "errno=%d.",
- acquire_fence_.Get(), ret, ret < 0 ? errno : 0);
+ "AcquiredBuffer::IsAvailable: buffer_id=%d acquire_fence=%d "
+ "sync_wait()=%d errno=%d.",
+ buffer_->id(), acquire_fence_.Get(), ret, ret < 0 ? errno : 0);
if (ret == 0) {
// The fence is completed, so to avoid further calls to sync_wait we close
// it here.
@@ -78,6 +78,8 @@
}
int AcquiredBuffer::Release(LocalHandle release_fence) {
+ ALOGD_IF(TRACE, "AcquiredBuffer::Release: buffer_id=%d release_fence=%d",
+ buffer_ ? buffer_->id() : -1, release_fence.Get());
if (buffer_) {
// Close the release fence since we can't transfer it with an async release.
release_fence.Close();
diff --git a/libs/vr/libvrflinger/acquired_buffer.h b/libs/vr/libvrflinger/acquired_buffer.h
index dd4fcc5..e0dc9f2 100644
--- a/libs/vr/libvrflinger/acquired_buffer.h
+++ b/libs/vr/libvrflinger/acquired_buffer.h
@@ -67,13 +67,13 @@
int Release(pdx::LocalHandle release_fence);
private:
- AcquiredBuffer(const AcquiredBuffer&) = delete;
- void operator=(const AcquiredBuffer&) = delete;
-
std::shared_ptr<BufferConsumer> buffer_;
// Mutable so that the fence can be closed when it is determined to be
// signaled during IsAvailable().
mutable pdx::LocalHandle acquire_fence_;
+
+ AcquiredBuffer(const AcquiredBuffer&) = delete;
+ void operator=(const AcquiredBuffer&) = delete;
};
} // namespace dvr
diff --git a/libs/vr/libvrflinger/display_service.cpp b/libs/vr/libvrflinger/display_service.cpp
index dc9807a..2f54f71 100644
--- a/libs/vr/libvrflinger/display_service.cpp
+++ b/libs/vr/libvrflinger/display_service.cpp
@@ -1,6 +1,10 @@
#include "display_service.h"
#include <unistd.h>
+
+#include <algorithm>
+#include <sstream>
+#include <string>
#include <vector>
#include <android-base/file.h>
@@ -45,7 +49,65 @@
}
std::string DisplayService::DumpState(size_t /*max_length*/) {
- return hardware_composer_.Dump();
+ std::ostringstream stream;
+
+ auto surfaces = GetDisplaySurfaces();
+ std::sort(surfaces.begin(), surfaces.end(), [](const auto& a, const auto& b) {
+ return a->surface_id() < b->surface_id();
+ });
+
+ stream << "Application Surfaces:" << std::endl;
+
+ size_t count = 0;
+ for (const auto& surface : surfaces) {
+ if (surface->surface_type() == SurfaceType::Application) {
+ stream << "Surface " << count++ << ":";
+ stream << " surface_id=" << surface->surface_id()
+ << " process_id=" << surface->process_id()
+ << " user_id=" << surface->user_id()
+ << " visible=" << surface->visible()
+ << " z_order=" << surface->z_order();
+
+ stream << " queue_ids=";
+ auto queue_ids = surface->GetQueueIds();
+ std::sort(queue_ids.begin(), queue_ids.end());
+ for (int32_t id : queue_ids) {
+ if (id != queue_ids[0])
+ stream << ",";
+ stream << id;
+ }
+ stream << std::endl;
+ }
+ }
+ stream << std::endl;
+
+ stream << "Direct Surfaces:" << std::endl;
+
+ count = 0;
+ for (const auto& surface : surfaces) {
+ if (surface->surface_type() == SurfaceType::Direct) {
+ stream << "Surface " << count++ << ":";
+ stream << " surface_id=" << surface->surface_id()
+ << " process_id=" << surface->process_id()
+ << " user_id=" << surface->user_id()
+ << " visible=" << surface->visible()
+ << " z_order=" << surface->z_order();
+
+ stream << " queue_ids=";
+ auto queue_ids = surface->GetQueueIds();
+ std::sort(queue_ids.begin(), queue_ids.end());
+ for (int32_t id : queue_ids) {
+ if (id != queue_ids[0])
+ stream << ",";
+ stream << id;
+ }
+ stream << std::endl;
+ }
+ }
+ stream << std::endl;
+
+ stream << hardware_composer_.Dump();
+ return stream.str();
}
void DisplayService::OnChannelClose(pdx::Message& message,
@@ -54,8 +116,6 @@
surface->OnSetAttributes(message,
{{display::SurfaceAttribute::Visible,
display::SurfaceAttributeValue{false}}});
- SurfaceUpdated(surface->surface_type(),
- display::SurfaceUpdateFlags::VisibilityChanged);
}
}
diff --git a/libs/vr/libvrflinger/display_surface.cpp b/libs/vr/libvrflinger/display_surface.cpp
index d836fba..330b455 100644
--- a/libs/vr/libvrflinger/display_surface.cpp
+++ b/libs/vr/libvrflinger/display_surface.cpp
@@ -127,7 +127,8 @@
}
void DisplaySurface::ClearUpdate() {
- ALOGD_IF(TRACE, "DisplaySurface::ClearUpdate: surface_id=%d", surface_id());
+ ALOGD_IF(TRACE > 1, "DisplaySurface::ClearUpdate: surface_id=%d",
+ surface_id());
update_flags_ = display::SurfaceUpdateFlags::None;
}
@@ -258,6 +259,13 @@
}
}
+std::vector<int32_t> DirectDisplaySurface::GetQueueIds() const {
+ std::vector<int32_t> queue_ids;
+ if (direct_queue_)
+ queue_ids.push_back(direct_queue_->id());
+ return queue_ids;
+}
+
Status<LocalChannelHandle> DirectDisplaySurface::OnCreateQueue(
Message& /*message*/, const ProducerQueueConfig& config) {
ATRACE_NAME("DirectDisplaySurface::OnCreateQueue");
@@ -326,7 +334,7 @@
auto buffer_status = direct_queue_->Dequeue(0, &slot, &acquire_fence);
if (!buffer_status) {
ALOGD_IF(
- TRACE && buffer_status.error() == ETIMEDOUT,
+ TRACE > 1 && buffer_status.error() == ETIMEDOUT,
"DirectDisplaySurface::DequeueBuffersLocked: All buffers dequeued.");
ALOGE_IF(buffer_status.error() != ETIMEDOUT,
"DirectDisplaySurface::DequeueBuffersLocked: Failed to dequeue "
@@ -370,8 +378,8 @@
}
AcquiredBuffer buffer = std::move(acquired_buffers_.Front());
acquired_buffers_.PopFront();
- ALOGD_IF(TRACE, "DirectDisplaySurface::AcquireCurrentBuffer: buffer: %p",
- buffer.buffer().get());
+ ALOGD_IF(TRACE, "DirectDisplaySurface::AcquireCurrentBuffer: buffer_id=%d",
+ buffer.buffer()->id());
return buffer;
}
@@ -399,8 +407,8 @@
break;
}
ALOGD_IF(TRACE,
- "DirectDisplaySurface::AcquireNewestAvailableBuffer: buffer: %p",
- buffer.buffer().get());
+ "DirectDisplaySurface::AcquireNewestAvailableBuffer: buffer_id=%d",
+ buffer.buffer()->id());
return buffer;
}
diff --git a/libs/vr/libvrflinger/display_surface.h b/libs/vr/libvrflinger/display_surface.h
index 5380062..556183a 100644
--- a/libs/vr/libvrflinger/display_surface.h
+++ b/libs/vr/libvrflinger/display_surface.h
@@ -144,6 +144,7 @@
: DisplaySurface(service, SurfaceType::Direct, surface_id, process_id,
user_id, attributes),
acquired_buffers_(kMaxPostedBuffers) {}
+ std::vector<int32_t> GetQueueIds() const override;
bool IsBufferAvailable();
bool IsBufferPosted();
AcquiredBuffer AcquireCurrentBuffer();
diff --git a/libs/vr/libvrflinger/epoll_event_dispatcher.cpp b/libs/vr/libvrflinger/epoll_event_dispatcher.cpp
index 06b69bb..962c745 100644
--- a/libs/vr/libvrflinger/epoll_event_dispatcher.cpp
+++ b/libs/vr/libvrflinger/epoll_event_dispatcher.cpp
@@ -101,12 +101,12 @@
if (num_events < 0 && errno != EINTR)
break;
- ALOGD_IF(TRACE, "EpollEventDispatcher::EventThread: num_events=%d",
+ ALOGD_IF(TRACE > 1, "EpollEventDispatcher::EventThread: num_events=%d",
num_events);
for (int i = 0; i < num_events; i++) {
ALOGD_IF(
- TRACE,
+ TRACE > 1,
"EpollEventDispatcher::EventThread: event %d: handler=%p events=0x%x",
i, events[i].data.ptr, events[i].events);
diff --git a/libs/vr/libvrflinger/hardware_composer.cpp b/libs/vr/libvrflinger/hardware_composer.cpp
index c18ae82..00172a1 100644
--- a/libs/vr/libvrflinger/hardware_composer.cpp
+++ b/libs/vr/libvrflinger/hardware_composer.cpp
@@ -19,6 +19,8 @@
#include <chrono>
#include <functional>
#include <map>
+#include <sstream>
+#include <string>
#include <tuple>
#include <dvr/dvr_display_types.h>
@@ -208,6 +210,9 @@
}
void HardwareComposer::OnPostThreadResumed() {
+ if (request_display_callback_)
+ request_display_callback_(true);
+
hwc2_hidl_->resetCommands();
// HIDL HWC seems to have an internal race condition. If we submit a frame too
@@ -244,6 +249,9 @@
// Trigger target-specific performance mode change.
property_set(kDvrPerformanceProperty, "idle");
+
+ if (request_display_callback_)
+ request_display_callback_(false);
}
HWC::Error HardwareComposer::Validate(hwc2_display_t display) {
@@ -347,7 +355,36 @@
return HWC::Error::None;
}
-std::string HardwareComposer::Dump() { return hwc2_hidl_->dumpDebugInfo(); }
+std::string HardwareComposer::Dump() {
+ std::unique_lock<std::mutex> lock(post_thread_mutex_);
+ std::ostringstream stream;
+
+ stream << "Display metrics: " << display_metrics_.width << "x"
+ << display_metrics_.height << " " << (display_metrics_.dpi.x / 1000.0)
+ << "x" << (display_metrics_.dpi.y / 1000.0) << " dpi @ "
+ << (1000000000.0 / display_metrics_.vsync_period_ns) << " Hz"
+ << std::endl;
+
+ stream << "Post thread resumed: " << post_thread_resumed_ << std::endl;
+ stream << "Active layers: " << active_layer_count_ << std::endl;
+ stream << std::endl;
+
+ for (size_t i = 0; i < active_layer_count_; i++) {
+ stream << "Layer " << i << ":";
+ stream << " type=" << layers_[i].GetCompositionType().to_string();
+ stream << " surface_id=" << layers_[i].GetSurfaceId();
+ stream << " buffer_id=" << layers_[i].GetBufferId();
+ stream << std::endl;
+ }
+ stream << std::endl;
+
+ if (post_thread_resumed_) {
+ stream << "Hardware Composer Debug Info:" << std::endl;
+ stream << hwc2_hidl_->dumpDebugInfo();
+ }
+
+ return stream.str();
+}
void HardwareComposer::PostLayers() {
ATRACE_NAME("HardwareComposer::PostLayers");
@@ -398,10 +435,12 @@
ATRACE_INT("frame_skip_count", 0);
}
-#if TRACE
- for (size_t i = 0; i < active_layer_count_; i++)
- ALOGI("HardwareComposer::PostLayers: layer=%zu composition=%s", i,
+#if TRACE > 1
+ for (size_t i = 0; i < active_layer_count_; i++) {
+ ALOGI("HardwareComposer::PostLayers: layer=%zu buffer_id=%d composition=%s",
+ i, layers_[i].GetBufferId(),
layers_[i].GetCompositionType().to_string().c_str());
+ }
#endif
error = Present(HWC_DISPLAY_PRIMARY);
@@ -442,17 +481,6 @@
// Set idle state based on whether there are any surfaces to handle.
UpdatePostThreadState(PostThreadState::Idle, display_idle);
-
- // XXX: TEMPORARY
- // Request control of the display based on whether there are any surfaces to
- // handle. This callback sets the post thread active state once the transition
- // is complete in SurfaceFlinger.
- // TODO(eieio): Unify the control signal used to move SurfaceFlinger into VR
- // mode. Currently this is hooked up to persistent VR mode, but perhaps this
- // makes more sense to control it from VrCore, which could in turn base its
- // decision on persistent VR mode.
- if (request_display_callback_)
- request_display_callback_(!display_idle);
}
int HardwareComposer::OnNewGlobalBuffer(DvrGlobalBufferKey key,
@@ -492,8 +520,9 @@
int result = ion_buffer.Lock(ion_buffer.usage(), 0, 0, ion_buffer.width(),
ion_buffer.height(), &buffer_base);
if (result != 0) {
- ALOGE("HardwareComposer::MapConfigBuffer: Failed to map vrflinger config "
- "buffer.");
+ ALOGE(
+ "HardwareComposer::MapConfigBuffer: Failed to map vrflinger config "
+ "buffer.");
return -EPERM;
}
diff --git a/libs/vr/libvrflinger/hardware_composer.h b/libs/vr/libvrflinger/hardware_composer.h
index 98e8905..a0c50e1 100644
--- a/libs/vr/libvrflinger/hardware_composer.h
+++ b/libs/vr/libvrflinger/hardware_composer.h
@@ -127,11 +127,20 @@
int surface_id = -1;
pdx::rpc::IfAnyOf<SourceSurface>::Call(
&source_, [&surface_id](const SourceSurface& surface_source) {
- surface_id = surface_source.surface->surface_id();
+ surface_id = surface_source.GetSurfaceId();
});
return surface_id;
}
+ int GetBufferId() const {
+ int buffer_id = -1;
+ pdx::rpc::IfAnyOf<SourceSurface>::Call(
+ &source_, [&buffer_id](const SourceSurface& surface_source) {
+ buffer_id = surface_source.GetBufferId();
+ });
+ return buffer_id;
+ }
+
private:
void CommonLayerSetup();
@@ -192,7 +201,15 @@
}
// Returns the surface id of the surface.
- int GetSurfaceId() { return surface->surface_id(); }
+ int GetSurfaceId() const { return surface->surface_id(); }
+
+ // Returns the buffer id for the current buffer.
+ int GetBufferId() const {
+ if (acquired_buffer.IsAvailable())
+ return acquired_buffer.buffer()->id();
+ else
+ return -1;
+ }
};
// State when the layer is connected to a buffer. Provides the same interface
@@ -213,6 +230,7 @@
IonBuffer* GetBuffer() { return buffer.get(); }
int GetSurfaceId() const { return -1; }
+ int GetBufferId() const { return -1; }
};
// The underlying hardware composer layer is supplied buffers either from a
diff --git a/libs/vr/libvrflinger/vsync_service.cpp b/libs/vr/libvrflinger/vsync_service.cpp
index 2a83933..3098b43 100644
--- a/libs/vr/libvrflinger/vsync_service.cpp
+++ b/libs/vr/libvrflinger/vsync_service.cpp
@@ -200,12 +200,12 @@
}
void VSyncChannel::Ack() {
- ALOGD_IF(TRACE, "VSyncChannel::Ack: pid=%d cid=%d\n", pid_, cid_);
+ ALOGD_IF(TRACE > 1, "VSyncChannel::Ack: pid=%d cid=%d\n", pid_, cid_);
service_.ModifyChannelEvents(cid_, POLLPRI, 0);
}
void VSyncChannel::Signal() {
- ALOGD_IF(TRACE, "VSyncChannel::Signal: pid=%d cid=%d\n", pid_, cid_);
+ ALOGD_IF(TRACE > 1, "VSyncChannel::Signal: pid=%d cid=%d\n", pid_, cid_);
service_.ModifyChannelEvents(cid_, 0, POLLPRI);
}