VR: Add ability to pass layer info through SurfaceFlinger
Updates SurfaceFlinger to connect to the VR HWC service and pass
additional layer information.
For now VR mode is enabled at build time.
Bug: 33297385
Test: Ran on device and verified the IVrComposerClient::setLayerInfo()
call is done successfully.
Change-Id: I9dea2451a3a2aa1919395d3785ae00446ba51f26
diff --git a/services/surfaceflinger/Android.mk b/services/surfaceflinger/Android.mk
index 1cd9215..0ea1407 100644
--- a/services/surfaceflinger/Android.mk
+++ b/services/surfaceflinger/Android.mk
@@ -48,6 +48,10 @@
LOCAL_CFLAGS := -DLOG_TAG=\"SurfaceFlinger\"
LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES
+ifeq ($(TARGET_IN_VR_MODE),true)
+ LOCAL_CFLAGS += -DIN_VR_MODE
+endif
+
ifeq ($(TARGET_USES_HWC2),true)
LOCAL_CFLAGS += -DUSE_HWC2
LOCAL_SRC_FILES += \
@@ -130,6 +134,7 @@
LOCAL_STATIC_LIBRARIES := libhwcomposer-command-buffer libtrace_proto libvkjson
LOCAL_SHARED_LIBRARIES := \
+ android.dvr.composer@1.0 \
android.hardware.graphics.allocator@2.0 \
android.hardware.graphics.composer@2.1 \
libcutils \
diff --git a/services/surfaceflinger/DisplayHardware/ComposerHal.cpp b/services/surfaceflinger/DisplayHardware/ComposerHal.cpp
index 2f2f3a9..1bd9616 100644
--- a/services/surfaceflinger/DisplayHardware/ComposerHal.cpp
+++ b/services/surfaceflinger/DisplayHardware/ComposerHal.cpp
@@ -17,6 +17,7 @@
#undef LOG_TAG
#define LOG_TAG "HwcComposer"
+#include <android/dvr/composer/1.0/IVrComposerClient.h>
#include <inttypes.h>
#include <log/log.h>
@@ -24,6 +25,7 @@
namespace android {
+using dvr::composer::V1_0::IVrComposerClient;
using hardware::Return;
using hardware::hidl_vec;
using hardware::hidl_handle;
@@ -102,10 +104,37 @@
} // anonymous namespace
-Composer::Composer()
- : mWriter(kWriterInitialSize)
+Composer::CommandWriter::CommandWriter(uint32_t initialMaxSize)
+ : CommandWriterBase(initialMaxSize) {}
+
+Composer::CommandWriter::~CommandWriter()
{
- mComposer = IComposer::getService("hwcomposer");
+}
+
+void Composer::CommandWriter::setLayerInfo(uint32_t type, uint32_t appId)
+{
+ constexpr uint16_t kSetLayerInfoLength = 2;
+ beginCommand(
+ static_cast<IComposerClient::Command>(
+ IVrComposerClient::VrCommand::SET_LAYER_INFO),
+ kSetLayerInfoLength);
+ write(type);
+ write(appId);
+ endCommand();
+}
+
+Composer::Composer() : mWriter(kWriterInitialSize)
+{
+#if defined(IN_VR_MODE)
+ mIsInVrMode = true;
+#endif
+
+ if (mIsInVrMode) {
+ mComposer = IComposer::getService("vr_hwcomposer");
+ } else {
+ mComposer = IComposer::getService("hwcomposer");
+ }
+
if (mComposer == nullptr) {
LOG_ALWAYS_FATAL("failed to get hwcomposer service");
}
@@ -589,6 +618,18 @@
return Error::NONE;
}
+Error Composer::setLayerInfo(Display display, Layer layer, uint32_t type,
+ uint32_t appId)
+{
+ if (mIsInVrMode)
+ {
+ mWriter.selectDisplay(display);
+ mWriter.selectLayer(layer);
+ mWriter.setLayerInfo(type, appId);
+ }
+ return Error::NONE;
+}
+
Error Composer::execute()
{
// prepare input command queue
diff --git a/services/surfaceflinger/DisplayHardware/ComposerHal.h b/services/surfaceflinger/DisplayHardware/ComposerHal.h
index 5ce5869..329d787 100644
--- a/services/surfaceflinger/DisplayHardware/ComposerHal.h
+++ b/services/surfaceflinger/DisplayHardware/ComposerHal.h
@@ -215,8 +215,17 @@
Error setLayerVisibleRegion(Display display, Layer layer,
const std::vector<IComposerClient::Rect>& visible);
Error setLayerZOrder(Display display, Layer layer, uint32_t z);
-
+ Error setLayerInfo(Display display, Layer layer, uint32_t type,
+ uint32_t appId);
private:
+ class CommandWriter : public CommandWriterBase {
+ public:
+ CommandWriter(uint32_t initialMaxSize);
+ ~CommandWriter() override;
+
+ void setLayerInfo(uint32_t type, uint32_t appId);
+ };
+
// Many public functions above simply write a command into the command
// queue to batch the calls. validateDisplay and presentDisplay will call
// this function to execute the command queue.
@@ -228,8 +237,10 @@
// 64KiB minus a small space for metadata such as read/write pointers
static constexpr size_t kWriterInitialSize =
64 * 1024 / sizeof(uint32_t) - 16;
- CommandWriterBase mWriter;
+ CommandWriter mWriter;
CommandReader mReader;
+
+ bool mIsInVrMode = false;
};
} // namespace Hwc2
diff --git a/services/surfaceflinger/DisplayHardware/HWC2.cpp b/services/surfaceflinger/DisplayHardware/HWC2.cpp
index c89ca83..6ff5ea1 100644
--- a/services/surfaceflinger/DisplayHardware/HWC2.cpp
+++ b/services/surfaceflinger/DisplayHardware/HWC2.cpp
@@ -1424,4 +1424,16 @@
return static_cast<Error>(intError);
}
+Error Layer::setInfo(uint32_t type, uint32_t appId)
+{
+#ifdef BYPASS_IHWC
+ (void)type;
+ (void)appId;
+ int32_t intError = 0;
+#else
+ auto intError = mDevice.mComposer->setLayerInfo(mDisplayId, mId, type, appId);
+#endif
+ return static_cast<Error>(intError);
+}
+
} // namespace HWC2
diff --git a/services/surfaceflinger/DisplayHardware/HWC2.h b/services/surfaceflinger/DisplayHardware/HWC2.h
index 5b894ba..256b05d 100644
--- a/services/surfaceflinger/DisplayHardware/HWC2.h
+++ b/services/surfaceflinger/DisplayHardware/HWC2.h
@@ -405,6 +405,7 @@
[[clang::warn_unused_result]] Error setVisibleRegion(
const android::Region& region);
[[clang::warn_unused_result]] Error setZOrder(uint32_t z);
+ [[clang::warn_unused_result]] Error setInfo(uint32_t type, uint32_t appId);
private:
std::weak_ptr<Display> mDisplay;
diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp
index 6fd9cd7..226e70a 100644
--- a/services/surfaceflinger/Layer.cpp
+++ b/services/surfaceflinger/Layer.cpp
@@ -140,6 +140,8 @@
mCurrentState.sequence = 0;
mCurrentState.requested = mCurrentState.active;
mCurrentState.dataSpace = HAL_DATASPACE_UNKNOWN;
+ mCurrentState.appId = 0;
+ mCurrentState.type = 0;
// drawing state & current state are identical
mDrawingState = mCurrentState;
@@ -676,6 +678,10 @@
ALOGE_IF(error != HWC2::Error::None, "[%s] Failed to set Z %u: %s (%d)",
mName.string(), z, to_string(error).c_str(),
static_cast<int32_t>(error));
+
+ error = hwcLayer->setInfo(s.type, s.appId);
+ ALOGE_IF(error != HWC2::Error::None, "[%s] Failed to set info (%d)",
+ mName.string(), static_cast<int32_t>(error));
#else
if (!frame.intersect(hw->getViewport(), &frame)) {
frame.clear();
@@ -1747,6 +1753,13 @@
return true;
}
+void Layer::setInfo(uint32_t type, uint32_t appId) {
+ mCurrentState.appId = appId;
+ mCurrentState.type = type;
+ mCurrentState.modified = true;
+ setTransactionFlags(eTransactionNeeded);
+}
+
uint32_t Layer::getEffectiveScalingMode() const {
if (mOverrideScalingMode >= 0) {
return mOverrideScalingMode;
diff --git a/services/surfaceflinger/Layer.h b/services/surfaceflinger/Layer.h
index bf224ae..ee7cfb8 100644
--- a/services/surfaceflinger/Layer.h
+++ b/services/surfaceflinger/Layer.h
@@ -141,6 +141,9 @@
Region activeTransparentRegion;
Region requestedTransparentRegion;
android_dataspace dataSpace;
+
+ uint32_t appId;
+ uint32_t type;
};
// -----------------------------------------------------------------------
@@ -172,6 +175,7 @@
uint32_t getLayerStack() const;
void deferTransactionUntil(const sp<IBinder>& handle, uint64_t frameNumber);
bool setOverrideScalingMode(int32_t overrideScalingMode);
+ void setInfo(uint32_t type, uint32_t appId);
// If we have received a new buffer this frame, we will pass its surface
// damage down to hardware composer. Otherwise, we must send a region with
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 3480d83..4798ecd 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -2580,6 +2580,9 @@
// We don't trigger a traversal here because if no other state is
// changed, we don't want this to cause any more work
}
+ if (what & layer_state_t::eLayerInfoChanged) {
+ layer->setInfo(s.type, s.appid);
+ }
}
return flags;
}