LineageOS/android_vendor_qcom_opensource_display-commonsys-intf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "sdm: drm: Expand drm topology enum for dsc"

Browse Source
This commit is contained in:
Linux Build Service Account
2017-06-19 18:58:38 -07:00
committed by Gerrit - the friendly Code Review server
parent ec21903bcd 2faa91c313
commit a70a27b4f2
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libdrmutils/drm_interface.h
View File

@@ -328,11 +328,15 @@ struct DRMPlaneTypeInfo {
typedef std::vector<std::pair<uint32_t, DRMPlaneTypeInfo>> DRMPlanesInfo; typedef std::vector<std::pair<uint32_t, DRMPlaneTypeInfo>> DRMPlanesInfo;
enum struct DRMTopology { enum struct DRMTopology {
UNKNOWN, // To be compat with driver defs in sde_kms.h UNKNOWN, // To be compat with driver defs in sde_rm.h
SINGLE_LM, SINGLE_LM,
SINGLE_LM_DSC,
DUAL_LM, DUAL_LM,
PPSPLIT, DUAL_LM_DSC,
DUAL_LM_MERGE, DUAL_LM_MERGE,
DUAL_LM_MERGE_DSC,
DUAL_LM_DSCMERGE,
PPSPLIT,
}; };
enum struct DRMPanelMode { enum struct DRMPanelMode {

4
sdm/libs/core/drm/hw_device_drm.cpp
View File

@@ -415,7 +415,9 @@ DisplayError HWDeviceDRM::PopulateDisplayAttributes() {
display_attributes_.h_total = mode.htotal; display_attributes_.h_total = mode.htotal;
uint32_t h_blanking = mode.htotal - mode.hdisplay; uint32_t h_blanking = mode.htotal - mode.hdisplay;
display_attributes_.is_device_split = display_attributes_.is_device_split =
(topology == DRMTopology::DUAL_LM || topology == DRMTopology::DUAL_LM_MERGE); (topology == DRMTopology::DUAL_LM || topology == DRMTopology::DUAL_LM_MERGE ||
topology == DRMTopology::DUAL_LM_MERGE_DSC || topology == DRMTopology::DUAL_LM_DSC ||
topology == DRMTopology::DUAL_LM_DSCMERGE);
display_attributes_.h_total += display_attributes_.is_device_split ? h_blanking : 0; display_attributes_.h_total += display_attributes_.is_device_split ? h_blanking : 0;
display_attributes_.x_dpi = (FLOAT(mode.hdisplay) * 25.4f) / FLOAT(mm_width); display_attributes_.x_dpi = (FLOAT(mode.hdisplay) * 25.4f) / FLOAT(mm_width);