From 3ca3cb138b37c90557390670cc0f5ea45942d0f5 Mon Sep 17 00:00:00 2001 From: "andrew.boren" Date: Wed, 18 Jan 2012 19:51:47 -0700 Subject: [PATCH] Apply patch for touchpad. Change-Id: I29b7e653eaa8c861863fb6f304065b4f59d85d9b --- liboverlay/overlayLib.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/liboverlay/overlayLib.cpp b/liboverlay/overlayLib.cpp index 6f2c604..7132edc 100755 --- a/liboverlay/overlayLib.cpp +++ b/liboverlay/overlayLib.cpp @@ -727,11 +727,11 @@ bool Overlay::setFd(int fd, int channel) { bool Overlay::queueBuffer(uint32_t offset, int channel) { return objOvDataChannel[channel].queueBuffer(offset); } - +#if 0 bool Overlay::waitForHdmiVsync(int channel) { return objOvDataChannel[channel].waitForHdmiVsync(); } - +#endif bool Overlay::queueBuffer(buffer_handle_t buffer) { private_handle_t const* hnd = reinterpret_cast (buffer); @@ -760,11 +760,13 @@ bool Overlay::queueBuffer(buffer_handle_t buffer) { return false; } } +#if 0 //Wait for HDMI done.. if(!waitForHdmiVsync(VG1_PIPE)) { LOGE("%s: waitforHdmiVsync failed", __FUNCTION__); return false; } +#endif break; default: LOGE("%s:Unknown state %d", __FUNCTION__, mState); @@ -1502,11 +1504,11 @@ bool OverlayDataChannel::mapRotatorMemory(int num_buffers, bool uiChannel, int r mPmemFD = data.fd; mPmemAddr = data.base; mBufferType = data.allocType; - +#if 0 // Set this flag if source memory is fb if(uiChannel) mRotData.src.flags |= MDP_MEMORY_ID_TYPE_FB; - +#endif mOvDataRot.data.memory_id = mPmemFD; mRotData.dst.memory_id = mPmemFD; mRotData.dst.offset = 0; @@ -1635,7 +1637,7 @@ bool OverlayDataChannel::queue(uint32_t offset) { return true; } - +#if 0 bool OverlayDataChannel::waitForHdmiVsync() { if (!isChannelUP()) { reportError("waitForHdmiVsync: channel not up"); @@ -1647,7 +1649,7 @@ bool OverlayDataChannel::waitForHdmiVsync() { } return true; } - +#endif bool OverlayDataChannel::getCropS3D(overlay_rect *inRect, int channel, int format, overlay_rect *rect) { // for the 3D usecase extract channels from a frame