drm_hwcomposer: Rework display Mode Setting and DPMS handling
1. Remove DPMS logic. As stated in KMS kernel docs: CRTC "activate"
property was implemented as a simplified atomic replacement of DPMS.
And kernel internally will just update "activate" on DPMS setting.
2. Add SetDisplayActivate(bool state) method to compositor class,
which is now replacement for SetDpmsMode().
3. Move mode settings out of DrmComposition class to DrmCompositor class.
From now on DrmComposition describes only layer-to-plane composition
as it should be.
Signed-off-by: Roman Stratiienko <roman.o.stratiienko@globallogic.com>
diff --git a/compositor/DrmDisplayComposition.h b/compositor/DrmDisplayComposition.h
index bbac0af..7b7e668 100644
--- a/compositor/DrmDisplayComposition.h
+++ b/compositor/DrmDisplayComposition.h
@@ -32,13 +32,6 @@
class Importer;
class Planner;
-enum DrmCompositionType {
- DRM_COMPOSITION_TYPE_EMPTY,
- DRM_COMPOSITION_TYPE_FRAME,
- DRM_COMPOSITION_TYPE_DPMS,
- DRM_COMPOSITION_TYPE_MODESET,
-};
-
class DrmCompositionPlane {
public:
enum class Type : int32_t {
@@ -86,11 +79,9 @@
DrmDisplayComposition(DrmCrtc *crtc, Planner *planner);
~DrmDisplayComposition() = default;
- int SetLayers(DrmHwcLayer *layers, size_t num_layers, bool geometry_changed);
+ int SetLayers(DrmHwcLayer *layers, size_t num_layers);
int AddPlaneComposition(DrmCompositionPlane plane);
int AddPlaneDisable(DrmPlane *plane);
- int SetDpmsMode(uint32_t dpms_mode);
- int SetDisplayMode(const DrmMode &display_mode);
int Plan(std::vector<DrmPlane *> *primary_planes,
std::vector<DrmPlane *> *overlay_planes);
@@ -103,22 +94,6 @@
return composition_planes_;
}
- bool geometry_changed() const {
- return geometry_changed_;
- }
-
- DrmCompositionType type() const {
- return type_;
- }
-
- uint32_t dpms_mode() const {
- return dpms_mode_;
- }
-
- const DrmMode &display_mode() const {
- return display_mode_;
- }
-
DrmCrtc *crtc() const {
return crtc_;
}
@@ -130,16 +105,9 @@
UniqueFd out_fence_;
private:
- bool validate_composition_type(DrmCompositionType desired);
-
DrmCrtc *crtc_ = NULL;
Planner *planner_ = NULL;
- DrmCompositionType type_ = DRM_COMPOSITION_TYPE_EMPTY;
- uint32_t dpms_mode_ = DRM_MODE_DPMS_ON;
- DrmMode display_mode_;
-
- bool geometry_changed_ = true;
std::vector<DrmHwcLayer> layers_;
std::vector<DrmCompositionPlane> composition_planes_;
};