diff options
Diffstat (limited to 'libhwc2.1/libresource/ExynosMPP.cpp')
| -rw-r--r-- | libhwc2.1/libresource/ExynosMPP.cpp | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/libhwc2.1/libresource/ExynosMPP.cpp b/libhwc2.1/libresource/ExynosMPP.cpp index ae30482..119420e 100644 --- a/libhwc2.1/libresource/ExynosMPP.cpp +++ b/libhwc2.1/libresource/ExynosMPP.cpp @@ -1001,9 +1001,10 @@ int32_t ExynosMPP::allocOutBuf(uint32_t w, uint32_t h, uint32_t format, uint64_t mDstImgs[index].format = format; MPP_LOGD(eDebugMPP|eDebugBuf, "free outbuf[%d] %p", index, freeDstBuf.bufferHandle); - if (freeDstBuf.bufferHandle != NULL) + + if (freeDstBuf.bufferHandle != NULL) { freeOutBuf(freeDstBuf); - else { + } else { if (mAssignedDisplay != NULL) { freeDstBuf.acrylicAcquireFenceFd = fence_close(freeDstBuf.acrylicAcquireFenceFd, mAssignedDisplay, FENCE_TYPE_SRC_ACQUIRE, FENCE_IP_G2D); @@ -1399,9 +1400,10 @@ int32_t ExynosMPP::setupDst(exynos_mpp_img_info *dstImgInfo) if (dstImgInfo->bufferType == MPP_BUFFER_SECURE_DRM) attribute |= AcrylicCanvas::ATTR_PROTECTED; - if (mAssignedDisplay != NULL) + if (mAssignedDisplay != NULL) { mAcrylicHandle->setCanvasDimension(pixel_align(mAssignedDisplay->mXres, G2D_JUSTIFIED_DST_ALIGN), pixel_align(mAssignedDisplay->mYres, G2D_JUSTIFIED_DST_ALIGN)); + } /* setup dst */ if (needCompressDstBuf()) { @@ -1923,13 +1925,15 @@ int32_t ExynosMPP::requestHWStateChange(uint32_t state) return NO_ERROR; } - if (state == MPP_HW_STATE_RUNNING) + if (state == MPP_HW_STATE_RUNNING) { mHWState = MPP_HW_STATE_RUNNING; - else if (state == MPP_HW_STATE_IDLE) { - if (mLastStateFenceFd >= 0) + } else if (state == MPP_HW_STATE_IDLE) { + if (mLastStateFenceFd >= 0) { mResourceManageThread->addStateFence(mLastStateFenceFd); - else + } else { mHWState = MPP_HW_STATE_IDLE; + } + mLastStateFenceFd = -1; if ((mPhysicalType == MPP_G2D) && (mHWBusyFlag == false)) { |