Merge "Revert "libhwc2.1: don't allow DPU to handle 4k with specific height crop size"" into tm-dev am: 3c3f3c4b56

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/graphics/common/+/18353312

Change-Id: I25a55496db19e096d0b1d210a88827e86263fb93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

1 files changed, 0 insertions, 22 deletions

diff --git a/libhwc2.1/libresource/ExynosMPP.cpp b/libhwc2.1/libresource/ExynosMPP.cpp
index 84b3b24..09c937d 100644
--- a/libhwc2.1/libresource/ExynosMPP.cpp
+++ b/libhwc2.1/libresource/ExynosMPP.cpp
@@ -51,24 +51,6 @@ extern struct exynos_hwc_control exynosHWCControl;
 extern feature_support_t feature_table[];
 #endif
 
-/* This function is used to restrict case that current DPU clock calculation formual can't cover
- * it. Once formula can cover it, the restriction need to be removed.
- */
-bool checkSpecificRestriction(const struct exynos_image &src, const uint32_t refresh_rate) {
-    if (refresh_rate < 120 || src.bufferHandle == nullptr) {
-        return false;
-    }
-
-    // case: 4k video layer and only height crop 1280 ~ 512 at 120hz
-    VendorGraphicBufferMeta gmeta(src.bufferHandle);
-    if (src.fullWidth == 3840 && src.w == 3840 && src.fullHeight == 2176 && src.h <= 1280 &&
-        src.h >= 512 && isFormatYUV(gmeta.format)) {
-        return true;
-    }
-
-    return false;
-}
-
 void dumpExynosMPPImgInfo(uint32_t type, exynos_mpp_img_info &imgInfo)
 {
     HDEBUGLOGD(type, "\tbuffer: %p, bufferType: %d",
@@ -544,10 +526,6 @@ uint32_t ExynosMPP::getMaxDownscale(const ExynosDisplay &display, const struct e
         if (!checkDownscaleCap(resolution, float(dst.h) / float(display.mYres))) {
             return 1;
         }
-
-        if (checkSpecificRestriction(src, display.getBtsRefreshRate())) {
-            return 1;
-        }
     }
 
     return maxDownscale;