drm_hwcomposer: Extract DrmHwc abstract base class
DrmHwc holds implementation details that can be shared between hwc2 and
hwc3. It exposes abstract functions for implementing callbacks to hwc
clients.
Leave the HWC2 specific implementation details in the DrmHwcTwo class, such
as the client callback implementation, and implement the DrmHwc abstract
functions in terms of hwc2.
DrmHwc is based on the DrmHwcInterface extracted in
(drm_hwcomposer: Connect ComposerClient with HwcDisplay) from !238
Co-authored-by: Dennis Tsiang <dennis.tsiang@arm.com>
Co-authored-by: Normunds Rieksts <normunds.rieksts@arm.com>
Signed-off-by: Drew Davenport <ddavenport@chromium.org>
diff --git a/hwc2_device/DrmHwcTwo.h b/hwc2_device/DrmHwcTwo.h
index 8701feb..b3ca0f8 100644
--- a/hwc2_device/DrmHwcTwo.h
+++ b/hwc2_device/DrmHwcTwo.h
@@ -18,16 +18,28 @@
#include <hardware/hwcomposer2.h>
-#include "drm/ResourceManager.h"
-#include "hwc2_device/HwcDisplay.h"
+#include "drm/DrmHwc.h"
namespace android {
-class DrmHwcTwo : public PipelineToFrontendBindingInterface {
+class DrmHwcTwo : public DrmHwc {
public:
- DrmHwcTwo();
+ DrmHwcTwo() = default;
~DrmHwcTwo() override = default;
+ HWC2::Error RegisterCallback(int32_t descriptor, hwc2_callback_data_t data,
+ hwc2_function_pointer_t function);
+
+ // DrmHwc
+ void SendVsyncEventToClient(hwc2_display_t displayid, int64_t timestamp,
+ uint32_t vsync_period) const override;
+ void SendVsyncPeriodTimingChangedEventToClient(
+ hwc2_display_t displayid, int64_t timestamp) const override;
+ void SendRefreshEventToClient(uint64_t displayid) override;
+ void SendHotplugEventToClient(hwc2_display_t displayid,
+ bool connected) override;
+
+ private:
std::pair<HWC2_PFN_HOTPLUG, hwc2_callback_data_t> hotplug_callback_{};
std::pair<HWC2_PFN_VSYNC, hwc2_callback_data_t> vsync_callback_{};
#if __ANDROID_API__ > 29
@@ -36,53 +48,5 @@
period_timing_changed_callback_{};
#endif
std::pair<HWC2_PFN_REFRESH, hwc2_callback_data_t> refresh_callback_{};
-
- // Device functions
- HWC2::Error CreateVirtualDisplay(uint32_t width, uint32_t height,
- int32_t *format, hwc2_display_t *display);
- HWC2::Error DestroyVirtualDisplay(hwc2_display_t display);
- void Dump(uint32_t *outSize, char *outBuffer);
- uint32_t GetMaxVirtualDisplayCount();
- HWC2::Error RegisterCallback(int32_t descriptor, hwc2_callback_data_t data,
- hwc2_function_pointer_t function);
-
- auto GetDisplay(hwc2_display_t display_handle) {
- return displays_.count(display_handle) != 0
- ? displays_[display_handle].get()
- : nullptr;
- }
-
- auto &GetResMan() {
- return resource_manager_;
- }
-
- void ScheduleHotplugEvent(hwc2_display_t displayid, bool connected) {
- deferred_hotplug_events_[displayid] = connected;
- }
-
- // PipelineToFrontendBindingInterface
- bool BindDisplay(std::shared_ptr<DrmDisplayPipeline> pipeline) override;
- bool UnbindDisplay(std::shared_ptr<DrmDisplayPipeline> pipeline) override;
- void FinalizeDisplayBinding() override;
-
- void SendVsyncEventToClient(hwc2_display_t displayid, int64_t timestamp,
- uint32_t vsync_period) const;
- void SendVsyncPeriodTimingChangedEventToClient(hwc2_display_t displayid,
- int64_t timestamp) const;
-
- private:
- void SendHotplugEventToClient(hwc2_display_t displayid, bool connected) const;
-
- ResourceManager resource_manager_;
- std::map<hwc2_display_t, std::unique_ptr<HwcDisplay>> displays_;
- std::map<std::shared_ptr<DrmDisplayPipeline>, hwc2_display_t>
- display_handles_;
-
- std::string mDumpString;
-
- std::map<hwc2_display_t, bool> deferred_hotplug_events_;
- std::vector<hwc2_display_t> displays_for_removal_list_;
-
- uint32_t last_display_handle_ = kPrimaryDisplay;
};
} // namespace android