summaryrefslogtreecommitdiff
path: root/merrifield/ips
diff options
context:
space:
mode:
Diffstat (limited to 'merrifield/ips')
-rw-r--r--merrifield/ips/common/OverlayPlaneBase.cpp3
-rw-r--r--merrifield/ips/common/PlaneCapabilities.cpp2
-rw-r--r--merrifield/ips/common/RotationBufferProvider.cpp1
-rw-r--r--merrifield/ips/common/TTMBufferMapper.cpp1
-rw-r--r--merrifield/ips/common/TTMBufferMapper.h1
-rw-r--r--merrifield/ips/common/WsbmWrapper.c6
-rw-r--r--merrifield/ips/tangier/TngDisplayContext.cpp4
-rw-r--r--merrifield/ips/tangier/TngGrallocBufferMapper.cpp5
-rw-r--r--merrifield/ips/tangier/TngGrallocBufferMapper.h3
-rw-r--r--merrifield/ips/tangier/TngPlaneManager.cpp2
-rw-r--r--merrifield/ips/tangier/TngPrimaryPlane.h2
11 files changed, 10 insertions, 20 deletions
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);
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-23 18:12:09 +0000