diff options
| author | Naseer Ahmed <naseer@codeaurora.org> | 2013-03-19 20:42:11 -0400 |
|---|---|---|
| committer | Naseer Ahmed <naseer@codeaurora.org> | 2013-03-19 20:42:11 -0400 |
| commit | 66e9788c6c22099416970951ac42941d16687e81 (patch) | |
| tree | 05ed293aa12fa92ee4927d2060b84b12ab1706ad /libgralloc/framebuffer.cpp | |
| parent | c1f8682f7b5b390fd2f97f27f84ce2c6587eb052 (diff) | |
| download | android_hardware_qcom_display-66e9788c6c22099416970951ac42941d16687e81.tar.gz android_hardware_qcom_display-66e9788c6c22099416970951ac42941d16687e81.tar.bz2 android_hardware_qcom_display-66e9788c6c22099416970951ac42941d16687e81.zip | |
display: Fix merge issue in jb_mr1
Slightly different version went on jb_2.5 which caused a
mismatch. Escaped testing because FB HAL is not used.
Change-Id: Ia7ee2fb80bf937499d372383641f71530dc1feca
Diffstat (limited to 'libgralloc/framebuffer.cpp')
| -rw-r--r-- | libgralloc/framebuffer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libgralloc/framebuffer.cpp b/libgralloc/framebuffer.cpp index 0335f5ef5..d95b37641 100644 --- a/libgralloc/framebuffer.cpp +++ b/libgralloc/framebuffer.cpp @@ -87,8 +87,8 @@ static int fb_post(struct framebuffer_device_t* dev, buffer_handle_t buffer) private_module_t* m = reinterpret_cast<private_module_t*>(dev->common.module); struct mdp_display_commit prim_commit; - prim_commit.wait_for_finish = 1; memset(&prim_commit, 0, sizeof(struct mdp_display_commit)); + prim_commit.wait_for_finish = 1; if (ioctl(m->framebuffer->fd, MSMFB_DISPLAY_COMMIT, &prim_commit) == -1) { ALOGE("%s: MSMFB_DISPLAY_COMMIT for primary failed, str: %s", __FUNCTION__, strerror(errno)); |