diff options
| author | Jeremy DeHaan <jdehaan@google.com> | 2023-03-10 17:48:34 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2023-03-10 17:48:34 +0000 |
| commit | e6f8ced56ecc80b00288a21576d376dc02caee7c (patch) | |
| tree | e40caa739e1f837f4c2ab5848c74595c05b6bb5c /libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterface.cpp | |
| parent | 3e4ac183f0da7b6d6bc36259b1d2b1b1f6896d9e (diff) | |
| parent | 63a0f5a9767846308b109ddc22c9ecebd31a5a88 (diff) | |
Merge "libhwc2.1: allow EDID descriptor to be modified" into udc-dev
Diffstat (limited to 'libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterface.cpp')
| -rw-r--r-- | libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterface.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterface.cpp b/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterface.cpp index 7f565e4..6a2be7d 100644 --- a/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterface.cpp +++ b/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterface.cpp @@ -431,7 +431,8 @@ int32_t ExynosDisplayDrmInterface::getDefaultModeId(int32_t *modeId) { return NO_ERROR; } -ExynosDisplayDrmInterface::ExynosDisplayDrmInterface(ExynosDisplay *exynosDisplay) +ExynosDisplayDrmInterface::ExynosDisplayDrmInterface(ExynosDisplay *exynosDisplay): + mMonitorDescription{0} { mType = INTERFACE_TYPE_DRM; init(exynosDisplay); @@ -2423,6 +2424,11 @@ int32_t ExynosDisplayDrmInterface::getDisplayFakeEdid(uint8_t &outPort, uint32_t edid_buf[59] = height & 0xff; edid_buf[61] = (height >> 4) & 0xf0; + if (mMonitorDescription[0] != 0) { + /* Descriptor block 3 starts at address 90, data offset is 5 bytes */ + memcpy(&edid_buf[95], mMonitorDescription.data(), mMonitorDescription.size()); + } + unsigned int sum = std::accumulate(edid_buf.begin(), edid_buf.end() - 1, 0); edid_buf[127] = (0x100 - (sum & 0xFF)) & 0xFF; if (outData) { |