diff options
author | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-04-04 15:16:50 +0100 |
---|---|---|
committer | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-04-06 00:34:54 +0100 |
commit | c962bf8b8fa4d9a6400811296fb270f47db68cf4 (patch) | |
tree | f5e651935cbbf54e6d1488bbe19a6e2a4599a070 /libexternal | |
parent | 7a8a513ac8a2b9a76b36cf1341d45b00d88ed45c (diff) | |
parent | 6445344dbaf08ec4d8fbf6aeeffdf29faed64e78 (diff) | |
download | android_hardware_qcom_display-cm-10.1.tar.gz android_hardware_qcom_display-cm-10.1.tar.bz2 android_hardware_qcom_display-cm-10.1.zip |
Merge remote-tracking branch 'aosp/jb-mr1.1-release' into cm-10.1cm-10.1.3-RC2cm-10.1.3-RC1cm-10.1.3cm-10.1.2cm-10.1.1cm-10.1.0-RC5cm-10.1.0-RC4cm-10.1.0-RC3cm-10.1.0-RC2cm-10.1.0-RC1cm-10.1.0cm-10.1-M3cm-10.1
Change-Id: I44a10eaa285d0521669781a4fafb7641df209186
Diffstat (limited to 'libexternal')
-rw-r--r-- | libexternal/external.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/libexternal/external.cpp b/libexternal/external.cpp index f00d551d7..26485606a 100644 --- a/libexternal/external.cpp +++ b/libexternal/external.cpp @@ -445,13 +445,18 @@ bool ExternalDisplay::writeHPDOption(int userOption) const */ bool ExternalDisplay::post() { - if(mFd == -1) { + if(mFd == -1) return false; - } else if(ioctl(mFd, MSMFB_OVERLAY_COMMIT, &mExternalDisplay) == -1) { - ALOGE("%s: MSMFB_OVERLAY_COMMIT failed, str: %s", __FUNCTION__, - strerror(errno)); + + struct mdp_display_commit ext_commit; + memset(&ext_commit, 0, sizeof(ext_commit)); + ext_commit.flags = MDP_DISPLAY_COMMIT_OVERLAY; + if (ioctl(mFd, MSMFB_DISPLAY_COMMIT, &ext_commit) == -1) { + ALOGE("%s: MSMFB_DISPLAY_COMMIT for external failed, str: %s", + __FUNCTION__, strerror(errno)); return false; } + return true; } |