diff options
| author | Petri Gynther <pgynther@google.com> | 2023-04-19 19:08:11 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2023-04-19 19:08:11 +0000 |
| commit | adbd54d887a496b56f13d4e71048d264fd756b0b (patch) | |
| tree | e359115000c974c659e4818b5c16f41127e7588a | |
| parent | 4fc15e8b94343f01a39fdd51f015d4093c489619 (diff) | |
| parent | 7ec069210c5f35bcfecf8f228307ee30a8a44cab (diff) | |
| download | zuma-adbd54d887a496b56f13d4e71048d264fd756b0b.tar.gz | |
Merge changes from topic "dp-dev-merge-hwc" into udc-d1-dev
* changes:
libhwc2.1: Assign 3 DPPs for external display
libhwc2.1: apply namespace for display units
| -rw-r--r-- | libhwc2.1/ExynosHWCModule.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/libhwc2.1/ExynosHWCModule.h b/libhwc2.1/ExynosHWCModule.h index c020a44..d434a0e 100644 --- a/libhwc2.1/ExynosHWCModule.h +++ b/libhwc2.1/ExynosHWCModule.h @@ -118,16 +118,22 @@ static const exynos_mpp_t available_otf_mpp_units[] = { static_cast<uint32_t>(DPUF1), static_cast<uint32_t>(AXI1)}, // DPP11(IDMA_GFS6) in DPUF1 is connected with AXI0 port - {MPP_DPP_GFS, MPP_LOGICAL_DPP_GFS, "DPP_GFS6", 6, 0, HWC_DISPLAY_SECONDARY_BIT, + {MPP_DPP_GFS, MPP_LOGICAL_DPP_GFS, "DPP_GFS6", 6, 0, HWC_DISPLAY_EXTERNAL_BIT, static_cast<uint32_t>(DPUF1), static_cast<uint32_t>(AXI0)}, // DPP12(IDMA_VGRFS5) in DPUF1 is connected with AXI0 port - {MPP_DPP_VGRFS, MPP_LOGICAL_DPP_VGRFS, "DPP_VGRFS5", 5, 0, HWC_DISPLAY_SECONDARY_BIT, + {MPP_DPP_VGRFS, MPP_LOGICAL_DPP_VGRFS, "DPP_VGRFS5", 5, 0, HWC_DISPLAY_EXTERNAL_BIT, static_cast<uint32_t>(DPUF1), static_cast<uint32_t>(AXI0)}, // DPP13(IDMA_GFS7) in DPUF1 is connected with AXI0 port - {MPP_DPP_GFS, MPP_LOGICAL_DPP_GFS, "DPP_GFS7", 7, 0, HWC_DISPLAY_SECONDARY_BIT, + {MPP_DPP_GFS, MPP_LOGICAL_DPP_GFS, "DPP_GFS7", 7, 0, HWC_DISPLAY_EXTERNAL_BIT, static_cast<uint32_t>(DPUF1), static_cast<uint32_t>(AXI0)}, }; +static const std::array<exynos_display_t, 3> AVAILABLE_DISPLAY_UNITS = {{ + {HWC_DISPLAY_PRIMARY, 0, "PrimaryDisplay", "/dev/dri/card0", ""}, + {HWC_DISPLAY_PRIMARY, 1, "SecondaryDisplay", "/dev/dri/card0", ""}, + {HWC_DISPLAY_EXTERNAL, 0, "ExternalDisplay", "/dev/dri/card0", ""} +}}; + /* * Note : * When External or Virtual display is connected, |