drm_hwcomposer: Add getter/setter for content_type
Optionally, get the content_type drm property. Add implementation to
HwcDisplay::SetContentType to set this property.
Change-Id: I910e064876d13205abc7caaac342daaff8f38599
Signed-off-by: Sasha McIntosh <sashamcintosh@google.com>
diff --git a/drm/DrmAtomicStateManager.cpp b/drm/DrmAtomicStateManager.cpp
index 537f819..32cc68e 100644
--- a/drm/DrmAtomicStateManager.cpp
+++ b/drm/DrmAtomicStateManager.cpp
@@ -139,6 +139,11 @@
return -EINVAL;
}
+ if (args.content_type && connector->GetContentTypeProperty()) {
+ if (!connector->GetContentTypeProperty().AtomicSet(*pset, *args.content_type))
+ return -EINVAL;
+ }
+
auto unused_planes = new_frame_state.used_planes;
if (args.composition) {
diff --git a/drm/DrmAtomicStateManager.h b/drm/DrmAtomicStateManager.h
index 923927d..d1af6e0 100644
--- a/drm/DrmAtomicStateManager.h
+++ b/drm/DrmAtomicStateManager.h
@@ -36,6 +36,7 @@
std::optional<bool> active;
std::shared_ptr<DrmKmsPlan> composition;
std::shared_ptr<drm_color_ctm> color_matrix;
+ std::optional<int32_t> content_type;
std::shared_ptr<DrmFbIdHandle> writeback_fb;
SharedFd writeback_release_fence;
diff --git a/drm/DrmConnector.cpp b/drm/DrmConnector.cpp
index e459fe7..4ae8bef 100644
--- a/drm/DrmConnector.cpp
+++ b/drm/DrmConnector.cpp
@@ -42,22 +42,21 @@
constexpr size_t kTypesCount = 21;
-static bool GetOptionalConnectorProperty(const DrmDevice &dev,
- const DrmConnector &connector,
- const char *prop_name,
- DrmProperty *property) {
- return dev.GetProperty(connector.GetId(), DRM_MODE_OBJECT_CONNECTOR,
- prop_name, property) == 0;
-}
+auto DrmConnector::GetConnectorProperty(const char *prop_name,
+ DrmProperty *property,
+ bool is_optional) -> bool {
+ auto err = drm_->GetProperty(GetId(), DRM_MODE_OBJECT_CONNECTOR, prop_name,
+ property);
+ if (err == 0)
+ return true;
-static bool GetConnectorProperty(const DrmDevice &dev,
- const DrmConnector &connector,
- const char *prop_name, DrmProperty *property) {
- if (!GetOptionalConnectorProperty(dev, connector, prop_name, property)) {
- ALOGE("Could not get %s property\n", prop_name);
- return false;
+ if (is_optional) {
+ ALOGV("Could not get optional %s property from connector %d", prop_name,
+ GetId());
+ } else {
+ ALOGE("Could not get %s property from connector %d", prop_name, GetId());
}
- return true;
+ return false;
}
auto DrmConnector::CreateInstance(DrmDevice &dev, uint32_t connector_id,
@@ -72,28 +71,39 @@
auto c = std::unique_ptr<DrmConnector>(
new DrmConnector(std::move(conn), &dev, index));
- if (!GetConnectorProperty(dev, *c, "DPMS", &c->dpms_property_) ||
- !GetConnectorProperty(dev, *c, "CRTC_ID", &c->crtc_id_property_)) {
- return {};
- }
-
- c->UpdateEdidProperty();
-
- if (c->IsWriteback() &&
- (!GetConnectorProperty(dev, *c, "WRITEBACK_PIXEL_FORMATS",
- &c->writeback_pixel_formats_) ||
- !GetConnectorProperty(dev, *c, "WRITEBACK_FB_ID",
- &c->writeback_fb_id_) ||
- !GetConnectorProperty(dev, *c, "WRITEBACK_OUT_FENCE_PTR",
- &c->writeback_out_fence_))) {
+ if (!c->Init()) {
+ ALOGE("Failed to initialize connector %d", connector_id);
return {};
}
return c;
}
+auto DrmConnector::Init()-> bool {
+ if (!GetConnectorProperty("DPMS", &dpms_property_) ||
+ !GetConnectorProperty("CRTC_ID", &crtc_id_property_)) {
+ return false;
+ }
+
+ UpdateEdidProperty();
+
+ if (IsWriteback() &&
+ (!GetConnectorProperty("WRITEBACK_PIXEL_FORMATS",
+ &writeback_pixel_formats_) ||
+ !GetConnectorProperty("WRITEBACK_FB_ID", &writeback_fb_id_) ||
+ !GetConnectorProperty("WRITEBACK_OUT_FENCE_PTR",
+ &writeback_out_fence_))) {
+ return false;
+ }
+
+ GetConnectorProperty("content type", &content_type_property_,
+ /*is_optional=*/true);
+
+ return true;
+}
+
int DrmConnector::UpdateEdidProperty() {
- return GetOptionalConnectorProperty(*drm_, *this, "EDID", &edid_property_)
+ return GetConnectorProperty("EDID", &edid_property_, /*is_optional=*/true)
? 0
: -EINVAL;
}
diff --git a/drm/DrmConnector.h b/drm/DrmConnector.h
index 018c615..6140e6c 100644
--- a/drm/DrmConnector.h
+++ b/drm/DrmConnector.h
@@ -94,6 +94,10 @@
return edid_property_;
}
+ auto &GetContentTypeProperty() const {
+ return content_type_property_;
+ }
+
auto &GetWritebackFbIdProperty() const {
return writeback_fb_id_;
}
@@ -123,6 +127,10 @@
DrmModeConnectorUnique connector_;
DrmDevice *const drm_;
+ auto Init() -> bool;
+ auto GetConnectorProperty(const char *prop_name, DrmProperty *property,
+ bool is_optional = false) -> bool;
+
const uint32_t index_in_res_array_;
std::vector<DrmMode> modes_;
@@ -130,6 +138,8 @@
DrmProperty dpms_property_;
DrmProperty crtc_id_property_;
DrmProperty edid_property_;
+ DrmProperty content_type_property_;
+
DrmProperty writeback_pixel_formats_;
DrmProperty writeback_fb_id_;
DrmProperty writeback_out_fence_;