diff options
author | Linux Build Service Account <lnxbuild@localhost> | 2016-07-06 04:14:26 -0600 |
---|---|---|
committer | Linux Build Service Account <lnxbuild@localhost> | 2016-07-06 04:14:26 -0600 |
commit | 253e9e4d2930a3e52ecff9b6e33adb38ca23bc0e (patch) | |
tree | 06b4927fbd6ec6352ea34f79630ca84417b397e9 | |
parent | 30d7aed7ec8a6da8d6c8a19dacec9a3c7a815a02 (diff) | |
parent | 202ab44518487481aac4507adc41d8a6c6cdea02 (diff) | |
download | android_hardware_qcom_display-253e9e4d2930a3e52ecff9b6e33adb38ca23bc0e.tar.gz android_hardware_qcom_display-253e9e4d2930a3e52ecff9b6e33adb38ca23bc0e.tar.bz2 android_hardware_qcom_display-253e9e4d2930a3e52ecff9b6e33adb38ca23bc0e.zip |
Promotion of display.lnx.2.0-00041.
CRs Change ID Subject
--------------------------------------------------------------------------------------------------------------
1037623 Ia4776572ebd5f6abad30b68d0fa6fe0a8f29dd4c hdmi: Set correct initial S3D configuration
Change-Id: Icafc5ac7b7281651e9005644cb0f7a4d9cb98d25
CRs-Fixed: 1037623
-rw-r--r-- | sdm/include/private/hw_info_types.h | 3 | ||||
-rw-r--r-- | sdm/libs/core/fb/hw_hdmi.h | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/sdm/include/private/hw_info_types.h b/sdm/include/private/hw_info_types.h index 97573c973..ec1b6e57e 100644 --- a/sdm/include/private/hw_info_types.h +++ b/sdm/include/private/hw_info_types.h @@ -158,7 +158,6 @@ struct HWSplitInfo { }; enum HWS3DMode { - kS3DModeInvalid = -1, kS3DModeNone, kS3DModeLR, kS3DModeRL, @@ -185,7 +184,7 @@ struct HWPanelInfo { bool is_pluggable = false; // Panel is pluggable HWSplitInfo split_info; // Panel split configuration char panel_name[256] = {0}; // Panel name - HWS3DMode s3d_mode = kS3DModeInvalid; // Panel's current s3d mode. + HWS3DMode s3d_mode = kS3DModeNone; // Panel's current s3d mode. int panel_max_brightness = 0; // Max panel brightness bool operator !=(const HWPanelInfo &panel_info) { diff --git a/sdm/libs/core/fb/hw_hdmi.h b/sdm/libs/core/fb/hw_hdmi.h index 1be151d7c..18a5487d5 100644 --- a/sdm/libs/core/fb/hw_hdmi.h +++ b/sdm/libs/core/fb/hw_hdmi.h @@ -116,7 +116,7 @@ class HWHDMI : public HWDevice { std::map<HWS3DMode, msm_hdmi_s3d_mode> s3d_mode_sdm_to_mdp_; std::vector<HWS3DMode> supported_s3d_modes_; // Reset this variable to ensure valid S3D configuration is set. - HWS3DMode active_s3d_mode_ = kS3DModeInvalid; + HWS3DMode active_s3d_mode_ = kS3DModeNone; uint32_t frame_rate_ = 0; }; |