diff options
| author | Jason Macnak <natsu@google.com> | 2022-01-26 20:28:35 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-01-26 20:28:35 +0000 |
| commit | 16d955d1a31715cda1d51b349bbe4680b5d64678 (patch) | |
| tree | f76bfa060614336d3f355bec8d4321433403688e /drm/DrmDevice.h | |
| parent | 09ba88048789e588df23c04f6326d18824ea3aee (diff) | |
| parent | f5cd75234b3be37fa9b1a8bf31cc5f6fdc58c2c9 (diff) | |
| download | drm_hwcomposer-16d955d1a31715cda1d51b349bbe4680b5d64678.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-main' into 'aosp/master' am: e6295d18ec am: 5fb10fe25e am: f5cd75234b
Original change: https://android-review.googlesource.com/c/platform/external/drm_hwcomposer/+/1960322
Change-Id: Ic5831c5f52773a10050b6f9daf7b3b91a107f59c
Diffstat (limited to 'drm/DrmDevice.h')
| -rw-r--r-- | drm/DrmDevice.h | 3 |
1 files changed, 0 insertions, 3 deletions
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; |