hwcomposer: fix warningsHEADandroid-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13android-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10oreo-mr1-iot-releasemastermain

- remove unused variables and functions
- avoid comparison between different types
- fix old-style field designator extension
- fix wrong print format
- unhide an overloaded virtual function
- add flag -Wno-unused-parameter to disable these ones

Bug: 110425202
Change-Id: I37623d93c0e497c733532050c88644812c4d9bb7
Signed-off-by: Simon Dubray <simonx.dubray@intel.com>

19 files changed, 38 insertions, 67 deletions

diff --git a/merrifield/common/base/DisplayAnalyzer.cpp b/merrifield/common/base/DisplayAnalyzer.cpp
index a0b9ffd..e98763f 100755
--- a/merrifield/common/base/DisplayAnalyzer.cpp
+++ b/merrifield/common/base/DisplayAnalyzer.cpp
@@ -333,7 +333,6 @@ void DisplayAnalyzer::postVideoEvent(int instanceID, int state)
         (state == VIDEO_PLAYBACK_STOPPING && mProtectedVideoSession)) {
         Hwcomposer::getInstance().invalidate();
         mOverlayAllowed = false;
-        hwc_display_contents_1_t *content = NULL;
         for (int i = 0; i < (int)mCachedNumDisplays; i++) {
             setCompositionType(i, HWC_FRAMEBUFFER, true);
         }
@@ -555,7 +554,6 @@ void DisplayAnalyzer::handleVideoEvent(int instanceID, int state)
     }
 
     if (reset) {
-        hwc_display_contents_1_t *content = NULL;
         for (int i = 0; i < (int)mCachedNumDisplays; i++) {
             setCompositionType(i, HWC_FRAMEBUFFER, true);
         }
@@ -813,7 +811,6 @@ bool DisplayAnalyzer::isPresentationLayer(hwc_layer_1_t &layer)
 
 bool DisplayAnalyzer::hasProtectedLayer()
 {
-    DataBuffer * buffer = NULL;
     hwc_display_contents_1_t *content = NULL;
     BufferManager *bm = Hwcomposer::getInstance().getBufferManager();
 
diff --git a/merrifield/common/base/Drm.cpp b/merrifield/common/base/Drm.cpp
index 619e4e5..be8d9db 100644
--- a/merrifield/common/base/Drm.cpp
+++ b/merrifield/common/base/Drm.cpp
@@ -610,7 +610,7 @@ bool Drm::setDrmMode(int index, drmModeModeInfoPtr mode)
     // We use bo_handles[0] and bo_handles[1] to store buffer_handle_t
     // to support 32 and 64 platforms.
     bo_handles[0] = ((unsigned long)(output->fbHandle)) & 0xffffffff;
-    bo_handles[1] = ((unsigned long)(output->fbHandle) >> 32) & 0xffffffff;
+    bo_handles[1] = (sizeof(long) == 4) ? 0 : ((unsigned long)(output->fbHandle) >> 32) & 0xffffffff;
     pitches[0] = stride * DrmConfig::getFrameBufferBpp() / 8;
 
     ret = drmModeAddFB2(
diff --git a/merrifield/common/base/HwcLayerList.cpp b/merrifield/common/base/HwcLayerList.cpp
index 8df6ac9..83bb0f4 100644
--- a/merrifield/common/base/HwcLayerList.cpp
+++ b/merrifield/common/base/HwcLayerList.cpp
@@ -69,7 +69,7 @@ bool HwcLayerList::checkSupported(int planeType, HwcLayer *hwcLayer)
     }
 
     // check usage
-    if (!hwcLayer->getUsage() & GRALLOC_USAGE_HW_COMPOSER) {
+    if (!(hwcLayer->getUsage() & GRALLOC_USAGE_HW_COMPOSER)) {
         WTRACE("not a composer layer");
         return false;
     }
@@ -614,12 +614,12 @@ bool HwcLayerList::useAsFrameBufferTarget(HwcLayer *target)
     }
 
     // check candidate and noncandidate layers above this candidate does not overlap
-    for (int above = targetLayerIndex + 1; above < mFBLayers.size(); above++) {
+    for (unsigned int above = targetLayerIndex + 1; above < mFBLayers.size(); above++) {
         if (mFBLayers[above]->mPlaneCandidate) {
             continue;
         } else {
             // check candidate layer below this noncandidate layer does not overlap
-            for (int below = targetLayerIndex + 1; below < above; below++) {
+            for (unsigned int below = targetLayerIndex + 1; below < above; below++) {
                 if (mFBLayers[below]->mPlaneCandidate == false) {
                     continue;
                 }
@@ -750,6 +750,7 @@ bool HwcLayerList::setupSmartComposition2()
     HwcLayer *hwcLayer = NULL;
     int layerIndex = 0;
     int i = 0;
+    unsigned int u = 0;
 
     if (mList->flags & HWC_GEOMETRY_CHANGED) {
         // clear static layers vector once geometry changed
@@ -760,8 +761,8 @@ bool HwcLayerList::setupSmartComposition2()
 
     if (mStaticLayersIndex.size() > 0) {
         // exit criteria: once either static layer has update
-        for (i = 0; i < mStaticLayersIndex.size(); i++) {
-            layerIndex = mStaticLayersIndex.itemAt(i);
+        for (u = 0; u < mStaticLayersIndex.size(); u++) {
+            layerIndex = mStaticLayersIndex.itemAt(u);
             hwcLayer = mLayers.itemAt(layerIndex);
 
             if (hwcLayer->isUpdated()) {
@@ -770,8 +771,8 @@ bool HwcLayerList::setupSmartComposition2()
         }
 
         if (ret == true) {
-            for (i = 0; i < mStaticLayersIndex.size(); i++) {
-                layerIndex = mStaticLayersIndex.itemAt(i);
+            for (u = 0; u < mStaticLayersIndex.size(); u++) {
+                layerIndex = mStaticLayersIndex.itemAt(u);
                 hwcLayer = mLayers.itemAt(layerIndex);
 
                 hwcLayer->setCompositionType(HWC_FRAMEBUFFER);
@@ -799,7 +800,7 @@ bool HwcLayerList::setupSmartComposition2()
             //    1. If two connected, can trigger smart composition2
             //    2. Caculate layer size to see if it saves more bandwidth
             //    3. Dynamically check and add new static layers
-            int staticLayerCount = mStaticLayersIndex.size();
+            int staticLayerCount = (int)mStaticLayersIndex.size();
 
             if (staticLayerCount > 1 && staticLayerCount < mLayerCount-1) {
                 layerIndex = mStaticLayersIndex.itemAt(0);
@@ -846,8 +847,6 @@ bool HwcLayerList::setupSmartComposition2()
 
 bool HwcLayerList::update(hwc_display_contents_1_t *list)
 {
-    bool ret;
-
     // basic check to make sure the consistance
     if (!list) {
         ETRACE("null layer list");
diff --git a/merrifield/common/base/HwcModule.cpp b/merrifield/common/base/HwcModule.cpp
index 5894b9b..89d8112 100644
--- a/merrifield/common/base/HwcModule.cpp
+++ b/merrifield/common/base/HwcModule.cpp
@@ -208,18 +208,6 @@ static int hwc_setActiveConfig(hwc_composer_device_1_t *dev, int disp, int index
     return 0;
 }
 
-static int hwc_setCursorPositionAsync(hwc_composer_device_1_t *dev, int disp, int x, int y)
-{
-    GET_HWC_RETURN_ERROR_IF_NULL();
-    bool ret = hwc->setCursorPositionAsync(disp, x, y);
-    if (ret == false) {
-        WTRACE("failed to set cursor position of disp %d", disp);
-        return -EINVAL;
-    }
-
-    return 0;
-}
-
 //------------------------------------------------------------------------------
 
 static int hwc_device_open(const struct hw_module_t* module,
@@ -281,19 +269,19 @@ static int hwc_device_open(const struct hw_module_t* module,
 } // namespace android
 
 static struct hw_module_methods_t hwc_module_methods = {
-    open: android::intel::hwc_device_open
+    .open = android::intel::hwc_device_open
 };
 
 hwc_module_t HAL_MODULE_INFO_SYM = {
-    common: {
-        tag: HARDWARE_MODULE_TAG,
-        version_major: 1,
-        version_minor: 4,
-        id: HWC_HARDWARE_MODULE_ID,
-        name: "Intel Hardware Composer",
-        author: "Intel",
-        methods: &hwc_module_methods,
-        dso: NULL,
-        reserved: {0},
+    .common = {
+        .tag = HARDWARE_MODULE_TAG,
+        .version_major = 1,
+        .version_minor = 4,
+        .id = HWC_HARDWARE_MODULE_ID,
+        .name = "Intel Hardware Composer",
+        .author = "Intel",
+        .methods = &hwc_module_methods,
+        .dso = NULL,
+        .reserved = {0},
     }
 };
diff --git a/merrifield/common/base/Hwcomposer.cpp b/merrifield/common/base/Hwcomposer.cpp
index e4d9ad8..753f1ea 100644
--- a/merrifield/common/base/Hwcomposer.cpp
+++ b/merrifield/common/base/Hwcomposer.cpp
@@ -162,7 +162,7 @@ bool Hwcomposer::setPowerMode(int disp, int mode)
         return false;
     }
 
-    if(disp >= mDisplayDevices.size()){
+    if(disp >= (int)mDisplayDevices.size()){
         ETRACE("no device found");
         return false;
     }
@@ -261,7 +261,7 @@ bool Hwcomposer::getDisplayConfigs(int disp,
         return false;
     }
 
-    if(disp >= mDisplayDevices.size()){
+    if(disp >= (int)mDisplayDevices.size()){
         ETRACE("no device found");
         return false;
     }
@@ -286,7 +286,7 @@ bool Hwcomposer::getDisplayAttributes(int disp,
         ETRACE("invalid disp %d", disp);
         return false;
     }
-    if(disp >= mDisplayDevices.size()){
+    if(disp >= (int)mDisplayDevices.size()){
         ETRACE("no device found");
         return false;
     }
@@ -312,7 +312,7 @@ bool Hwcomposer::compositionComplete(int disp)
 
     mDisplayContext->compositionComplete();
 
-    if(disp >= mDisplayDevices.size()){
+    if(disp >= (int)mDisplayDevices.size()){
         ETRACE("no device found");
         return false;
     }
diff --git a/merrifield/common/devices/VirtualDevice.cpp b/merrifield/common/devices/VirtualDevice.cpp
index 4e9ad83..7144742 100755
--- a/merrifield/common/devices/VirtualDevice.cpp
+++ b/merrifield/common/devices/VirtualDevice.cpp
@@ -213,7 +213,7 @@ public:
         int format;
         VASurfaceAttributeTPI attribTpi;
         memset(&attribTpi, 0, sizeof(attribTpi));
-        VTRACE("Map khandle 0x%x size=%ux%u", khandle, stride, height);
+        VTRACE("Map khandle 0x%p size=%ux%u", khandle, stride, height);
         attribTpi.type = VAExternalMemoryKernelDRMBufffer;
         attribTpi.width = stride;
         attribTpi.height = height;
@@ -862,8 +862,6 @@ bool VirtualDevice::prepare(hwc_display_contents_1_t *display)
     mRgbLayer = fbTarget;
     mYuvLayer = -1;
 
-    DisplayAnalyzer *analyzer = mHwc.getDisplayAnalyzer();
-
     mProtectedMode = false;
 #ifdef INTEL_WIDI
     if (mCurrentConfig.typeChangeListener != NULL &&
@@ -2327,8 +2325,6 @@ uint32_t VirtualDevice::getFpsDivider()
 
 void VirtualDevice::deinitialize()
 {
-    VAStatus va_status;
-
     if (mPayloadManager) {
         delete mPayloadManager;
         mPayloadManager = NULL;
diff --git a/merrifield/include/BufferManager.h b/merrifield/include/BufferManager.h
index d304b00..52dcf38 100644
--- a/merrifield/include/BufferManager.h
+++ b/merrifield/include/BufferManager.h
@@ -72,7 +72,6 @@ private:
         DEFAULT_BUFFER_POOL_SIZE = 128,
     };
 
-    alloc_device_t *mAllocDev;
     KeyedVector<buffer_handle_t, BufferMapper*> mFrameBuffers;
     BufferCache *mBufferPool;
     DataBuffer *mDataBuffer;
diff --git a/merrifield/ips/common/OverlayPlaneBase.cpp b/merrifield/ips/common/OverlayPlaneBase.cpp
index 5987b50..2266d47 100644
--- a/merrifield/ips/common/OverlayPlaneBase.cpp
+++ b/merrifield/ips/common/OverlayPlaneBase.cpp
@@ -349,9 +349,7 @@ BufferMapper* OverlayPlaneBase::getTTMMapper(BufferMapper& grallocMapper, struct
     uint32_t yStride, uvStride;
     stride_t stride;
     int srcX, srcY, srcW, srcH;
-    int tmp;
 
-    DataBuffer *buf;
     ssize_t index;
     TTMBufferMapper *mapper;
     bool ret;
@@ -692,7 +690,6 @@ bool OverlayPlaneBase::bufferOffsetSetup(BufferMapper& mapper)
     uint32_t gttOffsetInBytes = (mapper.getGttOffsetInPage(0) << 12);
     uint32_t yStride = mapper.getStride().yuv.yStride;
     uint32_t uvStride = mapper.getStride().yuv.uvStride;
-    uint32_t w = mapper.getWidth();
     uint32_t h = mapper.getHeight();
     uint32_t srcX= mapper.getCrop().x;
     uint32_t srcY= mapper.getCrop().y;
diff --git a/merrifield/ips/common/PlaneCapabilities.cpp b/merrifield/ips/common/PlaneCapabilities.cpp
index 973c535..6952ff7 100644
--- a/merrifield/ips/common/PlaneCapabilities.cpp
+++ b/merrifield/ips/common/PlaneCapabilities.cpp
@@ -79,8 +79,6 @@ bool PlaneCapabilities::isFormatSupported(int planeType, HwcLayer *hwcLayer)
 bool PlaneCapabilities::isSizeSupported(int planeType, HwcLayer *hwcLayer)
 {
     uint32_t format = hwcLayer->getFormat();
-    uint32_t w = hwcLayer->getBufferWidth();
-    uint32_t h = hwcLayer->getBufferHeight();
     const stride_t& stride = hwcLayer->getBufferStride();
 
     bool isYUVPacked;
diff --git a/merrifield/ips/common/RotationBufferProvider.cpp b/merrifield/ips/common/RotationBufferProvider.cpp
index 5f90865..c152181 100644
--- a/merrifield/ips/common/RotationBufferProvider.cpp
+++ b/merrifield/ips/common/RotationBufferProvider.cpp
@@ -381,7 +381,6 @@ bool RotationBufferProvider::setupRotationBuffer(VideoPayloadBuffer *payload, in
     uint32_t setup_Begin = getMilliseconds();
 #endif
     VAStatus vaStatus;
-    int stride;
     bool ret = false;
 
     if (payload->format != VA_FOURCC_NV12 || payload->width == 0 || payload->height == 0) {
diff --git a/merrifield/ips/common/TTMBufferMapper.cpp b/merrifield/ips/common/TTMBufferMapper.cpp
index 7c3ed0d..129cb4f 100644
--- a/merrifield/ips/common/TTMBufferMapper.cpp
+++ b/merrifield/ips/common/TTMBufferMapper.cpp
@@ -21,7 +21,6 @@ namespace intel {
 
 TTMBufferMapper::TTMBufferMapper(Wsbm& wsbm, DataBuffer& buffer)
     : BufferMapper(buffer),
-      mRefCount(0),
       mWsbm(wsbm),
       mBufferObject(0),
       mGttOffsetInPage(0),
diff --git a/merrifield/ips/common/TTMBufferMapper.h b/merrifield/ips/common/TTMBufferMapper.h
index 46ed26e..8744ce7 100644
--- a/merrifield/ips/common/TTMBufferMapper.h
+++ b/merrifield/ips/common/TTMBufferMapper.h
@@ -53,7 +53,6 @@ public:
     // wait idle
     bool waitIdle();
 private:
-    int mRefCount;
     Wsbm& mWsbm;
     void* mBufferObject;
 
diff --git a/merrifield/ips/common/WsbmWrapper.c b/merrifield/ips/common/WsbmWrapper.c
index 98d8557..363e0f1 100644
--- a/merrifield/ips/common/WsbmWrapper.c
+++ b/merrifield/ips/common/WsbmWrapper.c
@@ -157,7 +157,6 @@ int psbWsbmAllocateFromUB(uint32_t size, uint32_t align, void ** buf, void *user
 {
     struct _WsbmBufferObject * wsbmBuf = NULL;
     int ret = 0;
-    int offset = 0;
 
     ATRACE("size %d", align_to(size, 4096));
 
@@ -196,7 +195,6 @@ int psbWsbmAllocateTTMBuffer(uint32_t size, uint32_t align, void ** buf)
 {
     struct _WsbmBufferObject * wsbmBuf = NULL;
     int ret = 0;
-    int offset = 0;
 
     ATRACE("size %d", align_to(size, 4096));
 
@@ -257,7 +255,7 @@ int psbWsbmWrapTTMBuffer(uint64_t handle, void **buf)
 
     *buf = (void *)wsbmBuf;
 
-    VTRACE("wrap buffer %p for handle %#x", wsbmBuf, handle);
+    VTRACE("wrap buffer %p for handle %#llx", wsbmBuf, handle);
     return 0;
 }
 
@@ -281,7 +279,7 @@ int psbWsbmWrapTTMBuffer2(uint64_t handle, void **buf)
 
     *buf = (void *)wsbmBuf;
 
-    VTRACE("wrap buffer %p for handle %#x", wsbmBuf, handle);
+    VTRACE("wrap buffer %p for handle %#llx", wsbmBuf, handle);
     return 0;
 }
 
diff --git a/merrifield/ips/tangier/TngDisplayContext.cpp b/merrifield/ips/tangier/TngDisplayContext.cpp
index 3f4fd5e..df6110a 100644
--- a/merrifield/ips/tangier/TngDisplayContext.cpp
+++ b/merrifield/ips/tangier/TngDisplayContext.cpp
@@ -120,7 +120,7 @@ bool TngDisplayContext::commitContents(hwc_display_contents_1_t *display, HwcLay
             memset(&ctx->zorder, 0, sizeof(ctx->zorder));
         }
 
-        VTRACE("count %p, handle %#x, trans %#x, blending %#x"
+        VTRACE("count %d, handle %p, trans %#x, blending %#x"
               " sourceCrop %f,%f - %fx%f, dst %d,%d - %dx%d, custom %#x",
               mCount,
               imgLayer->psLayer->handle,
@@ -213,7 +213,7 @@ bool TngDisplayContext::commitEnd(size_t numDisplays, hwc_display_contents_1_t *
 
         // log for layer fence status
         for (size_t j = 0; j < displays[i]->numHwLayers; j++) {
-            VTRACE("handle %#p, acquiredFD %d, releaseFD %d",
+            VTRACE("handle %p, acquiredFD %d, releaseFD %d",
                  displays[i]->hwLayers[j].handle,
                  displays[i]->hwLayers[j].acquireFenceFd,
                  displays[i]->hwLayers[j].releaseFenceFd);
diff --git a/merrifield/ips/tangier/TngGrallocBufferMapper.cpp b/merrifield/ips/tangier/TngGrallocBufferMapper.cpp
index 4f7eb75..5b174f8 100644
--- a/merrifield/ips/tangier/TngGrallocBufferMapper.cpp
+++ b/merrifield/ips/tangier/TngGrallocBufferMapper.cpp
@@ -25,8 +25,7 @@ namespace intel {
 TngGrallocBufferMapper::TngGrallocBufferMapper(const hw_device_t& gralloc,
                                                DataBuffer& buffer)
     : GrallocBufferMapperBase(buffer),
-      mGralloc(gralloc),
-      mBufferObject(0)
+      mGralloc(gralloc)
 {
     CTRACE();
 
@@ -34,7 +33,7 @@ TngGrallocBufferMapper::TngGrallocBufferMapper(const hw_device_t& gralloc,
 
 	mClonedHandle = native_handle_create(h->numFds, h->numInts);
 	if (mClonedHandle == 0) {
-		ALOGE("%s:Failed to create handle, out of memory!");
+		ALOGE("Failed to create handle, out of memory!");
 		return;
 	}
 	for (int i = 0; i < h->numFds; i++)
diff --git a/merrifield/ips/tangier/TngGrallocBufferMapper.h b/merrifield/ips/tangier/TngGrallocBufferMapper.h
index 1b27ae1..bb855d3 100644
--- a/merrifield/ips/tangier/TngGrallocBufferMapper.h
+++ b/merrifield/ips/tangier/TngGrallocBufferMapper.h
@@ -41,8 +41,7 @@ private:
 
 private:
     const hw_device_t& mGralloc;
-    void* mBufferObject;
-	native_handle_t* mClonedHandle;
+    native_handle_t* mClonedHandle;
 };
 
 } // namespace intel
diff --git a/merrifield/ips/tangier/TngPlaneManager.cpp b/merrifield/ips/tangier/TngPlaneManager.cpp
index 08ed8ea..232711e 100644
--- a/merrifield/ips/tangier/TngPlaneManager.cpp
+++ b/merrifield/ips/tangier/TngPlaneManager.cpp
@@ -131,7 +131,7 @@ bool TngPlaneManager::assignPlanes(int dsp, ZOrderConfig& config)
     }
 
     if (config.size() == 1 && config[0]->planeType == DisplayPlane::PLANE_SPRITE) {
-        config[0]->planeType == DisplayPlane::PLANE_PRIMARY;
+        config[0]->planeType = DisplayPlane::PLANE_PRIMARY;
     }
 
     // allocate planes
diff --git a/merrifield/ips/tangier/TngPrimaryPlane.h b/merrifield/ips/tangier/TngPrimaryPlane.h
index 22dbbd3..f48e10a 100644
--- a/merrifield/ips/tangier/TngPrimaryPlane.h
+++ b/merrifield/ips/tangier/TngPrimaryPlane.h
@@ -29,6 +29,8 @@ public:
     bool setDataBuffer(buffer_handle_t handle);
     void setZOrderConfig(ZOrderConfig& config, void *nativeConfig);
     bool assignToDevice(int disp);
+protected:
+    using TngSpritePlane::setDataBuffer;
 private:
     void setFramebufferTarget(buffer_handle_t handle);
     bool enablePlane(bool enabled);
diff --git a/merrifield/platforms/merrifield/Android.mk b/merrifield/platforms/merrifield/Android.mk
index e6eb591..a328f78 100644
--- a/merrifield/platforms/merrifield/Android.mk
+++ b/merrifield/platforms/merrifield/Android.mk
@@ -119,6 +119,8 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := hwcomposer.$(TARGET_BOARD_PLATFORM)
 LOCAL_CFLAGS += -DLINUX
 
+LOCAL_CFLAGS += -Wno-unused-parameter
+
 ifeq ($(BOARD_PANEL_IS_180_ROTATED), true)
     $(warning  "Panel rotates 180")
     LOCAL_CFLAGS += -DENABLE_ROTATION_180