diff options
102 files changed, 507 insertions, 541 deletions
@@ -17,10 +17,10 @@ LOCAL_PATH := $(call my-dir) LOCAL_ROOT_PATH := $(call my-dir) ifeq ($(INTEL_HWC_MERRIFIELD),true) -include $(LOCAL_PATH)/platforms/merrifield/Android.mk +include $(LOCAL_PATH)/merrifield.mk endif ifeq ($(INTEL_HWC_MOOREFIELD),true) -include $(LOCAL_PATH)/platforms/merrifield_plus/Android.mk +include $(LOCAL_PATH)/merrifield_plus.mk endif diff --git a/common/base/DisplayAnalyzer.cpp b/common/base/DisplayAnalyzer.cpp index b09112a..dda1b0d 100755 --- a/common/base/DisplayAnalyzer.cpp +++ b/common/base/DisplayAnalyzer.cpp @@ -26,13 +26,13 @@ * */ -#include <HwcTrace.h> +#include <common/utils/HwcTrace.h> #include <IDisplayDevice.h> #include <DisplayQuery.h> #include <BufferManager.h> #include <DisplayPlaneManager.h> #include <Hwcomposer.h> -#include <DisplayAnalyzer.h> +#include <common/base/DisplayAnalyzer.h> #include <cutils/properties.h> #include <GraphicBuffer.h> #include <ExternalDevice.h> diff --git a/common/base/Drm.cpp b/common/base/Drm.cpp index f04deef..4f70a20 100644 --- a/common/base/Drm.cpp +++ b/common/base/Drm.cpp @@ -27,10 +27,10 @@ */ #include <fcntl.h> #include <errno.h> -#include <HwcTrace.h> +#include <common/utils/HwcTrace.h> #include <IDisplayDevice.h> #include <DrmConfig.h> -#include <Drm.h> +#include <common/base/Drm.h> #include <Hwcomposer.h> namespace android { diff --git a/common/base/HwcLayer.cpp b/common/base/HwcLayer.cpp index eef8311..d6aba6a 100644 --- a/common/base/HwcLayer.cpp +++ b/common/base/HwcLayer.cpp @@ -25,9 +25,9 @@ * Jackie Li <yaodong.li@intel.com> * */ -#include <HwcTrace.h> -#include <Drm.h> -#include <HwcLayer.h> +#include <common/utils/HwcTrace.h> +#include <common/base/Drm.h> +#include <common/base/HwcLayer.h> #include <Hwcomposer.h> #include <GraphicBuffer.h> #include <IDisplayDevice.h> diff --git a/common/base/HwcLayerList.cpp b/common/base/HwcLayerList.cpp index b406d91..74ee13a 100644 --- a/common/base/HwcLayerList.cpp +++ b/common/base/HwcLayerList.cpp @@ -25,9 +25,9 @@ * Jackie Li <yaodong.li@intel.com> * */ -#include <HwcTrace.h> -#include <Drm.h> -#include <HwcLayerList.h> +#include <common/utils/HwcTrace.h> +#include <common/base/Drm.h> +#include <common/base/HwcLayerList.h> #include <Hwcomposer.h> #include <GraphicBuffer.h> #include <IDisplayDevice.h> @@ -478,12 +478,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() - 1; above++) { + for (unsigned int above = targetLayerIndex + 1; above < mFBLayers.size() - 1; 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; } diff --git a/common/base/HwcLayerList.h b/common/base/HwcLayerList.h index 0497f6a..0da4648 100644 --- a/common/base/HwcLayerList.h +++ b/common/base/HwcLayerList.h @@ -28,13 +28,13 @@ #ifndef HWC_LAYER_LIST_H #define HWC_LAYER_LIST_H -#include <Dump.h> +#include <common/utils/Dump.h> #include <hardware/hwcomposer.h> #include <utils/SortedVector.h> #include <DataBuffer.h> #include <DisplayPlane.h> #include <DisplayPlaneManager.h> -#include <HwcLayer.h> +#include <common/base/HwcLayer.h> namespace android { namespace intel { diff --git a/common/base/HwcModule.cpp b/common/base/HwcModule.cpp index 8b17fb8..208cb77 100644 --- a/common/base/HwcModule.cpp +++ b/common/base/HwcModule.cpp @@ -30,7 +30,7 @@ #include <stdio.h> #include <fcntl.h> #include <errno.h> -#include <HwcTrace.h> +#include <common/utils/HwcTrace.h> #include <Hwcomposer.h> #define GET_HWC_RETURN_X_IF_NULL(X) \ @@ -90,17 +90,17 @@ void hwc_registerProcs(struct hwc_composer_device_1 *dev, hwc->registerProcs(procs); } -static int hwc_device_close(struct hw_device_t *dev) +static int hwc_device_close(struct hw_device_t * /* dev */) { CTRACE(); Hwcomposer::releaseInstance(); return 0; } -static int hwc_query(struct hwc_composer_device_1 *dev, - int what, - int* value) +static int hwc_query(struct hwc_composer_device_1 * /* dev */, + int what, int* /* value */) { + (void) what; ATRACE("what = %d", what); return -EINVAL; } @@ -252,5 +252,7 @@ hwc_module_t HAL_MODULE_INFO_SYM = { name: "Intel Hardware Composer", author: "Intel", methods: &hwc_module_methods, + dso: 0, + reserved: { 0 }, } }; diff --git a/common/base/Hwcomposer.cpp b/common/base/Hwcomposer.cpp index 2c42b63..5bf1c1d 100644 --- a/common/base/Hwcomposer.cpp +++ b/common/base/Hwcomposer.cpp @@ -25,9 +25,9 @@ * Jackie Li <yaodong.li@intel.com> * */ -#include <HwcTrace.h> +#include <common/utils/HwcTrace.h> #include <Hwcomposer.h> -#include <Dump.h> +#include <common/utils/Dump.h> #include <UeventObserver.h> namespace android { @@ -173,7 +173,7 @@ bool Hwcomposer::blank(int disp, int blank) ETRACE("invalid disp %d", disp); return false; } - if (disp >= mDisplayDevices.size()) { + if (disp >= (int) mDisplayDevices.size()) { return false; } IDisplayDevice *device = mDisplayDevices.itemAt(disp); @@ -195,7 +195,7 @@ bool Hwcomposer::getDisplayConfigs(int disp, ETRACE("invalid disp %d", disp); return false; } - if (disp >= mDisplayDevices.size()) { + if (disp >= (int) mDisplayDevices.size()) { return false; } IDisplayDevice *device = mDisplayDevices.itemAt(disp); @@ -218,7 +218,7 @@ bool Hwcomposer::getDisplayAttributes(int disp, ETRACE("invalid disp %d", disp); return false; } - if (disp >= mDisplayDevices.size()) { + if (disp >= (int) mDisplayDevices.size()) { return false; } IDisplayDevice *device = mDisplayDevices.itemAt(disp); @@ -240,7 +240,7 @@ bool Hwcomposer::compositionComplete(int disp) } mDisplayContext->compositionComplete(); - if (disp >= mDisplayDevices.size()) { + if (disp >= (int) mDisplayDevices.size()) { return false; } @@ -299,7 +299,7 @@ bool Hwcomposer::release() return true; } -bool Hwcomposer::dump(char *buff, int buff_len, int *cur_len) +bool Hwcomposer::dump(char *buff, int buff_len, int * /* cur_len */) { RETURN_FALSE_IF_NOT_INIT(); @@ -464,7 +464,7 @@ IDisplayDevice* Hwcomposer::getDisplayDevice(int disp) ETRACE("invalid disp %d", disp); return NULL; } - if (disp >= mDisplayDevices.size()) { + if (disp >= (int) mDisplayDevices.size()) { return NULL; } return mDisplayDevices.itemAt(disp); diff --git a/common/base/VsyncManager.cpp b/common/base/VsyncManager.cpp index 6b3b16c..2dcb3f4 100644 --- a/common/base/VsyncManager.cpp +++ b/common/base/VsyncManager.cpp @@ -26,13 +26,13 @@ * */ -#include <HwcTrace.h> +#include <common/utils/HwcTrace.h> #include <IDisplayDevice.h> #include <DisplayQuery.h> #include <BufferManager.h> #include <DisplayPlaneManager.h> #include <Hwcomposer.h> -#include <VsyncManager.h> +#include <common/base/VsyncManager.h> namespace android { diff --git a/common/buffers/BufferCache.cpp b/common/buffers/BufferCache.cpp index 80bd45e..621cdcd 100644 --- a/common/buffers/BufferCache.cpp +++ b/common/buffers/BufferCache.cpp @@ -25,8 +25,8 @@ * Jackie Li <yaodong.li@intel.com> * */ -#include <HwcTrace.h> -#include <BufferCache.h> +#include <common/utils/HwcTrace.h> +#include <common/buffers/BufferCache.h> namespace android { namespace intel { diff --git a/common/buffers/BufferManager.cpp b/common/buffers/BufferManager.cpp index 4b4d965..506a9a6 100644 --- a/common/buffers/BufferManager.cpp +++ b/common/buffers/BufferManager.cpp @@ -26,7 +26,7 @@ * */ -#include <HwcTrace.h> +#include <common/utils/HwcTrace.h> #include <hardware/hwcomposer.h> #include <BufferManager.h> #include <DrmConfig.h> @@ -147,7 +147,7 @@ DataBuffer* BufferManager::lockDataBuffer(uint32_t handle) return mDataBuffer; } -void BufferManager::unlockDataBuffer(DataBuffer *buffer) +void BufferManager::unlockDataBuffer(DataBuffer * /* buffer */) { mDataBufferLock.unlock(); } diff --git a/common/buffers/GraphicBuffer.cpp b/common/buffers/GraphicBuffer.cpp index 0aac45d..3d660ba 100644 --- a/common/buffers/GraphicBuffer.cpp +++ b/common/buffers/GraphicBuffer.cpp @@ -25,7 +25,7 @@ * Jackie Li <yaodong.li@intel.com> * */ -#include <HwcTrace.h> +#include <common/utils/HwcTrace.h> #include <GraphicBuffer.h> namespace android { @@ -79,7 +79,7 @@ bool GraphicBuffer::isCompressionBuffer(GraphicBuffer *buffer) return isCompressionUsage(buffer->mUsage); } -void GraphicBuffer::initBuffer(uint32_t handle) +void GraphicBuffer::initBuffer(uint32_t /*handle*/) { mUsage = USAGE_INVALID; mBpp = 0; diff --git a/common/devices/ExternalDevice.cpp b/common/devices/ExternalDevice.cpp index 25f4386..6cf216a 100644 --- a/common/devices/ExternalDevice.cpp +++ b/common/devices/ExternalDevice.cpp @@ -26,8 +26,8 @@ * */ -#include <HwcTrace.h> -#include <Drm.h> +#include <common/utils/HwcTrace.h> +#include <common/base/Drm.h> #include <DrmConfig.h> #include <Hwcomposer.h> #include <ExternalDevice.h> diff --git a/common/devices/PhysicalDevice.cpp b/common/devices/PhysicalDevice.cpp index b853512..5e49e9f 100644 --- a/common/devices/PhysicalDevice.cpp +++ b/common/devices/PhysicalDevice.cpp @@ -25,8 +25,8 @@ * Jackie Li <yaodong.li@intel.com> * */ -#include <HwcTrace.h> -#include <Drm.h> +#include <common/utils/HwcTrace.h> +#include <common/base/Drm.h> #include <Hwcomposer.h> #include <PhysicalDevice.h> @@ -211,9 +211,9 @@ bool PhysicalDevice::getDisplayConfigs(uint32_t *configs, return true; } -bool PhysicalDevice::getDisplayAttributes(uint32_t configs, - const uint32_t *attributes, - int32_t *values) +bool PhysicalDevice::getDisplayAttributes(uint32_t /* configs */, + const uint32_t *attributes, + int32_t *values) { RETURN_FALSE_IF_NOT_INIT(); diff --git a/common/devices/PrimaryDevice.cpp b/common/devices/PrimaryDevice.cpp index cafc50d..048ba9d 100644 --- a/common/devices/PrimaryDevice.cpp +++ b/common/devices/PrimaryDevice.cpp @@ -25,8 +25,8 @@ * Jackie Li <yaodong.li@intel.com> * */ -#include <HwcTrace.h> -#include <Drm.h> +#include <common/utils/HwcTrace.h> +#include <common/base/Drm.h> #include <Hwcomposer.h> #include <DrmConfig.h> #include <PrimaryDevice.h> diff --git a/common/devices/VirtualDevice.cpp b/common/devices/VirtualDevice.cpp index a83e439..fc59899 100755 --- a/common/devices/VirtualDevice.cpp +++ b/common/devices/VirtualDevice.cpp @@ -25,12 +25,12 @@ * Jackie Li <yaodong.li@intel.com> * */ -#include <HwcTrace.h> +#include <common/utils/HwcTrace.h> #include <Hwcomposer.h> #include <DisplayPlaneManager.h> #include <DisplayQuery.h> #include <VirtualDevice.h> -#include <SoftVsyncObserver.h> +#include <common/observers/SoftVsyncObserver.h> #include <binder/IServiceManager.h> #include <binder/ProcessState.h> diff --git a/common/observers/MultiDisplayObserver.cpp b/common/observers/MultiDisplayObserver.cpp index fa71a39..f0d1ae9 100755 --- a/common/observers/MultiDisplayObserver.cpp +++ b/common/observers/MultiDisplayObserver.cpp @@ -26,14 +26,14 @@ * */ #ifdef TARGET_HAS_MULTIPLE_DISPLAY -#include <HwcTrace.h> +#include <common/utils/HwcTrace.h> #include <binder/IServiceManager.h> #include <Hwcomposer.h> -#include <DisplayAnalyzer.h> +#include <common/base/DisplayAnalyzer.h> #include <ExternalDevice.h> #endif -#include <MultiDisplayObserver.h> +#include <common/observers/MultiDisplayObserver.h> namespace android { namespace intel { diff --git a/common/observers/MultiDisplayObserver.h b/common/observers/MultiDisplayObserver.h index b43b4d7..b8f4680 100755 --- a/common/observers/MultiDisplayObserver.h +++ b/common/observers/MultiDisplayObserver.h @@ -30,7 +30,7 @@ #ifdef TARGET_HAS_MULTIPLE_DISPLAY #include <display/MultiDisplayService.h> -#include <SimpleThread.h> +#include <common/base/SimpleThread.h> #else #include <utils/Errors.h> #include <string.h> @@ -134,14 +134,14 @@ public: bool initialize() { return true; } void deinitialize() {} - status_t notifyHotPlug(bool connected) { return NO_ERROR; } - status_t getVideoSourceInfo(int sessionID, VideoSourceInfo* info) { return INVALID_OPERATION; } + status_t notifyHotPlug(bool /* connected */) { return NO_ERROR; } + status_t getVideoSourceInfo(int /* sessionID */, VideoSourceInfo* /* info */) { return INVALID_OPERATION; } int getVideoSessionNumber() { return 0; } bool isExternalDeviceTimingFixed() const { return false; } - status_t notifyWidiConnectionStatus(bool connected) { return NO_ERROR; } + status_t notifyWidiConnectionStatus(bool /* connected */) { return NO_ERROR; } status_t setDecoderOutputResolution( - int sessionID, - int32_t width, int32_t height, + int /* sessionID */, + int32_t /* width */, int32_t /* height */, int32_t, int32_t, int32_t, int32_t) { return NO_ERROR; } }; diff --git a/common/observers/SoftVsyncObserver.cpp b/common/observers/SoftVsyncObserver.cpp index 4d0b659..c16ac1b 100644 --- a/common/observers/SoftVsyncObserver.cpp +++ b/common/observers/SoftVsyncObserver.cpp @@ -25,8 +25,8 @@ * Jackie Li <yaodong.li@intel.com> * */ -#include <HwcTrace.h> -#include <SoftVsyncObserver.h> +#include <common/utils/HwcTrace.h> +#include <common/observers/SoftVsyncObserver.h> #include <IDisplayDevice.h> extern "C" int clock_nanosleep(clockid_t clock_id, int flags, diff --git a/common/observers/SoftVsyncObserver.h b/common/observers/SoftVsyncObserver.h index 72bf329..bb9dc02 100755 --- a/common/observers/SoftVsyncObserver.h +++ b/common/observers/SoftVsyncObserver.h @@ -28,7 +28,7 @@ #ifndef SOFT_VSYNC_OBSERVER_H #define SOFT_VSYNC_OBSERVER_H -#include <SimpleThread.h> +#include <common/base/SimpleThread.h> namespace android { namespace intel { diff --git a/common/observers/UeventObserver.cpp b/common/observers/UeventObserver.cpp index 0f0c860..2c88510 100644 --- a/common/observers/UeventObserver.cpp +++ b/common/observers/UeventObserver.cpp @@ -32,7 +32,7 @@ #include <sys/types.h> #include <unistd.h> #include <DrmConfig.h> -#include <HwcTrace.h> +#include <common/utils/HwcTrace.h> #include <UeventObserver.h> namespace android { diff --git a/common/observers/VsyncEventObserver.cpp b/common/observers/VsyncEventObserver.cpp index 5c82401..284c34f 100644 --- a/common/observers/VsyncEventObserver.cpp +++ b/common/observers/VsyncEventObserver.cpp @@ -25,8 +25,8 @@ * Jackie Li <yaodong.li@intel.com> * */ -#include <HwcTrace.h> -#include <VsyncEventObserver.h> +#include <common/utils/HwcTrace.h> +#include <common/observers/VsyncEventObserver.h> #include <PhysicalDevice.h> namespace android { diff --git a/common/observers/VsyncEventObserver.h b/common/observers/VsyncEventObserver.h index b3d8bda..e7ed862 100644 --- a/common/observers/VsyncEventObserver.h +++ b/common/observers/VsyncEventObserver.h @@ -28,7 +28,7 @@ #ifndef __VSYNC_EVENT_OBSERVER_H__ #define __VSYNC_EVENT_OBSERVER_H__ -#include <SimpleThread.h> +#include <common/base/SimpleThread.h> #include <IVsyncControl.h> namespace android { diff --git a/common/planes/DisplayPlane.cpp b/common/planes/DisplayPlane.cpp index f8e4a0f..218a469 100644 --- a/common/planes/DisplayPlane.cpp +++ b/common/planes/DisplayPlane.cpp @@ -25,7 +25,7 @@ * Jackie Li <yaodong.li@intel.com> * */ -#include <HwcTrace.h> +#include <common/utils/HwcTrace.h> #include <Hwcomposer.h> #include <DisplayPlane.h> #include <GraphicBuffer.h> @@ -346,7 +346,7 @@ bool DisplayPlane::assignToDevice(int disp) return true; } -bool DisplayPlane::flip(void *ctx) +bool DisplayPlane::flip(void * /* ctx */) { RETURN_FALSE_IF_NOT_INIT(); diff --git a/common/planes/DisplayPlaneManager.cpp b/common/planes/DisplayPlaneManager.cpp index e84ff98..2508f6c 100644 --- a/common/planes/DisplayPlaneManager.cpp +++ b/common/planes/DisplayPlaneManager.cpp @@ -25,7 +25,7 @@ * Jackie Li <yaodong.li@intel.com> * */ -#include <HwcTrace.h> +#include <common/utils/HwcTrace.h> #include <IDisplayDevice.h> #include <DisplayPlaneManager.h> @@ -202,7 +202,7 @@ DisplayPlane* DisplayPlaneManager::getAnyPlane(int type) return 0; } -void DisplayPlaneManager::putPlane(int dsp, DisplayPlane& plane) +void DisplayPlaneManager::putPlane(int /* dsp */, DisplayPlane& plane) { int index; int type; @@ -264,7 +264,7 @@ int DisplayPlaneManager::getFreePlanes(int dsp, int type) return 0; } -void DisplayPlaneManager::reclaimPlane(int dsp, DisplayPlane& plane) +void DisplayPlaneManager::reclaimPlane(int /* dsp */, DisplayPlane& plane) { RETURN_VOID_IF_NOT_INIT(); diff --git a/common/utils/Dump.cpp b/common/utils/Dump.cpp index c60bfdb..d173521 100644 --- a/common/utils/Dump.cpp +++ b/common/utils/Dump.cpp @@ -28,7 +28,7 @@ #include <stdarg.h> #include <stdio.h> -#include <Dump.h> +#include <common/utils/Dump.h> namespace android { namespace intel { diff --git a/include/BufferManager.h b/include/BufferManager.h index e696e59..8845672 100644 --- a/include/BufferManager.h +++ b/include/BufferManager.h @@ -28,10 +28,10 @@ #ifndef BUFFERMANAGER_H_ #define BUFFERMANAGER_H_ -#include <Dump.h> +#include <common/utils/Dump.h> #include <DataBuffer.h> #include <BufferMapper.h> -#include <BufferCache.h> +#include <common/buffers/BufferCache.h> #include <utils/Mutex.h> namespace android { diff --git a/include/DisplayPlane.h b/include/DisplayPlane.h index cf6533c..4fc235f 100644 --- a/include/DisplayPlane.h +++ b/include/DisplayPlane.h @@ -30,7 +30,7 @@ #include <utils/KeyedVector.h> #include <BufferMapper.h> -#include <Drm.h> +#include <common/base/Drm.h> namespace android { namespace intel { diff --git a/include/DisplayPlaneManager.h b/include/DisplayPlaneManager.h index e9c9c50..6916a78 100644 --- a/include/DisplayPlaneManager.h +++ b/include/DisplayPlaneManager.h @@ -28,9 +28,9 @@ #ifndef DISPLAYPLANEMANAGER_H_ #define DISPLAYPLANEMANAGER_H_ -#include <Dump.h> +#include <common/utils/Dump.h> #include <DisplayPlane.h> -#include <HwcLayer.h> +#include <common/base/HwcLayer.h> #include <utils/Vector.h> namespace android { diff --git a/include/ExternalDevice.h b/include/ExternalDevice.h index 4b5125f..d533273 100644 --- a/include/ExternalDevice.h +++ b/include/ExternalDevice.h @@ -30,7 +30,7 @@ #include <PhysicalDevice.h> #include <IHdcpControl.h> -#include <SimpleThread.h> +#include <common/base/SimpleThread.h> namespace android { namespace intel { diff --git a/include/Hwcomposer.h b/include/Hwcomposer.h index 2d663bf..b904582 100644 --- a/include/Hwcomposer.h +++ b/include/Hwcomposer.h @@ -35,11 +35,11 @@ #include <IDisplayDevice.h> #include <BufferManager.h> #include <IDisplayContext.h> -#include <Drm.h> +#include <common/base/Drm.h> #include <DisplayPlaneManager.h> -#include <DisplayAnalyzer.h> -#include <VsyncManager.h> -#include <MultiDisplayObserver.h> +#include <common/base/DisplayAnalyzer.h> +#include <common/base/VsyncManager.h> +#include <common/observers/MultiDisplayObserver.h> #include <UeventObserver.h> #include <IPowerManager.h> diff --git a/include/IDisplayDevice.h b/include/IDisplayDevice.h index 002f256..fb74dff 100644 --- a/include/IDisplayDevice.h +++ b/include/IDisplayDevice.h @@ -28,7 +28,7 @@ #ifndef IDISPLAY_DEVICE_H #define IDISPLAY_DEVICE_H -#include <Dump.h> +#include <common/utils/Dump.h> #include <IDisplayContext.h> #include <DisplayPlane.h> diff --git a/include/PhysicalDevice.h b/include/PhysicalDevice.h index 80a26fa..685f823 100644 --- a/include/PhysicalDevice.h +++ b/include/PhysicalDevice.h @@ -32,9 +32,9 @@ #include <IVsyncControl.h> #include <IBlankControl.h> #include <IPrepareListener.h> -#include <VsyncEventObserver.h> -#include <HwcLayerList.h> -#include <Drm.h> +#include <common/observers/VsyncEventObserver.h> +#include <common/base/HwcLayerList.h> +#include <common/base/Drm.h> #include <IDisplayDevice.h> namespace android { diff --git a/include/PrimaryDevice.h b/include/PrimaryDevice.h index c54fd5e..193ad79 100644 --- a/include/PrimaryDevice.h +++ b/include/PrimaryDevice.h @@ -31,8 +31,8 @@ #include <DisplayPlane.h> #include <IVsyncControl.h> #include <IBlankControl.h> -#include <VsyncEventObserver.h> -#include <HwcLayerList.h> +#include <common/observers/VsyncEventObserver.h> +#include <common/base/HwcLayerList.h> #include <PhysicalDevice.h> namespace android { diff --git a/include/UeventObserver.h b/include/UeventObserver.h index 92e9310..19e64e5 100755 --- a/include/UeventObserver.h +++ b/include/UeventObserver.h @@ -29,7 +29,7 @@ #include <utils/KeyedVector.h> #include <utils/String8.h> -#include <SimpleThread.h> +#include <common/base/SimpleThread.h> namespace android { namespace intel { diff --git a/include/VirtualDevice.h b/include/VirtualDevice.h index cdbdcc4..4a50d95 100644 --- a/include/VirtualDevice.h +++ b/include/VirtualDevice.h @@ -29,7 +29,7 @@ #define VIRTUAL_DEVICE_H #include <IDisplayDevice.h> -#include <SimpleThread.h> +#include <common/base/SimpleThread.h> #include <IVideoPayloadManager.h> #include <utils/Condition.h> #include <utils/Mutex.h> diff --git a/ips/anniedale/AnnOverlayPlane.cpp b/ips/anniedale/AnnOverlayPlane.cpp index c5edc2a..fc67168 100644 --- a/ips/anniedale/AnnOverlayPlane.cpp +++ b/ips/anniedale/AnnOverlayPlane.cpp @@ -27,11 +27,11 @@ */ #include <math.h> -#include <HwcTrace.h> -#include <Drm.h> +#include <common/utils/HwcTrace.h> +#include <common/base/Drm.h> #include <Hwcomposer.h> -#include <anniedale/AnnOverlayPlane.h> -#include <tangier/TngGrallocBuffer.h> +#include <ips/anniedale/AnnOverlayPlane.h> +#include <ips/tangier/TngGrallocBuffer.h> // FIXME: remove it #include <OMX_IVCommon.h> @@ -56,8 +56,8 @@ AnnOverlayPlane::~AnnOverlayPlane() CTRACE(); } -void AnnOverlayPlane::setZOrderConfig(ZOrderConfig& zorderConfig, - void *nativeConfig) +void AnnOverlayPlane::setZOrderConfig(ZOrderConfig& /* zorderConfig */, + void *nativeConfig) { int slot = (int)nativeConfig; @@ -717,7 +717,7 @@ void AnnOverlayPlane::signalVideoRotation(BufferMapper& mapper) } } -bool AnnOverlayPlane::useOverlayRotation(BufferMapper& mapper) +bool AnnOverlayPlane::useOverlayRotation(BufferMapper& /* mapper */) { if (mTransform == 0) return true; diff --git a/ips/anniedale/AnnOverlayPlane.h b/ips/anniedale/AnnOverlayPlane.h index aab3271..e13c83d 100644 --- a/ips/anniedale/AnnOverlayPlane.h +++ b/ips/anniedale/AnnOverlayPlane.h @@ -32,9 +32,9 @@ #include <hal_public.h> #include <DisplayPlane.h> #include <BufferMapper.h> -#include <common/Wsbm.h> -#include <common/OverlayPlaneBase.h> -#include <common/RotationBufferProvider.h> +#include <ips/common/Wsbm.h> +#include <ips/common/OverlayPlaneBase.h> +#include <ips/common/RotationBufferProvider.h> namespace android { namespace intel { diff --git a/ips/anniedale/AnnPlaneManager.cpp b/ips/anniedale/AnnPlaneManager.cpp index 5ec07be..b6355e4 100755 --- a/ips/anniedale/AnnPlaneManager.cpp +++ b/ips/anniedale/AnnPlaneManager.cpp @@ -25,11 +25,11 @@ * Jackie Li <yaodong.li@intel.com> * */ -#include <HwcTrace.h> +#include <common/utils/HwcTrace.h> #include <utils/String8.h> -#include <anniedale/AnnPlaneManager.h> -#include <anniedale/AnnRGBPlane.h> -#include <anniedale/AnnOverlayPlane.h> +#include <ips/anniedale/AnnPlaneManager.h> +#include <ips/anniedale/AnnRGBPlane.h> +#include <ips/anniedale/AnnOverlayPlane.h> #include <PlaneCapabilities.h> namespace android { @@ -249,7 +249,7 @@ bool AnnPlaneManager::assignPlanes(int dsp, ZOrderConfig& config) return false; } -bool AnnPlaneManager::assignPlanes(int dsp, ZOrderConfig& config, const char *zorder) +bool AnnPlaneManager::assignPlanes(int /* dsp */, ZOrderConfig& config, const char *zorder) { int size = (int)config.size(); diff --git a/ips/anniedale/AnnRGBPlane.cpp b/ips/anniedale/AnnRGBPlane.cpp index f3170b2..32dc79c 100644 --- a/ips/anniedale/AnnRGBPlane.cpp +++ b/ips/anniedale/AnnRGBPlane.cpp @@ -25,12 +25,12 @@ * Jackie Li <yaodong.li@intel.com> * */ -#include <HwcTrace.h> +#include <common/utils/HwcTrace.h> #include <Hwcomposer.h> #include <BufferManager.h> -#include <anniedale/AnnRGBPlane.h> -#include <tangier/TngGrallocBuffer.h> -#include <common/PixelFormat.h> +#include <ips/anniedale/AnnRGBPlane.h> +#include <ips/tangier/TngGrallocBuffer.h> +#include <ips/common/PixelFormat.h> namespace android { namespace intel { @@ -63,7 +63,7 @@ void* AnnRGBPlane::getContext() const return (void *)&mContext; } -void AnnRGBPlane::setZOrderConfig(ZOrderConfig& config, void *nativeConfig) +void AnnRGBPlane::setZOrderConfig(ZOrderConfig& /* config */, void * /* nativeConfig */) { CTRACE(); } diff --git a/ips/anniedale/AnnRGBPlane.h b/ips/anniedale/AnnRGBPlane.h index 9a1536b..c475d25 100644 --- a/ips/anniedale/AnnRGBPlane.h +++ b/ips/anniedale/AnnRGBPlane.h @@ -31,7 +31,7 @@ #include <utils/KeyedVector.h> #include <hal_public.h> #include <Hwcomposer.h> -#include <BufferCache.h> +#include <common/buffers/BufferCache.h> #include <DisplayPlane.h> #include <linux/psb_drm.h> diff --git a/ips/anniedale/PlaneCapabilities.cpp b/ips/anniedale/PlaneCapabilities.cpp index d2d03dd..0b35c5e 100644 --- a/ips/anniedale/PlaneCapabilities.cpp +++ b/ips/anniedale/PlaneCapabilities.cpp @@ -25,13 +25,13 @@ * Jackie Li <yaodong.li@intel.com> */ -#include <HwcTrace.h> +#include <common/utils/HwcTrace.h> #include <DisplayPlane.h> #include <hal_public.h> #include <OMX_IVCommon.h> #include <PlaneCapabilities.h> -#include <common/OverlayHardware.h> -#include <HwcLayer.h> +#include <ips/common/OverlayHardware.h> +#include <common/base/HwcLayer.h> #define SPRITE_PLANE_MAX_STRIDE_TILED 16384 #define SPRITE_PLANE_MAX_STRIDE_LINEAR 16384 diff --git a/ips/common/BlankControl.cpp b/ips/common/BlankControl.cpp index 0050286..423d919 100644 --- a/ips/common/BlankControl.cpp +++ b/ips/common/BlankControl.cpp @@ -26,9 +26,9 @@ * */ -#include <HwcTrace.h> -#include <Drm.h> -#include <common/BlankControl.h> +#include <common/utils/HwcTrace.h> +#include <common/base/Drm.h> +#include <ips/common/BlankControl.h> #include <Hwcomposer.h> namespace android { diff --git a/ips/common/DrmConfig.cpp b/ips/common/DrmConfig.cpp index 9483f76..b044b01 100644 --- a/ips/common/DrmConfig.cpp +++ b/ips/common/DrmConfig.cpp @@ -25,9 +25,9 @@ * Jackie Li <yaodong.li@intel.com> * */ -#include <HwcTrace.h> +#include <common/utils/HwcTrace.h> #include <IDisplayDevice.h> -#include <Drm.h> +#include <common/base/Drm.h> #include <DrmConfig.h> diff --git a/ips/common/DrmControl.cpp b/ips/common/DrmControl.cpp index 7851a1f..c09118a 100644 --- a/ips/common/DrmControl.cpp +++ b/ips/common/DrmControl.cpp @@ -26,10 +26,10 @@ * */ -#include <HwcTrace.h> +#include <common/utils/HwcTrace.h> #include <linux/psb_drm.h> #include <Hwcomposer.h> -#include <common/DrmControl.h> +#include <ips/common/DrmControl.h> namespace android { namespace intel { diff --git a/ips/common/GrallocBufferBase.cpp b/ips/common/GrallocBufferBase.cpp index a5adc95..2ebe567 100644 --- a/ips/common/GrallocBufferBase.cpp +++ b/ips/common/GrallocBufferBase.cpp @@ -25,8 +25,8 @@ * Jackie Li <yaodong.li@intel.com> * */ -#include <HwcTrace.h> -#include <common/GrallocBufferBase.h> +#include <common/utils/HwcTrace.h> +#include <ips/common/GrallocBufferBase.h> #include <DisplayQuery.h> @@ -46,7 +46,7 @@ void GrallocBufferBase::resetBuffer(uint32_t handle) initBuffer(handle); } -void GrallocBufferBase::initBuffer(uint32_t handle) +void GrallocBufferBase::initBuffer(uint32_t /* handle */) { // nothing to initialize } diff --git a/ips/common/GrallocBufferMapperBase.cpp b/ips/common/GrallocBufferMapperBase.cpp index 6c3ec77..d4c6bc5 100644 --- a/ips/common/GrallocBufferMapperBase.cpp +++ b/ips/common/GrallocBufferMapperBase.cpp @@ -25,10 +25,10 @@ * Jackie Li <yaodong.li@intel.com> * */ -#include <HwcTrace.h> -#include <Drm.h> +#include <common/utils/HwcTrace.h> +#include <common/base/Drm.h> #include <Hwcomposer.h> -#include <common/GrallocBufferMapperBase.h> +#include <ips/common/GrallocBufferMapperBase.h> namespace android { namespace intel { diff --git a/ips/common/GrallocBufferMapperBase.h b/ips/common/GrallocBufferMapperBase.h index 9bcc1ea..fd534c5 100644 --- a/ips/common/GrallocBufferMapperBase.h +++ b/ips/common/GrallocBufferMapperBase.h @@ -29,8 +29,8 @@ #define GRALLOC_BUFFER_MAPPER_BASE_H #include <BufferMapper.h> -#include <common/GrallocSubBuffer.h> -#include <common/GrallocBufferBase.h> +#include <ips/common/GrallocSubBuffer.h> +#include <ips/common/GrallocBufferBase.h> namespace android { namespace intel { diff --git a/ips/common/HdcpControl.cpp b/ips/common/HdcpControl.cpp index 82b1b03..55af924 100644 --- a/ips/common/HdcpControl.cpp +++ b/ips/common/HdcpControl.cpp @@ -25,12 +25,12 @@ * Jackie Li <yaodong.li@intel.com> * */ -#include <HwcTrace.h> +#include <common/utils/HwcTrace.h> #include <DrmConfig.h> #include <Hwcomposer.h> #include <DisplayQuery.h> -#include <common/DrmControl.h> -#include <common/HdcpControl.h> +#include <ips/common/DrmControl.h> +#include <ips/common/HdcpControl.h> #include <cutils/properties.h> diff --git a/ips/common/HdcpControl.h b/ips/common/HdcpControl.h index 6dc4397..d052ce7 100644 --- a/ips/common/HdcpControl.h +++ b/ips/common/HdcpControl.h @@ -29,7 +29,7 @@ #define HDCP_CONTROL_H #include <IHdcpControl.h> -#include <SimpleThread.h> +#include <common/base/SimpleThread.h> namespace android { namespace intel { diff --git a/ips/common/OverlayPlaneBase.cpp b/ips/common/OverlayPlaneBase.cpp index 5e44118..c8b90c5 100644 --- a/ips/common/OverlayPlaneBase.cpp +++ b/ips/common/OverlayPlaneBase.cpp @@ -27,13 +27,13 @@ */ #include <math.h> -#include <HwcTrace.h> -#include <Drm.h> +#include <common/utils/HwcTrace.h> +#include <common/base/Drm.h> #include <Hwcomposer.h> #include <PhysicalDevice.h> -#include <common/OverlayPlaneBase.h> -#include <common/TTMBufferMapper.h> -#include <common/GrallocSubBuffer.h> +#include <ips/common/OverlayPlaneBase.h> +#include <ips/common/TTMBufferMapper.h> +#include <ips/common/GrallocSubBuffer.h> #include <DisplayQuery.h> @@ -192,7 +192,7 @@ bool OverlayPlaneBase::assignToDevice(int disp) } void OverlayPlaneBase::setZOrderConfig(ZOrderConfig& zorderConfig, - void *nativeConfig) + void * /*nativeConfig*/) { CTRACE(); @@ -604,7 +604,7 @@ bool OverlayPlaneBase::rotatedBufferReady(BufferMapper& mapper, BufferMapper* &r } -bool OverlayPlaneBase::useOverlayRotation(BufferMapper& mapper) +bool OverlayPlaneBase::useOverlayRotation(BufferMapper& /* mapper */) { // by default overlay plane does not support rotation. return false; diff --git a/ips/common/OverlayPlaneBase.h b/ips/common/OverlayPlaneBase.h index ae745d8..4f0d06b 100644 --- a/ips/common/OverlayPlaneBase.h +++ b/ips/common/OverlayPlaneBase.h @@ -32,9 +32,9 @@ #include <hal_public.h> #include <DisplayPlane.h> #include <BufferMapper.h> -#include <common/Wsbm.h> -#include <common/OverlayHardware.h> -#include <common/VideoPayloadBuffer.h> +#include <ips/common/Wsbm.h> +#include <ips/common/OverlayHardware.h> +#include <ips/common/VideoPayloadBuffer.h> namespace android { namespace intel { diff --git a/ips/common/PixelFormat.cpp b/ips/common/PixelFormat.cpp index 5c9898c..38c46cb 100644 --- a/ips/common/PixelFormat.cpp +++ b/ips/common/PixelFormat.cpp @@ -26,8 +26,8 @@ * */ #include <hal_public.h> -#include <HwcTrace.h> -#include <common/PixelFormat.h> +#include <common/utils/HwcTrace.h> +#include <ips/common/PixelFormat.h> namespace android { namespace intel { diff --git a/ips/common/PlaneCapabilities.cpp b/ips/common/PlaneCapabilities.cpp index 1291e07..e6197a7 100644 --- a/ips/common/PlaneCapabilities.cpp +++ b/ips/common/PlaneCapabilities.cpp @@ -25,13 +25,13 @@ * Jackie Li <yaodong.li@intel.com> */ -#include <HwcTrace.h> +#include <common/utils/HwcTrace.h> #include <DisplayPlane.h> #include <hal_public.h> #include <OMX_IVCommon.h> #include <PlaneCapabilities.h> #include "OverlayHardware.h" -#include <HwcLayer.h> +#include <common/base/HwcLayer.h> #define SPRITE_PLANE_MAX_STRIDE_TILED 16384 //FIXME: need confirmation about this stride diff --git a/ips/common/PowerManager.cpp b/ips/common/PowerManager.cpp index ad97ae4..a76e0c7 100644 --- a/ips/common/PowerManager.cpp +++ b/ips/common/PowerManager.cpp @@ -25,10 +25,10 @@ * Jackie Li <yaodong.li@intel.com> * */ -#include <HwcTrace.h> -#include <Drm.h> +#include <common/utils/HwcTrace.h> +#include <common/base/Drm.h> #include <Hwcomposer.h> -#include <common/PowerManager.h> +#include <ips/common/PowerManager.h> namespace android { namespace intel { diff --git a/ips/common/PrepareListener.cpp b/ips/common/PrepareListener.cpp index 1a527d5..726b348 100644 --- a/ips/common/PrepareListener.cpp +++ b/ips/common/PrepareListener.cpp @@ -26,10 +26,10 @@ * */ -#include <HwcTrace.h> -#include <Drm.h> +#include <common/utils/HwcTrace.h> +#include <common/base/Drm.h> #include <Hwcomposer.h> -#include <common/PrepareListener.h> +#include <ips/common/PrepareListener.h> namespace android { namespace intel { diff --git a/ips/common/RotationBufferProvider.cpp b/ips/common/RotationBufferProvider.cpp index 01c8b58..56bcd7a 100644 --- a/ips/common/RotationBufferProvider.cpp +++ b/ips/common/RotationBufferProvider.cpp @@ -26,8 +26,8 @@ * Jian Sun <jianx.sun@intel.com> */ -#include <HwcTrace.h> -#include <common/RotationBufferProvider.h> +#include <common/utils/HwcTrace.h> +#include <ips/common/RotationBufferProvider.h> namespace android { namespace intel { diff --git a/ips/common/RotationBufferProvider.h b/ips/common/RotationBufferProvider.h index 3500e1b..a23213c 100644 --- a/ips/common/RotationBufferProvider.h +++ b/ips/common/RotationBufferProvider.h @@ -33,10 +33,10 @@ #include <sys/time.h> #include <va/va_tpi.h> #include <va/va_vpp.h> -#include <common/Wsbm.h> +#include <ips/common/Wsbm.h> #include <utils/Timers.h> #include <va/va_android.h> -#include <common/VideoPayloadBuffer.h> +#include <ips/common/VideoPayloadBuffer.h> namespace android { namespace intel { diff --git a/ips/common/SpritePlaneBase.cpp b/ips/common/SpritePlaneBase.cpp index 5f25205..bdd8ae9 100644 --- a/ips/common/SpritePlaneBase.cpp +++ b/ips/common/SpritePlaneBase.cpp @@ -25,9 +25,9 @@ * Jackie Li <yaodong.li@intel.com> * */ -#include <HwcTrace.h> -#include <common/SpritePlaneBase.h> -#include <common/PixelFormat.h> +#include <common/utils/HwcTrace.h> +#include <ips/common/SpritePlaneBase.h> +#include <ips/common/PixelFormat.h> namespace android { namespace intel { diff --git a/ips/common/SpritePlaneBase.h b/ips/common/SpritePlaneBase.h index 6676775..2eb6006 100644 --- a/ips/common/SpritePlaneBase.h +++ b/ips/common/SpritePlaneBase.h @@ -30,7 +30,7 @@ #include <utils/KeyedVector.h> #include <hal_public.h> -#include <BufferCache.h> +#include <common/buffers/BufferCache.h> #include <DisplayPlane.h> namespace android { diff --git a/ips/common/TTMBufferMapper.cpp b/ips/common/TTMBufferMapper.cpp index fc82ebf..7fbc0f9 100644 --- a/ips/common/TTMBufferMapper.cpp +++ b/ips/common/TTMBufferMapper.cpp @@ -25,8 +25,8 @@ * Jackie Li <yaodong.li@intel.com> * */ -#include <HwcTrace.h> -#include <common/TTMBufferMapper.h> +#include <common/utils/HwcTrace.h> +#include <ips/common/TTMBufferMapper.h> namespace android { namespace intel { diff --git a/ips/common/TTMBufferMapper.h b/ips/common/TTMBufferMapper.h index 2c34254..f287958 100644 --- a/ips/common/TTMBufferMapper.h +++ b/ips/common/TTMBufferMapper.h @@ -30,7 +30,7 @@ #include <DataBuffer.h> #include <BufferMapper.h> -#include <common/Wsbm.h> +#include <ips/common/Wsbm.h> namespace android { namespace intel { @@ -43,19 +43,19 @@ public: bool map(); bool unmap(); - uint32_t getGttOffsetInPage(int subIndex) const { + uint32_t getGttOffsetInPage(int /* subIndex */) const { return mGttOffsetInPage; } - void* getCpuAddress(int subIndex) const { + void* getCpuAddress(int /* subIndex */) const { return mCpuAddress; } - uint32_t getSize(int subIndex) const { + uint32_t getSize(int /* subIndex */) const { return mSize; } - uint32_t getKHandle(int subIndex) { + uint32_t getKHandle(int /* subIndex */) { return 0; } - uint32_t getFbHandle(int subIndex) { + uint32_t getFbHandle(int /* subIndex */) { return 0; } void putFbHandle() { diff --git a/ips/common/VideoPayloadManager.cpp b/ips/common/VideoPayloadManager.cpp index d540e40..fe7f1ca 100644 --- a/ips/common/VideoPayloadManager.cpp +++ b/ips/common/VideoPayloadManager.cpp @@ -26,11 +26,11 @@ * */ -#include <HwcTrace.h> +#include <common/utils/HwcTrace.h> #include <BufferMapper.h> -#include <common/GrallocSubBuffer.h> -#include <common/VideoPayloadManager.h> -#include <common/VideoPayloadBuffer.h> +#include <ips/common/GrallocSubBuffer.h> +#include <ips/common/VideoPayloadManager.h> +#include <ips/common/VideoPayloadBuffer.h> namespace android { namespace intel { diff --git a/ips/common/VsyncControl.cpp b/ips/common/VsyncControl.cpp index 09eefe9..2366119 100644 --- a/ips/common/VsyncControl.cpp +++ b/ips/common/VsyncControl.cpp @@ -25,10 +25,10 @@ * Jackie Li <yaodong.li@intel.com> * */ -#include <HwcTrace.h> -#include <Drm.h> +#include <common/utils/HwcTrace.h> +#include <common/base/Drm.h> #include <Hwcomposer.h> -#include <common/VsyncControl.h> +#include <ips/common/VsyncControl.h> namespace android { namespace intel { diff --git a/ips/common/Wsbm.cpp b/ips/common/Wsbm.cpp index ff0fb52..bdc2f14 100644 --- a/ips/common/Wsbm.cpp +++ b/ips/common/Wsbm.cpp @@ -25,8 +25,8 @@ * Jackie Li <yaodong.li@intel.com> * */ -#include <HwcTrace.h> -#include <common/Wsbm.h> +#include <common/utils/HwcTrace.h> +#include <ips/common/Wsbm.h> Wsbm::Wsbm(int drmFD) : mInitialized(false) diff --git a/ips/common/Wsbm.h b/ips/common/Wsbm.h index d8b114b..2db1062 100644 --- a/ips/common/Wsbm.h +++ b/ips/common/Wsbm.h @@ -28,7 +28,7 @@ #ifndef WSBM_H__ #define WSBM_H__ -#include <common/WsbmWrapper.h> +#include <ips/common/WsbmWrapper.h> /** * Class: WSBM diff --git a/ips/common/WsbmWrapper.c b/ips/common/WsbmWrapper.c index 4e17511..6794bc5 100644 --- a/ips/common/WsbmWrapper.c +++ b/ips/common/WsbmWrapper.c @@ -33,7 +33,7 @@ #include <ttm/ttm_placement.h> #include <linux/psb_drm.h> #include <xf86drm.h> -#include <HwcTrace.h> +#include <common/utils/HwcTrace.h> struct _WsbmBufferPool * mainPool = NULL; diff --git a/ips/penwell/PnwGrallocBuffer.cpp b/ips/penwell/PnwGrallocBuffer.cpp index 37de96a..d863468 100644 --- a/ips/penwell/PnwGrallocBuffer.cpp +++ b/ips/penwell/PnwGrallocBuffer.cpp @@ -25,7 +25,7 @@ * Jackie Li <yaodong.li@intel.com> * */ -#include <HwcTrace.h> +#include <common/utils/HwcTrace.h> #include <penwell/PnwGrallocBuffer.h> namespace android { diff --git a/ips/penwell/PnwGrallocBuffer.h b/ips/penwell/PnwGrallocBuffer.h index fe021eb..b783b71 100644 --- a/ips/penwell/PnwGrallocBuffer.h +++ b/ips/penwell/PnwGrallocBuffer.h @@ -28,8 +28,8 @@ #ifndef PNW_GRALLOC_BUFFER_H #define PNW_GRALLOC_BUFFER_H -#include <common/GrallocSubBuffer.h> -#include <common/GrallocBufferBase.h> +#include <ips/common/GrallocSubBuffer.h> +#include <ips/common/GrallocBufferBase.h> namespace android { namespace intel { diff --git a/ips/penwell/PnwGrallocBufferMapper.cpp b/ips/penwell/PnwGrallocBufferMapper.cpp index a42fb17..b585662 100644 --- a/ips/penwell/PnwGrallocBufferMapper.cpp +++ b/ips/penwell/PnwGrallocBufferMapper.cpp @@ -25,8 +25,8 @@ * Jackie Li <yaodong.li@intel.com> * */ -#include <HwcTrace.h> -#include <Drm.h> +#include <common/utils/HwcTrace.h> +#include <common/base/Drm.h> #include <Hwcomposer.h> #include <penwell/PnwGrallocBufferMapper.h> diff --git a/ips/penwell/PnwGrallocBufferMapper.h b/ips/penwell/PnwGrallocBufferMapper.h index de94e81..c6d91b1 100644 --- a/ips/penwell/PnwGrallocBufferMapper.h +++ b/ips/penwell/PnwGrallocBufferMapper.h @@ -30,7 +30,7 @@ #include <BufferMapper.h> #include <hal_public.h> -#include <common/GrallocBufferMapperBase.h> +#include <ips/common/GrallocBufferMapperBase.h> namespace android { namespace intel { diff --git a/ips/penwell/PnwOverlayPlane.cpp b/ips/penwell/PnwOverlayPlane.cpp index a10f39f..96e9bbd 100644 --- a/ips/penwell/PnwOverlayPlane.cpp +++ b/ips/penwell/PnwOverlayPlane.cpp @@ -26,8 +26,8 @@ * */ #include <math.h> -#include <HwcTrace.h> -#include <Drm.h> +#include <common/utils/HwcTrace.h> +#include <common/base/Drm.h> #include <Hwcomposer.h> #include <penwell/PnwOverlayPlane.h> #include <penwell/PnwGrallocBuffer.h> diff --git a/ips/penwell/PnwOverlayPlane.h b/ips/penwell/PnwOverlayPlane.h index 6912300..97ca76b 100644 --- a/ips/penwell/PnwOverlayPlane.h +++ b/ips/penwell/PnwOverlayPlane.h @@ -32,8 +32,8 @@ #include <hal_public.h> #include <DisplayPlane.h> #include <BufferMapper.h> -#include <common/Wsbm.h> -#include <common/OverlayPlaneBase.h> +#include <ips/common/Wsbm.h> +#include <ips/common/OverlayPlaneBase.h> namespace android { namespace intel { diff --git a/ips/penwell/PnwPrimaryPlane.cpp b/ips/penwell/PnwPrimaryPlane.cpp index 6ab16e4..586820a 100644 --- a/ips/penwell/PnwPrimaryPlane.cpp +++ b/ips/penwell/PnwPrimaryPlane.cpp @@ -25,11 +25,11 @@ * Jackie Li <yaodong.li@intel.com> * */ -#include <HwcTrace.h> -#include <Drm.h> +#include <common/utils/HwcTrace.h> +#include <common/base/Drm.h> #include <penwell/PnwPrimaryPlane.h> #include <penwell/PnwGrallocBuffer.h> -#include <common/PixelFormat.h> +#include <ips/common/PixelFormat.h> namespace android { namespace intel { diff --git a/ips/penwell/PnwSpritePlane.cpp b/ips/penwell/PnwSpritePlane.cpp index 85cfe2d..4aef6db 100644 --- a/ips/penwell/PnwSpritePlane.cpp +++ b/ips/penwell/PnwSpritePlane.cpp @@ -25,11 +25,11 @@ * Jackie Li <yaodong.li@intel.com> * */ -#include <HwcTrace.h> +#include <common/utils/HwcTrace.h> #include <Hwcomposer.h> #include <BufferManager.h> #include <penwell/PnwSpritePlane.h> -#include <common/PixelFormat.h> +#include <ips/common/PixelFormat.h> namespace android { namespace intel { diff --git a/ips/penwell/PnwSpritePlane.h b/ips/penwell/PnwSpritePlane.h index 9d796ca..52a1a9d 100644 --- a/ips/penwell/PnwSpritePlane.h +++ b/ips/penwell/PnwSpritePlane.h @@ -30,10 +30,10 @@ #include <utils/KeyedVector.h> #include <hal_public.h> -#include <BufferCache.h> +#include <common/buffers/BufferCache.h> #include <DisplayPlane.h> -#include <common/SpritePlaneBase.h> +#include <ips/common/SpritePlaneBase.h> namespace android { namespace intel { diff --git a/ips/tangier/TngDisplayContext.cpp b/ips/tangier/TngDisplayContext.cpp index bc87caa..5aa7c16 100644 --- a/ips/tangier/TngDisplayContext.cpp +++ b/ips/tangier/TngDisplayContext.cpp @@ -25,12 +25,12 @@ * Jackie Li <yaodong.li@intel.com> * */ -#include <HwcTrace.h> +#include <common/utils/HwcTrace.h> #include <Hwcomposer.h> #include <DisplayPlane.h> #include <IDisplayDevice.h> -#include <HwcLayerList.h> -#include <tangier/TngDisplayContext.h> +#include <common/base/HwcLayerList.h> +#include <ips/tangier/TngDisplayContext.h> namespace android { @@ -73,7 +73,8 @@ bool TngDisplayContext::initialize() return true; } -bool TngDisplayContext::commitBegin(size_t numDisplays, hwc_display_contents_1_t **displays) +bool TngDisplayContext::commitBegin(size_t /* numDisplays */, + hwc_display_contents_1_t ** /* displays */) { RETURN_FALSE_IF_NOT_INIT(); mCount = 0; diff --git a/ips/tangier/TngDisplayQuery.cpp b/ips/tangier/TngDisplayQuery.cpp index 570bc41..a1d8d88 100644 --- a/ips/tangier/TngDisplayQuery.cpp +++ b/ips/tangier/TngDisplayQuery.cpp @@ -25,7 +25,7 @@ * Jackie Li <yaodong.li@intel.com> */ -#include <HwcTrace.h> +#include <common/utils/HwcTrace.h> #include <DisplayPlane.h> #include <hal_public.h> #include <OMX_IVCommon.h> diff --git a/ips/tangier/TngGrallocBuffer.cpp b/ips/tangier/TngGrallocBuffer.cpp index c818a9b..16b1633 100644 --- a/ips/tangier/TngGrallocBuffer.cpp +++ b/ips/tangier/TngGrallocBuffer.cpp @@ -25,8 +25,8 @@ * Jackie Li <yaodong.li@intel.com> * */ -#include <HwcTrace.h> -#include <tangier/TngGrallocBuffer.h> +#include <common/utils/HwcTrace.h> +#include <ips/tangier/TngGrallocBuffer.h> namespace android { namespace intel { diff --git a/ips/tangier/TngGrallocBuffer.h b/ips/tangier/TngGrallocBuffer.h index a294caa..9d3300b 100644 --- a/ips/tangier/TngGrallocBuffer.h +++ b/ips/tangier/TngGrallocBuffer.h @@ -30,8 +30,8 @@ #include <DataBuffer.h> #include <hal_public.h> -#include <common/GrallocSubBuffer.h> -#include <common/GrallocBufferBase.h> +#include <ips/common/GrallocSubBuffer.h> +#include <ips/common/GrallocBufferBase.h> namespace android { namespace intel { diff --git a/ips/tangier/TngGrallocBufferMapper.cpp b/ips/tangier/TngGrallocBufferMapper.cpp index 9a82b47..32f2645 100644 --- a/ips/tangier/TngGrallocBufferMapper.cpp +++ b/ips/tangier/TngGrallocBufferMapper.cpp @@ -25,11 +25,11 @@ * Jackie Li <yaodong.li@intel.com> * */ -#include <HwcTrace.h> -#include <Drm.h> +#include <common/utils/HwcTrace.h> +#include <common/base/Drm.h> #include <Hwcomposer.h> -#include <tangier/TngGrallocBufferMapper.h> -#include <common/WsbmWrapper.h> +#include <ips/tangier/TngGrallocBufferMapper.h> +#include <ips/common/WsbmWrapper.h> namespace android { namespace intel { diff --git a/ips/tangier/TngGrallocBufferMapper.h b/ips/tangier/TngGrallocBufferMapper.h index cc91c98..3aa16cf 100644 --- a/ips/tangier/TngGrallocBufferMapper.h +++ b/ips/tangier/TngGrallocBufferMapper.h @@ -30,8 +30,8 @@ #include <BufferMapper.h> #include <hal_public.h> -#include <common/GrallocBufferMapperBase.h> -#include <tangier/TngGrallocBuffer.h> +#include <ips/common/GrallocBufferMapperBase.h> +#include <ips/tangier/TngGrallocBuffer.h> namespace android { namespace intel { diff --git a/ips/tangier/TngOverlayPlane.cpp b/ips/tangier/TngOverlayPlane.cpp index 411f101..cd39ed3 100644 --- a/ips/tangier/TngOverlayPlane.cpp +++ b/ips/tangier/TngOverlayPlane.cpp @@ -26,11 +26,11 @@ * */ #include <math.h> -#include <HwcTrace.h> -#include <Drm.h> +#include <common/utils/HwcTrace.h> +#include <common/base/Drm.h> #include <Hwcomposer.h> #include <tangier/TngOverlayPlane.h> -#include <tangier/TngGrallocBuffer.h> +#include <ips/tangier/TngGrallocBuffer.h> namespace android { namespace intel { diff --git a/ips/tangier/TngOverlayPlane.h b/ips/tangier/TngOverlayPlane.h index d04d87d..4f40d1a 100644 --- a/ips/tangier/TngOverlayPlane.h +++ b/ips/tangier/TngOverlayPlane.h @@ -32,9 +32,9 @@ #include <hal_public.h> #include <DisplayPlane.h> #include <BufferMapper.h> -#include <common/Wsbm.h> -#include <common/OverlayPlaneBase.h> -#include <common/RotationBufferProvider.h> +#include <ips/common/Wsbm.h> +#include <ips/common/OverlayPlaneBase.h> +#include <ips/common/RotationBufferProvider.h> namespace android { namespace intel { diff --git a/ips/tangier/TngPlaneManager.cpp b/ips/tangier/TngPlaneManager.cpp index 820187d..2e804d3 100644 --- a/ips/tangier/TngPlaneManager.cpp +++ b/ips/tangier/TngPlaneManager.cpp @@ -25,7 +25,7 @@ * Jackie Li <yaodong.li@intel.com> * */ -#include <HwcTrace.h> +#include <common/utils/HwcTrace.h> #include <tangier/TngPlaneManager.h> #include <tangier/TngPrimaryPlane.h> #include <tangier/TngSpritePlane.h> diff --git a/ips/tangier/TngPrimaryPlane.cpp b/ips/tangier/TngPrimaryPlane.cpp index 0617180..14640f7 100644 --- a/ips/tangier/TngPrimaryPlane.cpp +++ b/ips/tangier/TngPrimaryPlane.cpp @@ -25,11 +25,11 @@ * Jackie Li <yaodong.li@intel.com> * */ -#include <HwcTrace.h> -#include <Drm.h> +#include <common/utils/HwcTrace.h> +#include <common/base/Drm.h> #include <tangier/TngPrimaryPlane.h> -#include <tangier/TngGrallocBuffer.h> -#include <common/PixelFormat.h> +#include <ips/tangier/TngGrallocBuffer.h> +#include <ips/common/PixelFormat.h> namespace android { namespace intel { diff --git a/ips/tangier/TngSpritePlane.cpp b/ips/tangier/TngSpritePlane.cpp index 1e01429..5b77b6c 100644 --- a/ips/tangier/TngSpritePlane.cpp +++ b/ips/tangier/TngSpritePlane.cpp @@ -25,11 +25,11 @@ * Jackie Li <yaodong.li@intel.com> * */ -#include <HwcTrace.h> +#include <common/utils/HwcTrace.h> #include <Hwcomposer.h> #include <BufferManager.h> #include <tangier/TngSpritePlane.h> -#include <common/PixelFormat.h> +#include <ips/common/PixelFormat.h> namespace android { namespace intel { diff --git a/ips/tangier/TngSpritePlane.h b/ips/tangier/TngSpritePlane.h index 02b9fd5..b80d19b 100644 --- a/ips/tangier/TngSpritePlane.h +++ b/ips/tangier/TngSpritePlane.h @@ -31,10 +31,10 @@ #include <utils/KeyedVector.h> #include <hal_public.h> #include <Hwcomposer.h> -#include <BufferCache.h> +#include <common/buffers/BufferCache.h> #include <DisplayPlane.h> -#include <common/SpritePlaneBase.h> +#include <ips/common/SpritePlaneBase.h> namespace android { namespace intel { diff --git a/merrifield.mk b/merrifield.mk new file mode 100644 index 0000000..57171d2 --- /dev/null +++ b/merrifield.mk @@ -0,0 +1,116 @@ +# Copyright (C) 2008 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +LOCAL_PATH := $(call my-dir) + +# HAL module implemenation, not prelinked and stored in +# hw/<OVERLAY_HARDWARE_MODULE_ID>.<ro.product.board>.so +include $(CLEAR_VARS) + +LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE := hwcomposer.$(TARGET_BOARD_PLATFORM) +LOCAL_CFLAGS:= -DLINUX + +LOCAL_SHARED_LIBRARIES := liblog libcutils libdrm \ + libwsbm libutils libhardware \ + libva libva-tpi libva-android \ + libhwcwidi libbinder libsync + +LOCAL_SRC_FILES := \ + common/base/Drm.cpp \ + common/base/HwcLayer.cpp \ + common/base/HwcLayerList.cpp \ + common/base/Hwcomposer.cpp \ + common/base/HwcModule.cpp \ + common/base/DisplayAnalyzer.cpp \ + common/base/VsyncManager.cpp \ + common/buffers/BufferCache.cpp \ + common/buffers/GraphicBuffer.cpp \ + common/buffers/BufferManager.cpp \ + common/devices/PhysicalDevice.cpp \ + common/devices/PrimaryDevice.cpp \ + common/devices/ExternalDevice.cpp \ + common/devices/VirtualDevice.cpp \ + common/observers/UeventObserver.cpp \ + common/observers/VsyncEventObserver.cpp \ + common/observers/SoftVsyncObserver.cpp \ + common/observers/MultiDisplayObserver.cpp \ + common/planes/DisplayPlane.cpp \ + common/planes/DisplayPlaneManager.cpp \ + common/utils/Dump.cpp + +LOCAL_SRC_FILES += \ + ips/common/BlankControl.cpp \ + ips/common/PowerManager.cpp \ + ips/common/HdcpControl.cpp \ + ips/common/DrmControl.cpp \ + ips/common/VsyncControl.cpp \ + ips/common/PrepareListener.cpp \ + ips/common/OverlayPlaneBase.cpp \ + ips/common/SpritePlaneBase.cpp \ + ips/common/PixelFormat.cpp \ + ips/common/PlaneCapabilities.cpp \ + ips/common/GrallocBufferBase.cpp \ + ips/common/GrallocBufferMapperBase.cpp \ + ips/common/TTMBufferMapper.cpp \ + ips/common/DrmConfig.cpp \ + ips/common/VideoPayloadManager.cpp \ + ips/common/Wsbm.cpp \ + ips/common/WsbmWrapper.c \ + ips/common/RotationBufferProvider.cpp + +LOCAL_SRC_FILES += \ + ips/tangier/TngGrallocBuffer.cpp \ + ips/tangier/TngGrallocBufferMapper.cpp \ + ips/tangier/TngOverlayPlane.cpp \ + ips/tangier/TngPrimaryPlane.cpp \ + ips/tangier/TngSpritePlane.cpp \ + ips/tangier/TngDisplayQuery.cpp \ + ips/tangier/TngPlaneManager.cpp \ + ips/tangier/TngDisplayContext.cpp + +LOCAL_SRC_FILES += \ + platforms/merrifield/PlatfBufferManager.cpp \ + platforms/merrifield/PlatfPrimaryDevice.cpp \ + platforms/merrifield/PlatfExternalDevice.cpp \ + platforms/merrifield/PlatfVirtualDevice.cpp \ + platforms/merrifield/PlatfHwcomposer.cpp + +LOCAL_C_INCLUDES := $(addprefix $(LOCAL_PATH)/../, $(SGX_INCLUDES)) \ + $(call include-path-for, frameworks-native)/media/openmax \ + $(call include-path-for, opengl) \ + $(call include-path-for, libhardware_legacy)/hardware_legacy \ + vendor/intel/hardware/PRIVATE/rgx/rogue/android/graphicshal \ + vendor/intel/hardware/PRIVATE/rgx/rogue/include/ \ + prebuilts/intel/vendor/intel/hardware/prebuilts/$(REF_DEVICE_NAME)/rgx \ + prebuilts/intel/vendor/intel/hardware/prebuilts/$(REF_DEVICE_NAME)/rgx/include \ + vendor/intel/hardware/PRIVATE/widi/libhwcwidi/ \ + $(TARGET_OUT_HEADERS)/drm \ + $(TARGET_OUT_HEADERS)/libdrm \ + $(TARGET_OUT_HEADERS)/libdrm/shared-core \ + $(TARGET_OUT_HEADERS)/libwsbm/wsbm \ + $(TARGET_OUT_HEADERS)/libttm \ + $(TARGET_OUT_HEADERS)/libva + +LOCAL_C_INCLUDES += \ + $(LOCAL_PATH)/include \ + +ifeq ($(TARGET_HAS_MULTIPLE_DISPLAY),true) + LOCAL_SHARED_LIBRARIES += libmultidisplay libbinder + LOCAL_CFLAGS += -DTARGET_HAS_MULTIPLE_DISPLAY +endif + +include $(BUILD_SHARED_LIBRARY) + diff --git a/merrifield_plus.mk b/merrifield_plus.mk new file mode 100644 index 0000000..84be9cb --- /dev/null +++ b/merrifield_plus.mk @@ -0,0 +1,108 @@ +# Copyright (C) 2008 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +LOCAL_PATH := $(call my-dir) + +# HAL module implemenation, not prelinked and stored in +# hw/<OVERLAY_HARDWARE_MODULE_ID>.<ro.product.board>.so +include $(CLEAR_VARS) + +LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE := hwcomposer.$(TARGET_BOARD_PLATFORM) +LOCAL_CFLAGS := -Werror + +LOCAL_SHARED_LIBRARIES := liblog libcutils libdrm \ + libwsbm libutils libhardware \ + libva libva-tpi libva-android libsync + +LOCAL_SRC_FILES := \ + common/base/Drm.cpp \ + common/base/HwcLayer.cpp \ + common/base/HwcLayerList.cpp \ + common/base/Hwcomposer.cpp \ + common/base/HwcModule.cpp \ + common/base/DisplayAnalyzer.cpp \ + common/base/VsyncManager.cpp \ + common/buffers/BufferCache.cpp \ + common/buffers/GraphicBuffer.cpp \ + common/buffers/BufferManager.cpp \ + common/devices/PhysicalDevice.cpp \ + common/devices/PrimaryDevice.cpp \ + common/devices/ExternalDevice.cpp \ + common/observers/UeventObserver.cpp \ + common/observers/VsyncEventObserver.cpp \ + common/observers/SoftVsyncObserver.cpp \ + common/observers/MultiDisplayObserver.cpp \ + common/planes/DisplayPlane.cpp \ + common/planes/DisplayPlaneManager.cpp \ + common/utils/Dump.cpp + +LOCAL_SRC_FILES += \ + ips/common/BlankControl.cpp \ + ips/common/PowerManager.cpp \ + ips/common/HdcpControl.cpp \ + ips/common/DrmControl.cpp \ + ips/common/VsyncControl.cpp \ + ips/common/PrepareListener.cpp \ + ips/common/OverlayPlaneBase.cpp \ + ips/common/SpritePlaneBase.cpp \ + ips/common/PixelFormat.cpp \ + ips/common/GrallocBufferBase.cpp \ + ips/common/GrallocBufferMapperBase.cpp \ + ips/common/TTMBufferMapper.cpp \ + ips/common/DrmConfig.cpp \ + ips/common/VideoPayloadManager.cpp \ + ips/common/Wsbm.cpp \ + ips/common/WsbmWrapper.c \ + ips/common/RotationBufferProvider.cpp + +LOCAL_SRC_FILES += \ + ips/tangier/TngGrallocBuffer.cpp \ + ips/tangier/TngGrallocBufferMapper.cpp \ + ips/tangier/TngDisplayQuery.cpp \ + ips/tangier/TngDisplayContext.cpp + +LOCAL_SRC_FILES += \ + ips/anniedale/AnnPlaneManager.cpp \ + ips/anniedale/AnnOverlayPlane.cpp \ + ips/anniedale/AnnRGBPlane.cpp \ + ips/anniedale/PlaneCapabilities.cpp + +LOCAL_SRC_FILES += \ + platforms/merrifield_plus/PlatfBufferManager.cpp \ + platforms/merrifield_plus/PlatfPrimaryDevice.cpp \ + platforms/merrifield_plus/PlatfExternalDevice.cpp \ + platforms/merrifield_plus/PlatfHwcomposer.cpp + +LOCAL_C_INCLUDES := \ + $(LOCAL_PATH)/include \ + $(TARGET_OUT_HEADERS)/libdrm + +ifeq ($(INTEL_WIDI_MERRIFIELD), true) +LOCAL_SRC_FILES += \ + common/devices/VirtualDevice.cpp \ + platforms/merrifield_plus/PlatfVirtualDevice.cpp + + #LOCAL_SHARED_LIBRARIES += libhwcwidi libbinder + LOCAL_CFLAGS += -DINTEL_WIDI_MERRIFIELD +endif + +ifeq ($(TARGET_HAS_MULTIPLE_DISPLAY),true) + LOCAL_SHARED_LIBRARIES += libmultidisplay libbinder + LOCAL_CFLAGS += -DTARGET_HAS_MULTIPLE_DISPLAY +endif + +include $(BUILD_SHARED_LIBRARY) + diff --git a/platforms/merrifield/Android.mk b/platforms/merrifield/Android.mk deleted file mode 100644 index b238052..0000000 --- a/platforms/merrifield/Android.mk +++ /dev/null @@ -1,127 +0,0 @@ -# Copyright (C) 2008 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -LOCAL_PATH := $(call my-dir) - -# HAL module implemenation, not prelinked and stored in -# hw/<OVERLAY_HARDWARE_MODULE_ID>.<ro.product.board>.so -include $(CLEAR_VARS) - -LOCAL_PRELINK_MODULE := false -LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw -LOCAL_SHARED_LIBRARIES := liblog libcutils libdrm \ - libwsbm libutils libhardware \ - libva libva-tpi libva-android \ - libhwcwidi libbinder libsync -LOCAL_SRC_FILES := \ - ../../common/base/Drm.cpp \ - ../../common/base/HwcLayer.cpp \ - ../../common/base/HwcLayerList.cpp \ - ../../common/base/Hwcomposer.cpp \ - ../../common/base/HwcModule.cpp \ - ../../common/base/DisplayAnalyzer.cpp \ - ../../common/base/VsyncManager.cpp \ - ../../common/buffers/BufferCache.cpp \ - ../../common/buffers/GraphicBuffer.cpp \ - ../../common/buffers/BufferManager.cpp \ - ../../common/devices/PhysicalDevice.cpp \ - ../../common/devices/PrimaryDevice.cpp \ - ../../common/devices/ExternalDevice.cpp \ - ../../common/devices/VirtualDevice.cpp \ - ../../common/observers/UeventObserver.cpp \ - ../../common/observers/VsyncEventObserver.cpp \ - ../../common/observers/SoftVsyncObserver.cpp \ - ../../common/observers/MultiDisplayObserver.cpp \ - ../../common/planes/DisplayPlane.cpp \ - ../../common/planes/DisplayPlaneManager.cpp \ - ../../common/utils/Dump.cpp - - -LOCAL_SRC_FILES += \ - ../../ips/common/BlankControl.cpp \ - ../../ips/common/PowerManager.cpp \ - ../../ips/common/HdcpControl.cpp \ - ../../ips/common/DrmControl.cpp \ - ../../ips/common/VsyncControl.cpp \ - ../../ips/common/PrepareListener.cpp \ - ../../ips/common/OverlayPlaneBase.cpp \ - ../../ips/common/SpritePlaneBase.cpp \ - ../../ips/common/PixelFormat.cpp \ - ../../ips/common/PlaneCapabilities.cpp \ - ../../ips/common/GrallocBufferBase.cpp \ - ../../ips/common/GrallocBufferMapperBase.cpp \ - ../../ips/common/TTMBufferMapper.cpp \ - ../../ips/common/DrmConfig.cpp \ - ../../ips/common/VideoPayloadManager.cpp \ - ../../ips/common/Wsbm.cpp \ - ../../ips/common/WsbmWrapper.c \ - ../../ips/common/RotationBufferProvider.cpp - -LOCAL_SRC_FILES += \ - ../../ips/tangier/TngGrallocBuffer.cpp \ - ../../ips/tangier/TngGrallocBufferMapper.cpp \ - ../../ips/tangier/TngOverlayPlane.cpp \ - ../../ips/tangier/TngPrimaryPlane.cpp \ - ../../ips/tangier/TngSpritePlane.cpp \ - ../../ips/tangier/TngDisplayQuery.cpp \ - ../../ips/tangier/TngPlaneManager.cpp \ - ../../ips/tangier/TngDisplayContext.cpp - - -LOCAL_SRC_FILES += \ - PlatfBufferManager.cpp \ - PlatfPrimaryDevice.cpp \ - PlatfExternalDevice.cpp \ - PlatfVirtualDevice.cpp \ - PlatfHwcomposer.cpp - - -LOCAL_C_INCLUDES := $(addprefix $(LOCAL_PATH)/../../../, $(SGX_INCLUDES)) \ - $(call include-path-for, frameworks-native)/media/openmax \ - $(call include-path-for, opengl) \ - $(call include-path-for, libhardware_legacy)/hardware_legacy \ - vendor/intel/hardware/PRIVATE/rgx/rogue/android/graphicshal \ - vendor/intel/hardware/PRIVATE/rgx/rogue/include/ \ - prebuilts/intel/vendor/intel/hardware/prebuilts/$(REF_DEVICE_NAME)/rgx \ - prebuilts/intel/vendor/intel/hardware/prebuilts/$(REF_DEVICE_NAME)/rgx/include \ - vendor/intel/hardware/PRIVATE/widi/libhwcwidi/ \ - $(TARGET_OUT_HEADERS)/drm \ - $(TARGET_OUT_HEADERS)/libdrm \ - $(TARGET_OUT_HEADERS)/libdrm/shared-core \ - $(TARGET_OUT_HEADERS)/libwsbm/wsbm \ - $(TARGET_OUT_HEADERS)/libttm \ - $(TARGET_OUT_HEADERS)/libva - -LOCAL_C_INCLUDES += $(LOCAL_PATH) \ - $(LOCAL_PATH)/../../include \ - $(LOCAL_PATH)/../../common/base \ - $(LOCAL_PATH)/../../common/buffers \ - $(LOCAL_PATH)/../../common/devices \ - $(LOCAL_PATH)/../../common/observers \ - $(LOCAL_PATH)/../../common/planes \ - $(LOCAL_PATH)/../../common/utils \ - $(LOCAL_PATH)/../../ips/ \ - $(LOCAL_PATH)/ - - -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE := hwcomposer.$(TARGET_BOARD_PLATFORM) -LOCAL_CFLAGS:= -DLINUX - -ifeq ($(TARGET_HAS_MULTIPLE_DISPLAY),true) - LOCAL_SHARED_LIBRARIES += libmultidisplay libbinder - LOCAL_CFLAGS += -DTARGET_HAS_MULTIPLE_DISPLAY -endif -include $(BUILD_SHARED_LIBRARY) - diff --git a/platforms/merrifield/PlatfBufferManager.cpp b/platforms/merrifield/PlatfBufferManager.cpp index 25fac74..0dea41c 100644 --- a/platforms/merrifield/PlatfBufferManager.cpp +++ b/platforms/merrifield/PlatfBufferManager.cpp @@ -25,9 +25,9 @@ * Jackie Li <yaodong.li@intel.com> * */ -#include <HwcTrace.h> -#include <PlatfBufferManager.h> -#include <tangier/TngGrallocBuffer.h> +#include <common/utils/HwcTrace.h> +#include <platforms/merrifield/PlatfBufferManager.h> +#include <ips/tangier/TngGrallocBuffer.h> #include <tangier/TngGrallocBufferMapper.h> namespace android { diff --git a/platforms/merrifield/PlatfExternalDevice.cpp b/platforms/merrifield/PlatfExternalDevice.cpp index d582b5f..bdf734d 100644 --- a/platforms/merrifield/PlatfExternalDevice.cpp +++ b/platforms/merrifield/PlatfExternalDevice.cpp @@ -25,12 +25,12 @@ * Jackie Li <yaodong.li@intel.com> * */ -#include <HwcTrace.h> -#include <PlatfExternalDevice.h> -#include <common/VsyncControl.h> -#include <common/BlankControl.h> -#include <common/HdcpControl.h> -#include <common/PrepareListener.h> +#include <common/utils/HwcTrace.h> +#include <platforms/merrifield/PlatfExternalDevice.h> +#include <ips/common/VsyncControl.h> +#include <ips/common/BlankControl.h> +#include <ips/common/HdcpControl.h> +#include <ips/common/PrepareListener.h> namespace android { diff --git a/platforms/merrifield/PlatfHwcomposer.cpp b/platforms/merrifield/PlatfHwcomposer.cpp index d62b039..4c5b779 100644 --- a/platforms/merrifield/PlatfHwcomposer.cpp +++ b/platforms/merrifield/PlatfHwcomposer.cpp @@ -26,16 +26,16 @@ * */ #include <hal_public.h> -#include <HwcTrace.h> -#include <common/PowerManager.h> +#include <common/utils/HwcTrace.h> +#include <ips/common/PowerManager.h> #include <tangier/TngDisplayContext.h> #include <tangier/TngPlaneManager.h> -#include <PlatfBufferManager.h> +#include <platforms/merrifield/PlatfBufferManager.h> #include <IDisplayDevice.h> -#include <PlatfPrimaryDevice.h> -#include <PlatfExternalDevice.h> -#include <PlatfVirtualDevice.h> -#include <PlatfHwcomposer.h> +#include <platforms/merrifield/PlatfPrimaryDevice.h> +#include <platforms/merrifield/PlatfExternalDevice.h> +#include <platforms/merrifield/PlatfVirtualDevice.h> +#include <platforms/merrifield/PlatfHwcomposer.h> diff --git a/platforms/merrifield/PlatfPrimaryDevice.cpp b/platforms/merrifield/PlatfPrimaryDevice.cpp index cb82bc6..bbb6bbf 100644 --- a/platforms/merrifield/PlatfPrimaryDevice.cpp +++ b/platforms/merrifield/PlatfPrimaryDevice.cpp @@ -25,11 +25,11 @@ * Jackie Li <yaodong.li@intel.com> * */ -#include <HwcTrace.h> -#include <PlatfPrimaryDevice.h> -#include <common/VsyncControl.h> -#include <common/BlankControl.h> -#include <common/PrepareListener.h> +#include <common/utils/HwcTrace.h> +#include <platforms/merrifield/PlatfPrimaryDevice.h> +#include <ips/common/VsyncControl.h> +#include <ips/common/BlankControl.h> +#include <ips/common/PrepareListener.h> namespace android { diff --git a/platforms/merrifield/PlatfVirtualDevice.cpp b/platforms/merrifield/PlatfVirtualDevice.cpp index a6ac4cb..5217beb 100644 --- a/platforms/merrifield/PlatfVirtualDevice.cpp +++ b/platforms/merrifield/PlatfVirtualDevice.cpp @@ -25,11 +25,11 @@ * Jackie Li <yaodong.li@intel.com> * */ -#include <HwcTrace.h> +#include <common/utils/HwcTrace.h> #include <Hwcomposer.h> #include <DisplayPlaneManager.h> -#include <PlatfVirtualDevice.h> -#include <common/VideoPayloadManager.h> +#include <platforms/merrifield/PlatfVirtualDevice.h> +#include <ips/common/VideoPayloadManager.h> namespace android { namespace intel { diff --git a/platforms/merrifield_plus/Android.mk b/platforms/merrifield_plus/Android.mk deleted file mode 100644 index 9997368..0000000 --- a/platforms/merrifield_plus/Android.mk +++ /dev/null @@ -1,136 +0,0 @@ -# Copyright (C) 2008 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -LOCAL_PATH := $(call my-dir) - -# HAL module implemenation, not prelinked and stored in -# hw/<OVERLAY_HARDWARE_MODULE_ID>.<ro.product.board>.so -include $(CLEAR_VARS) - -LOCAL_PRELINK_MODULE := false -LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw -LOCAL_SHARED_LIBRARIES := liblog libcutils libdrm \ - libwsbm libutils libhardware \ - libva libva-tpi libva-android libsync -LOCAL_SRC_FILES := \ - ../../common/base/Drm.cpp \ - ../../common/base/HwcLayer.cpp \ - ../../common/base/HwcLayerList.cpp \ - ../../common/base/Hwcomposer.cpp \ - ../../common/base/HwcModule.cpp \ - ../../common/base/DisplayAnalyzer.cpp \ - ../../common/base/VsyncManager.cpp \ - ../../common/buffers/BufferCache.cpp \ - ../../common/buffers/GraphicBuffer.cpp \ - ../../common/buffers/BufferManager.cpp \ - ../../common/devices/PhysicalDevice.cpp \ - ../../common/devices/PrimaryDevice.cpp \ - ../../common/devices/ExternalDevice.cpp \ - ../../common/observers/UeventObserver.cpp \ - ../../common/observers/VsyncEventObserver.cpp \ - ../../common/observers/SoftVsyncObserver.cpp \ - ../../common/observers/MultiDisplayObserver.cpp \ - ../../common/planes/DisplayPlane.cpp \ - ../../common/planes/DisplayPlaneManager.cpp \ - ../../common/utils/Dump.cpp - - -LOCAL_SRC_FILES += \ - ../../ips/common/BlankControl.cpp \ - ../../ips/common/PowerManager.cpp \ - ../../ips/common/HdcpControl.cpp \ - ../../ips/common/DrmControl.cpp \ - ../../ips/common/VsyncControl.cpp \ - ../../ips/common/PrepareListener.cpp \ - ../../ips/common/OverlayPlaneBase.cpp \ - ../../ips/common/SpritePlaneBase.cpp \ - ../../ips/common/PixelFormat.cpp \ - ../../ips/common/GrallocBufferBase.cpp \ - ../../ips/common/GrallocBufferMapperBase.cpp \ - ../../ips/common/TTMBufferMapper.cpp \ - ../../ips/common/DrmConfig.cpp \ - ../../ips/common/VideoPayloadManager.cpp \ - ../../ips/common/Wsbm.cpp \ - ../../ips/common/WsbmWrapper.c \ - ../../ips/common/RotationBufferProvider.cpp - -LOCAL_SRC_FILES += \ - ../../ips/tangier/TngGrallocBuffer.cpp \ - ../../ips/tangier/TngGrallocBufferMapper.cpp \ - ../../ips/tangier/TngDisplayQuery.cpp \ - ../../ips/tangier/TngDisplayContext.cpp - - -LOCAL_SRC_FILES += \ - ../../ips/anniedale/AnnPlaneManager.cpp \ - ../../ips/anniedale/AnnOverlayPlane.cpp \ - ../../ips/anniedale/AnnRGBPlane.cpp \ - ../../ips/anniedale/PlaneCapabilities.cpp - - -LOCAL_SRC_FILES += \ - PlatfBufferManager.cpp \ - PlatfPrimaryDevice.cpp \ - PlatfExternalDevice.cpp \ - PlatfHwcomposer.cpp - - -LOCAL_C_INCLUDES := $(addprefix $(LOCAL_PATH)/../../../, $(SGX_INCLUDES)) \ - frameworks/native/include/media/openmax \ - frameworks/native/opengl/include \ - hardware/libhardware_legacy/include/hardware_legacy \ - vendor/intel/hardware/PRIVATE/rgx/rogue/android/graphicshal \ - vendor/intel/hardware/PRIVATE/rgx/rogue/include/ \ - prebuilts/intel/vendor/intel/hardware/prebuilts/$(REF_DEVICE_NAME)/rgx \ - prebuilts/intel/vendor/intel/hardware/prebuilts/$(REF_DEVICE_NAME)/rgx/include \ - vendor/intel/hardware/PRIVATE/widi/libhwcwidi/ \ - $(TARGET_OUT_HEADERS)/drm \ - $(TARGET_OUT_HEADERS)/libdrm \ - $(TARGET_OUT_HEADERS)/libdrm/shared-core \ - $(TARGET_OUT_HEADERS)/libwsbm/wsbm \ - $(TARGET_OUT_HEADERS)/libttm \ - $(TARGET_OUT_HEADERS)/libva - -LOCAL_C_INCLUDES += $(LOCAL_PATH) \ - $(LOCAL_PATH)/../../include \ - $(LOCAL_PATH)/../../common/base \ - $(LOCAL_PATH)/../../common/buffers \ - $(LOCAL_PATH)/../../common/devices \ - $(LOCAL_PATH)/../../common/observers \ - $(LOCAL_PATH)/../../common/planes \ - $(LOCAL_PATH)/../../common/utils \ - $(LOCAL_PATH)/../../ips/ \ - $(LOCAL_PATH)/ - - -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE := hwcomposer.$(TARGET_BOARD_PLATFORM) -LOCAL_CFLAGS:= -DLINUX - -#$(error local path is: $(LOCAL_C_INCLUDES)) -ifeq ($(INTEL_WIDI_MERRIFIELD), true) -LOCAL_SRC_FILES += \ - ../../common/devices/VirtualDevice.cpp \ - PlatfVirtualDevice.cpp - - LOCAL_SHARED_LIBRARIES += libhwcwidi libbinder - LOCAL_CFLAGS += -DINTEL_WIDI_MERRIFIELD -endif - -ifeq ($(TARGET_HAS_MULTIPLE_DISPLAY),true) - LOCAL_SHARED_LIBRARIES += libmultidisplay libbinder - LOCAL_CFLAGS += -DTARGET_HAS_MULTIPLE_DISPLAY -endif -include $(BUILD_SHARED_LIBRARY) - diff --git a/platforms/merrifield_plus/PlatfBufferManager.cpp b/platforms/merrifield_plus/PlatfBufferManager.cpp index 25fac74..7021334 100644 --- a/platforms/merrifield_plus/PlatfBufferManager.cpp +++ b/platforms/merrifield_plus/PlatfBufferManager.cpp @@ -25,10 +25,10 @@ * Jackie Li <yaodong.li@intel.com> * */ -#include <HwcTrace.h> -#include <PlatfBufferManager.h> -#include <tangier/TngGrallocBuffer.h> -#include <tangier/TngGrallocBufferMapper.h> +#include <common/utils/HwcTrace.h> +#include <platforms/merrifield_plus/PlatfBufferManager.h> +#include <ips/tangier/TngGrallocBuffer.h> +#include <ips/tangier/TngGrallocBufferMapper.h> namespace android { namespace intel { @@ -54,8 +54,8 @@ void PlatfBufferManager::deinitialize() BufferManager::deinitialize(); } -DataBuffer* PlatfBufferManager::createDataBuffer(gralloc_module_t *module, - uint32_t handle) +DataBuffer* PlatfBufferManager::createDataBuffer(gralloc_module_t * /* module */, + uint32_t handle) { return new TngGrallocBuffer(handle); } diff --git a/platforms/merrifield_plus/PlatfExternalDevice.cpp b/platforms/merrifield_plus/PlatfExternalDevice.cpp index d582b5f..ab089be 100644 --- a/platforms/merrifield_plus/PlatfExternalDevice.cpp +++ b/platforms/merrifield_plus/PlatfExternalDevice.cpp @@ -25,12 +25,12 @@ * Jackie Li <yaodong.li@intel.com> * */ -#include <HwcTrace.h> -#include <PlatfExternalDevice.h> -#include <common/VsyncControl.h> -#include <common/BlankControl.h> -#include <common/HdcpControl.h> -#include <common/PrepareListener.h> +#include <common/utils/HwcTrace.h> +#include <platforms/merrifield_plus/PlatfExternalDevice.h> +#include <ips/common/VsyncControl.h> +#include <ips/common/BlankControl.h> +#include <ips/common/HdcpControl.h> +#include <ips/common/PrepareListener.h> namespace android { diff --git a/platforms/merrifield_plus/PlatfHwcomposer.cpp b/platforms/merrifield_plus/PlatfHwcomposer.cpp index 2361bbd..d902aed 100644 --- a/platforms/merrifield_plus/PlatfHwcomposer.cpp +++ b/platforms/merrifield_plus/PlatfHwcomposer.cpp @@ -26,16 +26,18 @@ * */ #include <hal_public.h> -#include <HwcTrace.h> -#include <tangier/TngDisplayContext.h> -#include <common/PowerManager.h> -#include <anniedale/AnnPlaneManager.h> -#include <PlatfBufferManager.h> +#include <common/utils/HwcTrace.h> +#include <ips/tangier/TngDisplayContext.h> +#include <ips/common/PowerManager.h> +#include <ips/anniedale/AnnPlaneManager.h> +#include <platforms/merrifield_plus/PlatfBufferManager.h> #include <IDisplayDevice.h> -#include <PlatfPrimaryDevice.h> -#include <PlatfExternalDevice.h> -#include <PlatfVirtualDevice.h> -#include <PlatfHwcomposer.h> +#include <platforms/merrifield_plus/PlatfPrimaryDevice.h> +#include <platforms/merrifield_plus/PlatfExternalDevice.h> +#ifdef INTEL_WIDI_MERRIFIELD +#include <platforms/merrifield_plus/PlatfVirtualDevice.h> +#endif +#include <platforms/merrifield_plus/PlatfHwcomposer.h> diff --git a/platforms/merrifield_plus/PlatfPrimaryDevice.cpp b/platforms/merrifield_plus/PlatfPrimaryDevice.cpp index cb82bc6..b0e44c3 100644 --- a/platforms/merrifield_plus/PlatfPrimaryDevice.cpp +++ b/platforms/merrifield_plus/PlatfPrimaryDevice.cpp @@ -25,11 +25,11 @@ * Jackie Li <yaodong.li@intel.com> * */ -#include <HwcTrace.h> -#include <PlatfPrimaryDevice.h> -#include <common/VsyncControl.h> -#include <common/BlankControl.h> -#include <common/PrepareListener.h> +#include <common/utils/HwcTrace.h> +#include <platforms/merrifield_plus/PlatfPrimaryDevice.h> +#include <ips/common/VsyncControl.h> +#include <ips/common/BlankControl.h> +#include <ips/common/PrepareListener.h> namespace android { diff --git a/platforms/merrifield_plus/PlatfVirtualDevice.cpp b/platforms/merrifield_plus/PlatfVirtualDevice.cpp index a6ac4cb..4d79450 100644 --- a/platforms/merrifield_plus/PlatfVirtualDevice.cpp +++ b/platforms/merrifield_plus/PlatfVirtualDevice.cpp @@ -25,11 +25,11 @@ * Jackie Li <yaodong.li@intel.com> * */ -#include <HwcTrace.h> +#include <common/utils/HwcTrace.h> #include <Hwcomposer.h> #include <DisplayPlaneManager.h> -#include <PlatfVirtualDevice.h> -#include <common/VideoPayloadManager.h> +#include <platforms/merrifield_plus/PlatfVirtualDevice.h> +#include <ips/common/VideoPayloadManager.h> namespace android { namespace intel { |