diff options
Diffstat (limited to 'hwc2_device/HwcDisplay.h')
| -rw-r--r-- | hwc2_device/HwcDisplay.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/hwc2_device/HwcDisplay.h b/hwc2_device/HwcDisplay.h index 98d8e9b..d79efb0 100644 --- a/hwc2_device/HwcDisplay.h +++ b/hwc2_device/HwcDisplay.h @@ -22,10 +22,10 @@ #include <optional> #include "HwcDisplayConfigs.h" +#include "compositor/LayerData.h" #include "drm/DrmAtomicStateManager.h" #include "drm/ResourceManager.h" #include "drm/VSyncWorker.h" -#include "drmhwcomposer.h" #include "hwc2_device/HwcLayer.h" namespace android { @@ -106,7 +106,7 @@ class HwcDisplay { float *min_luminance); HWC2::Error GetReleaseFences(uint32_t *num_elements, hwc2_layer_t *layers, int32_t *fences); - HWC2::Error PresentDisplay(int32_t *present_fence); + HWC2::Error PresentDisplay(int32_t *out_present_fence); HWC2::Error SetActiveConfig(hwc2_config_t config); HWC2::Error ChosePreferredConfig(); HWC2::Error SetClientTarget(buffer_handle_t target, int32_t acquire_fence, @@ -180,6 +180,8 @@ class HwcDisplay { return !pipeline_; } + void Deinit(); + private: enum ClientFlattenningState : int32_t { Disabled = -3, @@ -197,6 +199,8 @@ class HwcDisplay { DrmHwcTwo *const hwc2_; + UniqueFd present_fence_; + std::optional<DrmMode> staged_mode_; int64_t staged_mode_change_time_{}; uint32_t staged_mode_config_id_{}; |