libhwc2.1: Rename Decon to Dpu
Change-Id: I7bb7b2b4ba42efa9280a096f7c5fd6432686dba7
Signed-off-by: Seunghwan Lee <sh3885.lee@samsung.com>
diff --git a/libhwc2.1/libdevice/ExynosDisplay.cpp b/libhwc2.1/libdevice/ExynosDisplay.cpp
index d1308d7..532254e 100644
--- a/libhwc2.1/libdevice/ExynosDisplay.cpp
+++ b/libhwc2.1/libdevice/ExynosDisplay.cpp
@@ -327,7 +327,7 @@
mLowFpsLayerInfo.initializeInfos();
- mUseDecon = true;
+ mUseDpu = true;
return;
}
@@ -979,14 +979,14 @@
(mExynosCompositionInfo.mLastIndex >= 0)) {
sourceSize = mExynosCompositionInfo.mLastIndex - mExynosCompositionInfo.mFirstIndex + 1;
- if (!mUseDecon && mClientCompositionInfo.mHasCompositionLayer)
+ if (!mUseDpu && mClientCompositionInfo.mHasCompositionLayer)
sourceSize++;
}
if (m2mMpp->mAssignedSources.size() == 0) {
DISPLAY_LOGE("No source images");
isValid = false;
- } else if (mUseDecon && (((mExynosCompositionInfo.mFirstIndex < 0) ||
+ } else if (mUseDpu && (((mExynosCompositionInfo.mFirstIndex < 0) ||
(mExynosCompositionInfo.mLastIndex < 0)) ||
(sourceSize != (int)m2mMpp->mAssignedSources.size()))) {
DISPLAY_LOGE("Invalid index (%d, %d), size(%zu), sourceSize(%d)",
@@ -1594,7 +1594,7 @@
if ((mLayers[i]->mExynosCompositionType == HWC2_COMPOSITION_EXYNOS) ||
(mLayers[i]->mExynosCompositionType == HWC2_COMPOSITION_CLIENT))
continue;
- int32_t windowIndex = mLayers[i]->mWindowIndex;
+ int32_t windowIndex = mLayers[i]->mWindowIndex;
if ((windowIndex < 0) || (windowIndex >= (int32_t)mDpuData.configs.size())) {
DISPLAY_LOGE("%s:: %zu layer has invalid windowIndex(%d)",
__func__, i, windowIndex);
@@ -2072,7 +2072,7 @@
errString.appendFormat("There is exynos composition, but m2mMPP is NULL\n");
goto err;
}
- if (mUseDecon &&
+ if (mUseDpu &&
((mExynosCompositionInfo.mWindowIndex < 0) ||
(mExynosCompositionInfo.mWindowIndex >= (int32_t)mDpuData.configs.size()))) {
errString.appendFormat("%s:: exynosComposition has invalid window index(%d)\n",
@@ -2103,7 +2103,7 @@
i, mLayers[i]->mReleaseFence);
}
mExynosCompositionInfo.mM2mMPP->resetSrcReleaseFence();
- if(mUseDecon) {
+ if(mUseDpu) {
#ifdef DISABLE_FENCE
mExynosCompositionInfo.mM2mMPP->setDstAcquireFence(-1);
#else
diff --git a/libhwc2.1/libdevice/ExynosDisplay.h b/libhwc2.1/libdevice/ExynosDisplay.h
index ff2d899..fc98e1f 100644
--- a/libhwc2.1/libdevice/ExynosDisplay.h
+++ b/libhwc2.1/libdevice/ExynosDisplay.h
@@ -365,7 +365,7 @@
*/
int mLastRetireFence;
- bool mUseDecon;
+ bool mUseDpu;
/**
* Max Window number, It should be set by display module(chip)
diff --git a/libhwc2.1/libhwchelper/ExynosHWCHelper.cpp b/libhwc2.1/libhwchelper/ExynosHWCHelper.cpp
index 97df936..994eb02 100644
--- a/libhwc2.1/libhwchelper/ExynosHWCHelper.cpp
+++ b/libhwc2.1/libhwchelper/ExynosHWCHelper.cpp
@@ -146,7 +146,7 @@
return 0;
}
-uint8_t DeconFormatToBpp(decon_pixel_format format)
+uint8_t DpuFormatToBpp(decon_pixel_format format)
{
for (unsigned int i = 0; i < FORMAT_MAX_CNT; i++){
if (exynos_format_desc[i].s3cFormat == format)
@@ -274,7 +274,7 @@
return V4L2_COLORSPACE_DEFAULT;
}
-enum decon_pixel_format halFormatToS3CFormat(int format)
+enum decon_pixel_format halFormatToDpuFormat(int format)
{
for (unsigned int i = 0; i < FORMAT_MAX_CNT; i++){
if (exynos_format_desc[i].halFormat == format)
@@ -283,7 +283,7 @@
return DECON_PIXEL_FORMAT_MAX;
}
-uint32_t S3CFormatToHalFormat(int format)
+uint32_t DpuFormatToHalFormat(int format)
{
for (unsigned int i = 0; i < FORMAT_MAX_CNT; i++){
if (exynos_format_desc[i].s3cFormat == static_cast<decon_pixel_format>(format))
@@ -344,7 +344,7 @@
return dataSpace;
}
-enum decon_blending halBlendingToS3CBlending(int32_t blending)
+enum decon_blending halBlendingToDpuBlending(int32_t blending)
{
switch (blending) {
case HWC2_BLEND_MODE_NONE:
@@ -359,7 +359,7 @@
}
}
-enum dpp_rotate halTransformToS3CRot(uint32_t halTransform)
+enum dpp_rotate halTransformToDpuRot(uint32_t halTransform)
{
switch (halTransform) {
case HAL_TRANSFORM_FLIP_H:
diff --git a/libhwc2.1/libhwchelper/ExynosHWCHelper.h b/libhwc2.1/libhwchelper/ExynosHWCHelper.h
index 781090f..a904ee9 100644
--- a/libhwc2.1/libhwchelper/ExynosHWCHelper.h
+++ b/libhwc2.1/libhwchelper/ExynosHWCHelper.h
@@ -311,13 +311,13 @@
inline int HEIGHT(const hwc_frect_t &rect) { return (int)(rect.bottom - rect.top); }
uint32_t halDataSpaceToV4L2ColorSpace(android_dataspace data_space);
-enum decon_pixel_format halFormatToS3CFormat(int format);
-uint32_t S3CFormatToHalFormat(int format);
+enum decon_pixel_format halFormatToDpuFormat(int format);
+uint32_t DpuFormatToHalFormat(int format);
int halFormatToDrmFormat(int format, bool compressed);
uint8_t formatToBpp(int format);
-uint8_t DeconFormatToBpp(decon_pixel_format format);
-enum decon_blending halBlendingToS3CBlending(int32_t blending);
-enum dpp_rotate halTransformToS3CRot(uint32_t halTransform);
+uint8_t DpuFormatToBpp(decon_pixel_format format);
+enum decon_blending halBlendingToDpuBlending(int32_t blending);
+enum dpp_rotate halTransformToDpuRot(uint32_t halTransform);
uint64_t halTransformToDrmRot(uint32_t halTransform);
bool isFormatRgb(int format);
diff --git a/libhwc2.1/libresource/ExynosResourceManager.cpp b/libhwc2.1/libresource/ExynosResourceManager.cpp
index 129e23c..8fc0141 100644
--- a/libhwc2.1/libresource/ExynosResourceManager.cpp
+++ b/libhwc2.1/libresource/ExynosResourceManager.cpp
@@ -491,7 +491,7 @@
}
}
- if (!display->mUseDecon) {
+ if (!display->mUseDpu) {
if (display->mClientCompositionInfo.mHasCompositionLayer) {
if ((ret = display->mExynosCompositionInfo.mM2mMPP->assignMPP(display, &display->mClientCompositionInfo)) != NO_ERROR)
{
@@ -999,10 +999,10 @@
if (targetType == COMPOSITION_EXYNOS) {
for (uint32_t i = 0; i < mM2mMPPs.size(); i++) {
- if ((display->mUseDecon == true) &&
+ if ((display->mUseDpu == true) &&
(mM2mMPPs[i]->mLogicalType != MPP_LOGICAL_G2D_RGB))
continue;
- if ((display->mUseDecon == false) &&
+ if ((display->mUseDpu == false) &&
(mM2mMPPs[i]->mLogicalType != MPP_LOGICAL_G2D_COMBO))
continue;
if (mM2mMPPs[i]->isAssignableState(display, src_img, dst_img)) {
@@ -1025,7 +1025,7 @@
return -EINVAL;
}
- if (display->mUseDecon == false) {
+ if (display->mUseDpu == false) {
return NO_ERROR;
}
@@ -1326,7 +1326,7 @@
layer->setExynosMidImage(dst_img);
validateFlag = validateLayer(layer_index, display, layer);
- if ((display->mUseDecon) &&
+ if ((display->mUseDpu) &&
(display->mWindowNumUsed >= display->mMaxWindowNum))
validateFlag |= eInsufficientWindow;
@@ -1365,10 +1365,10 @@
/* 2. Find available m2mMPP */
for (uint32_t j = 0; j < mM2mMPPs.size(); j++) {
- if ((display->mUseDecon == true) &&
+ if ((display->mUseDpu == true) &&
(mM2mMPPs[j]->mLogicalType == MPP_LOGICAL_G2D_COMBO))
continue;
- if ((display->mUseDecon == false) &&
+ if ((display->mUseDpu == false) &&
(mM2mMPPs[j]->mLogicalType == MPP_LOGICAL_G2D_RGB))
continue;
@@ -1589,7 +1589,7 @@
int ret = NO_ERROR;
uint32_t windowIndex = 0;
- if (!display->mUseDecon)
+ if (!display->mUseDpu)
return ret;
windowIndex = display->mBaseWindowIndex;
diff --git a/libhwc2.1/libvirtualdisplay/ExynosVirtualDisplay.cpp b/libhwc2.1/libvirtualdisplay/ExynosVirtualDisplay.cpp
index f23fbff..a6cf965 100644
--- a/libhwc2.1/libvirtualdisplay/ExynosVirtualDisplay.cpp
+++ b/libhwc2.1/libvirtualdisplay/ExynosVirtualDisplay.cpp
@@ -60,6 +60,7 @@
mMaxTargetLuminance = 100;
mSinkDeviceType = 0;
+ mUseDpu = false;
mDisplayControl.enableExynosCompositionOptimization = false;
mDisplayControl.enableClientCompositionOptimization = false;
mDisplayControl.handleLowFpsLayers = false;
