diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-02-24 04:24:34 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-02-24 04:24:34 +0000 |
| commit | 0bd6088e89e729c8a3d1c50cbadd83c01de46e26 (patch) | |
| tree | f29d0eb2f6aca636a838717df1ec223aa027684a | |
| parent | c701cf80b2e9f8d6b72f1215cb581decb4139254 (diff) | |
| parent | bc755169156c1187bf3eef3423322b34d496065e (diff) | |
Snap for 9649615 from bc755169156c1187bf3eef3423322b34d496065e to udc-release
Change-Id: I639410ee0f9eeea8252d57669d257d95819a43ba
| -rw-r--r-- | libhwc2.1/libdevice/ExynosLayer.cpp | 7 | ||||
| -rw-r--r-- | libhwc2.1/libmaindisplay/ExynosPrimaryDisplay.cpp | 2 | ||||
| -rw-r--r-- | libhwc2.1/libresource/ExynosMPP.h | 3 |
3 files changed, 6 insertions, 6 deletions
diff --git a/libhwc2.1/libdevice/ExynosLayer.cpp b/libhwc2.1/libdevice/ExynosLayer.cpp index 17960e0..436f7a2 100644 --- a/libhwc2.1/libdevice/ExynosLayer.cpp +++ b/libhwc2.1/libdevice/ExynosLayer.cpp @@ -968,14 +968,13 @@ bool ExynosLayer::checkBtsCap(const uint32_t bts_refresh_rate) { if (mOtfMPP == nullptr) return true; exynos_image src_img; + exynos_image dst_img; setSrcExynosImage(&src_img); - if (mOtfMPP->checkSpecificRestriction(bts_refresh_rate, src_img)) { + setDstExynosImage(&dst_img); + if (mOtfMPP->checkSpecificRestriction(bts_refresh_rate, src_img, dst_img)) { return false; } - exynos_image dst_img; - setDstExynosImage(&dst_img); - const bool isPerpendicular = !!(src_img.transform & HAL_TRANSFORM_ROT_90); const uint32_t srcWidth = isPerpendicular ? src_img.h : src_img.w; const uint32_t srcHeight = isPerpendicular ? src_img.w : src_img.h; diff --git a/libhwc2.1/libmaindisplay/ExynosPrimaryDisplay.cpp b/libhwc2.1/libmaindisplay/ExynosPrimaryDisplay.cpp index fb4cdb2..9e299ee 100644 --- a/libhwc2.1/libmaindisplay/ExynosPrimaryDisplay.cpp +++ b/libhwc2.1/libmaindisplay/ExynosPrimaryDisplay.cpp @@ -273,7 +273,7 @@ int32_t ExynosPrimaryDisplay::setPowerOn() { ATRACE_CALL(); updateAppliedActiveConfig(0, 0); int ret = NO_ERROR; - if (!mFirstPowerOn) { + if (mDisplayId != 0 || !mFirstPowerOn) { ret = applyPendingConfig(); } diff --git a/libhwc2.1/libresource/ExynosMPP.h b/libhwc2.1/libresource/ExynosMPP.h index 4393301..aadc72b 100644 --- a/libhwc2.1/libresource/ExynosMPP.h +++ b/libhwc2.1/libresource/ExynosMPP.h @@ -605,7 +605,8 @@ public: virtual bool isSupportedHStrideCrop(struct exynos_image &src); bool checkDownscaleCap(const float resolution, const float displayRatio_V) const; virtual bool checkSpecificRestriction(const uint32_t __unused refreshRate, - const struct exynos_image __unused &src) { + const struct exynos_image __unused &src, + const struct exynos_image __unused &dst) { return false; } virtual uint32_t getDownscaleRestriction(const struct exynos_image &src, |