diff options
author | Roman Stratiienko <roman.o.stratiienko@globallogic.com> | 2022-01-18 10:35:30 +0200 |
---|---|---|
committer | Roman Stratiienko <roman.o.stratiienko@globallogic.com> | 2022-01-20 17:21:46 +0200 |
commit | 8df7498290b20fab5871d73c7ecf5293001dd629 (patch) | |
tree | 6b9023f0b4ad9e78e64e6b48d10aaa49af096e4e | |
parent | e2d97e63f1e0fc1655a44f8f3a3736aa7507db13 (diff) | |
download | drm_hwcomposer-8df7498290b20fab5871d73c7ecf5293001dd629.tar.gz |
drm_hwcomposer: Remove write-back related helpers from DrmDevice class
Remove unused functionality.
Signed-off-by: Roman Stratiienko <roman.o.stratiienko@globallogic.com>
-rw-r--r-- | drm/DrmDevice.cpp | 64 | ||||
-rw-r--r-- | drm/DrmDevice.h | 3 |
2 files changed, 0 insertions, 67 deletions
diff --git a/drm/DrmDevice.cpp b/drm/DrmDevice.cpp index 18ce270..8245b78 100644 --- a/drm/DrmDevice.cpp +++ b/drm/DrmDevice.cpp @@ -331,9 +331,6 @@ std::tuple<int, int> DrmDevice::Init(const char *path, int num_displays) { ALOGE("Failed CreateDisplayPipe %d with %d", conn->id(), ret); return std::make_tuple(ret, 0); } - if (!AttachWriteback(conn.get())) { - ALOGI("Display %d has writeback attach to it", conn->display()); - } } return std::make_tuple(ret, displays_.size()); } @@ -350,39 +347,6 @@ DrmConnector *DrmDevice::GetConnectorForDisplay(int display) const { return nullptr; } -DrmConnector *DrmDevice::GetWritebackConnectorForDisplay(int display) const { - for (const auto &conn : writeback_connectors_) { - if (conn->display() == display) - return conn.get(); - } - return nullptr; -} - -// TODO(nobody): what happens when hotplugging -DrmConnector *DrmDevice::AvailableWritebackConnector(int display) const { - DrmConnector *writeback_conn = GetWritebackConnectorForDisplay(display); - DrmConnector *display_conn = GetConnectorForDisplay(display); - // If we have a writeback already attached to the same CRTC just use that, - // if possible. - if (display_conn && writeback_conn && - writeback_conn->encoder()->CanClone(display_conn->encoder())) - return writeback_conn; - - // Use another CRTC if available and doesn't have any connector - for (const auto &crtc : crtcs_) { - if (crtc->display() == display) - continue; - display_conn = GetConnectorForDisplay(crtc->display()); - // If we have a display connected don't use it for writeback - if (display_conn && display_conn->state() == DRM_MODE_CONNECTED) - continue; - writeback_conn = GetWritebackConnectorForDisplay(crtc->display()); - if (writeback_conn) - return writeback_conn; - } - return nullptr; -} - DrmCrtc *DrmDevice::GetCrtcForDisplay(int display) const { for (const auto &crtc : crtcs_) { if (crtc->display() == display) @@ -457,34 +421,6 @@ int DrmDevice::CreateDisplayPipe(DrmConnector *connector) { return -ENODEV; } -// Attach writeback connector to the CRTC linked to the display_conn -int DrmDevice::AttachWriteback(DrmConnector *display_conn) { - DrmCrtc *display_crtc = display_conn->encoder()->crtc(); - if (GetWritebackConnectorForDisplay(display_crtc->display()) != nullptr) { - ALOGE("Display already has writeback attach to it"); - return -EINVAL; - } - for (auto &writeback_conn : writeback_connectors_) { - if (writeback_conn->display() >= 0) - continue; - for (DrmEncoder *writeback_enc : writeback_conn->possible_encoders()) { - for (DrmCrtc *possible_crtc : writeback_enc->possible_crtcs()) { - if (possible_crtc != display_crtc) - continue; - // Use just encoders which had not been bound already - if (writeback_enc->can_bind(display_crtc->display())) { - writeback_enc->set_crtc(display_crtc); - writeback_conn->set_encoder(writeback_enc); - writeback_conn->set_display(display_crtc->display()); - writeback_conn->UpdateModes(); - return 0; - } - } - } - } - return -EINVAL; -} - auto DrmDevice::RegisterUserPropertyBlob(void *data, size_t length) const -> DrmModeUserPropertyBlobUnique { struct drm_mode_create_blob create_blob {}; diff --git a/drm/DrmDevice.h b/drm/DrmDevice.h index d3effc2..9983d61 100644 --- a/drm/DrmDevice.h +++ b/drm/DrmDevice.h @@ -60,8 +60,6 @@ class DrmDevice { } DrmConnector *GetConnectorForDisplay(int display) const; - DrmConnector *GetWritebackConnectorForDisplay(int display) const; - DrmConnector *AvailableWritebackConnector(int display) const; DrmCrtc *GetCrtcForDisplay(int display) const; int GetCrtcProperty(const DrmCrtc &crtc, const char *prop_name, @@ -96,7 +94,6 @@ class DrmDevice { int TryEncoderForDisplay(int display, DrmEncoder *enc); int CreateDisplayPipe(DrmConnector *connector); - int AttachWriteback(DrmConnector *display_conn); UniqueFd fd_; uint32_t mode_id_ = 0; |