summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoen Chen <joenchen@google.com>2023-05-12 01:02:04 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-05-12 01:02:04 +0000
commitfc9082a0c1ef9b58afa76624bd6f02da343a18cd (patch)
tree3ce513aea01f0fd980f5a90be8292ae9ba68a8ee
parent29f9db295c0dae894b21d82371f67c6ff6b74b61 (diff)
parent3772e6fed24c11d99be2c0730de1a02fc2daca20 (diff)
downloadgs201-fc9082a0c1ef9b58afa76624bd6f02da343a18cd.tar.gz
Merge "libhwc2.1: reserve DPP_VGRFS2 for the outer display" into udc-dev am: 3772e6fed2
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/graphics/gs201/+/21926041 Change-Id: I7fa1e43b7bfcc2892966254110f0b713892add90 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--libhwc2.1/ExynosHWCModule.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/libhwc2.1/ExynosHWCModule.h b/libhwc2.1/ExynosHWCModule.h
index 19c9a12..d816bdc 100644
--- a/libhwc2.1/ExynosHWCModule.h
+++ b/libhwc2.1/ExynosHWCModule.h
@@ -40,10 +40,10 @@ static const dpp_channel_map_t idma_channel_map[] = {
static const exynos_mpp_t available_otf_mpp_units[] = {
{MPP_DPP_GF, MPP_LOGICAL_DPP_GF, "DPP_GF0", 0, 0, HWC_DISPLAY_PRIMARY_BIT, 0, 0},
{MPP_DPP_GF, MPP_LOGICAL_DPP_GF, "DPP_GF1", 1, 0, HWC_DISPLAY_PRIMARY_BIT, 0, 0},
- {MPP_DPP_GF, MPP_LOGICAL_DPP_GF, "DPP_GF2", 2, 0, HWC_DISPLAY_SECONDARY_BIT, 0, 0},
+ {MPP_DPP_GF, MPP_LOGICAL_DPP_GF, "DPP_GF2", 2, 0, HWC_DISPLAY_PRIMARY_BIT, 0, 0},
{MPP_DPP_VGRFS, MPP_LOGICAL_DPP_VGRFS, "DPP_VGRFS0", 0, 0, HWC_DISPLAY_PRIMARY_BIT, 0, 0},
{MPP_DPP_VGRFS, MPP_LOGICAL_DPP_VGRFS, "DPP_VGRFS1", 1, 0, HWC_DISPLAY_PRIMARY_BIT, 0, 0},
- {MPP_DPP_VGRFS, MPP_LOGICAL_DPP_VGRFS, "DPP_VGRFS2", 2, 0, HWC_DISPLAY_PRIMARY_BIT, 0, 0}
+ {MPP_DPP_VGRFS, MPP_LOGICAL_DPP_VGRFS, "DPP_VGRFS2", 2, 0, HWC_DISPLAY_SECONDARY_BIT, 0, 0}
};
} // namespace gs201