LineageOS/android_vendor_qcom_opensource_display-commonsys-intf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "display: Fix merge issue in jb_mr1"

Browse Source
This commit is contained in:
Linux Build Service Account
2013-03-21 16:47:12 -07:00
committed by Gerrit - the friendly Code Review server
parent 9201b30d2d 66e9788c6c
commit 0ebd0cd967
3 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libgralloc/framebuffer.cpp
View File

@@ -87,8 +87,8 @@ static int fb_post(struct framebuffer_device_t* dev, buffer_handle_t buffer)
private_module_t* m = private_module_t* m =
reinterpret_cast<private_module_t*>(dev->common.module); reinterpret_cast<private_module_t*>(dev->common.module);
struct mdp_display_commit prim_commit; struct mdp_display_commit prim_commit;
prim_commit.wait_for_finish = 1;
memset(&prim_commit, 0, sizeof(struct mdp_display_commit)); 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) { if (ioctl(m->framebuffer->fd, MSMFB_DISPLAY_COMMIT, &prim_commit) == -1) {
ALOGE("%s: MSMFB_DISPLAY_COMMIT for primary failed, str: %s", ALOGE("%s: MSMFB_DISPLAY_COMMIT for primary failed, str: %s",
__FUNCTION__, strerror(errno)); __FUNCTION__, strerror(errno));

1
libhwcomposer/hwc_utils.cpp
View File

@@ -19,6 +19,7 @@
*/ */
#define HWC_UTILS_DEBUG 0 #define HWC_UTILS_DEBUG 0
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <linux/fb.h>
#include <binder/IServiceManager.h> #include <binder/IServiceManager.h>
#include <EGL/egl.h> #include <EGL/egl.h>
#include <cutils/properties.h> #include <cutils/properties.h>

1
libhwcomposer/hwc_utils.h
View File

@@ -29,7 +29,6 @@
#include <utils/String8.h> #include <utils/String8.h>
#include "qdMetaData.h" #include "qdMetaData.h"
#include <overlayUtils.h> #include <overlayUtils.h>
#include <linux/fb.h>
#define ALIGN_TO(x, align) (((x) + ((align)-1)) & ~((align)-1)) #define ALIGN_TO(x, align) (((x) + ((align)-1)) & ~((align)-1))
#define LIKELY( exp ) (__builtin_expect( (exp) != 0, true )) #define LIKELY( exp ) (__builtin_expect( (exp) != 0, true ))