drm_hwcomposer: Stop using HWC2 for setting layer buffer
Clean up HWC3 implementation around setting layer buffers a bit by
duping the acquire fence rather than relying on const_cast.
Set the layer buffer through LayerProperties instead of through the HWC2
SetLayerBuffer API.
Change-Id: Ifd873423d5536cdb07f4d6d868ef3a9fd641fafe
Signed-off-by: Drew Davenport <ddavenport@google.com>
diff --git a/hwc2_device/HwcLayer.cpp b/hwc2_device/HwcLayer.cpp
index cd2a319..cb18fdd 100644
--- a/hwc2_device/HwcLayer.cpp
+++ b/hwc2_device/HwcLayer.cpp
@@ -25,6 +25,11 @@
namespace android {
void HwcLayer::SetLayerProperties(const LayerProperties& layer_properties) {
+ if (layer_properties.buffer) {
+ layer_data_.acquire_fence = layer_properties.buffer->acquire_fence;
+ buffer_handle_ = layer_properties.buffer->buffer_handle;
+ buffer_handle_updated_ = true;
+ }
if (layer_properties.blend_mode) {
blend_mode_ = layer_properties.blend_mode.value();
}
diff --git a/hwc2_device/HwcLayer.h b/hwc2_device/HwcLayer.h
index b8fb959..e1d62b7 100644
--- a/hwc2_device/HwcLayer.h
+++ b/hwc2_device/HwcLayer.h
@@ -28,8 +28,13 @@
class HwcLayer {
public:
+ struct Buffer {
+ buffer_handle_t buffer_handle;
+ SharedFd acquire_fence;
+ };
// A set of properties to be validated.
struct LayerProperties {
+ std::optional<Buffer> buffer;
std::optional<BufferBlendMode> blend_mode;
std::optional<BufferColorSpace> color_space;
std::optional<BufferSampleRange> sample_range;
diff --git a/hwc3/ComposerClient.cpp b/hwc3/ComposerClient.cpp
index 0597712..c26d851 100644
--- a/hwc3/ComposerClient.cpp
+++ b/hwc3/ComposerClient.cpp
@@ -549,12 +549,20 @@
return;
}
- HwcLayerWrapper layer_wrapper{command.layer, layer};
+ HwcLayer::LayerProperties properties;
if (command.buffer) {
- ExecuteSetLayerBuffer(display_id, layer_wrapper, *command.buffer);
+ HwcLayer::Buffer buffer;
+ auto err = ImportLayerBuffer(display_id, command.layer, *command.buffer,
+ &buffer.buffer_handle);
+ if (err != hwc3::Error::kNone) {
+ cmd_result_writer_->AddError(err);
+ return;
+ }
+ buffer.acquire_fence = ::android::MakeSharedFd(
+ command.buffer->fence.dup().release());
+ properties.buffer.emplace(buffer);
}
- HwcLayer::LayerProperties properties;
properties.blend_mode = AidlToBlendMode(command.blendMode);
properties.color_space = AidlToColorSpace(command.dataspace);
properties.sample_range = AidlToSampleRange(command.dataspace);
@@ -1238,27 +1246,16 @@
return binder;
}
-void ComposerClient::ExecuteSetLayerBuffer(int64_t display_id,
- HwcLayerWrapper& layer,
- const Buffer& buffer) {
- buffer_handle_t imported_buffer = nullptr;
+hwc3::Error ComposerClient::ImportLayerBuffer(
+ int64_t display_id, int64_t layer_id, const Buffer& buffer,
+ buffer_handle_t* out_imported_buffer) {
+ *out_imported_buffer = nullptr;
auto releaser = composer_resources_->CreateResourceReleaser(true);
- auto err = composer_resources_->GetLayerBuffer(display_id, layer.layer_id,
- buffer, &imported_buffer,
+ auto err = composer_resources_->GetLayerBuffer(display_id, layer_id, buffer,
+ out_imported_buffer,
releaser.get());
- if (err != hwc3::Error::kNone) {
- cmd_result_writer_->AddError(err);
- return;
- }
-
- // NOLINTNEXTLINE(cppcoreguidelines-pro-type-const-cast)
- auto fence_fd = const_cast<ndk::ScopedFileDescriptor&>(buffer.fence)
- .release();
- err = Hwc2toHwc3Error(layer.layer->SetLayerBuffer(imported_buffer, fence_fd));
- if (err != hwc3::Error::kNone) {
- cmd_result_writer_->AddError(err);
- }
+ return err;
}
void ComposerClient::ExecuteSetDisplayBrightness(
diff --git a/hwc3/ComposerClient.h b/hwc3/ComposerClient.h
index b8ab715..45607fe 100644
--- a/hwc3/ComposerClient.h
+++ b/hwc3/ComposerClient.h
@@ -39,11 +39,6 @@
class DrmHwcThree;
-struct HwcLayerWrapper {
- int64_t layer_id;
- ::android::HwcLayer* layer;
-};
-
class ComposerClient : public BnComposerClient {
public:
ComposerClient();
@@ -161,10 +156,12 @@
::ndk::SpAIBinder createBinder() override;
private:
+ hwc3::Error ImportLayerBuffer(int64_t display_id, int64_t layer_id,
+ const Buffer& buffer,
+ buffer_handle_t* out_imported_buffer);
+
// Layer commands
void DispatchLayerCommand(int64_t display_id, const LayerCommand& command);
- void ExecuteSetLayerBuffer(int64_t display_id, HwcLayerWrapper& layer_id,
- const Buffer& buffer);
// Display commands
void ExecuteDisplayCommand(const DisplayCommand& command);