diff options
author | Linux Build Service Account <lnxbuild@localhost> | 2018-04-15 10:42:45 -0700 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-04-15 10:42:45 -0700 |
commit | b9f0ae7f8b1b08ed9b821b21e21764a22f246c17 (patch) | |
tree | 3ad7a108c111084b2f5ddbfe2c054b0bd264e546 /sdm/libs/core | |
parent | c5e297f045088d7327c54fe9786fd0dfdd3fa6cd (diff) | |
parent | 87f9cae8f8e3f384d3abfe77b0c02d2ac12c4120 (diff) | |
download | display-b9f0ae7f8b1b08ed9b821b21e21764a22f246c17.tar.gz |
Merge "Revert "sdm: add one action to set panel brightness and refresh screen""
Diffstat (limited to 'sdm/libs/core')
-rw-r--r-- | sdm/libs/core/display_base.h | 3 | ||||
-rw-r--r-- | sdm/libs/core/display_primary.cpp | 5 | ||||
-rw-r--r-- | sdm/libs/core/display_primary.h | 1 | ||||
-rw-r--r-- | sdm/libs/core/drm/hw_device_drm.cpp | 4 | ||||
-rw-r--r-- | sdm/libs/core/drm/hw_device_drm.h | 1 | ||||
-rw-r--r-- | sdm/libs/core/fb/hw_device.cpp | 13 | ||||
-rw-r--r-- | sdm/libs/core/fb/hw_device.h | 3 | ||||
-rw-r--r-- | sdm/libs/core/fb/hw_primary.cpp | 6 | ||||
-rw-r--r-- | sdm/libs/core/fb/hw_primary.h | 1 | ||||
-rw-r--r-- | sdm/libs/core/hw_interface.h | 1 |
10 files changed, 0 insertions, 38 deletions
diff --git a/sdm/libs/core/display_base.h b/sdm/libs/core/display_base.h index 5e697d9c..5463befb 100644 --- a/sdm/libs/core/display_base.h +++ b/sdm/libs/core/display_base.h @@ -83,9 +83,6 @@ class DisplayBase : public DisplayInterface { virtual DisplayError SetPanelBrightness(int level) { return kErrorNotSupported; } - virtual DisplayError CachePanelBrightness(int level) { - return kErrorNotSupported; - } virtual DisplayError OnMinHdcpEncryptionLevelChange(uint32_t min_enc_level) { return kErrorNotSupported; } diff --git a/sdm/libs/core/display_primary.cpp b/sdm/libs/core/display_primary.cpp index 718dd1e8..ba83d05c 100644 --- a/sdm/libs/core/display_primary.cpp +++ b/sdm/libs/core/display_primary.cpp @@ -240,11 +240,6 @@ DisplayError DisplayPrimary::SetPanelBrightness(int level) { return hw_intf_->SetPanelBrightness(level); } -DisplayError DisplayPrimary::CachePanelBrightness(int level) { - lock_guard<recursive_mutex> obj(recursive_mutex_); - return hw_intf_->CachePanelBrightness(level); -} - DisplayError DisplayPrimary::GetRefreshRateRange(uint32_t *min_refresh_rate, uint32_t *max_refresh_rate) { lock_guard<recursive_mutex> obj(recursive_mutex_); diff --git a/sdm/libs/core/display_primary.h b/sdm/libs/core/display_primary.h index 21ada7ca..a5a3ae0f 100644 --- a/sdm/libs/core/display_primary.h +++ b/sdm/libs/core/display_primary.h @@ -51,7 +51,6 @@ class DisplayPrimary : public DisplayBase, HWEventHandler { virtual DisplayError SetRefreshRate(uint32_t refresh_rate, bool final_rate); virtual DisplayError SetPanelBrightness(int level); virtual DisplayError GetPanelBrightness(int *level); - virtual DisplayError CachePanelBrightness(int level); // Implement the HWEventHandlers virtual DisplayError VSync(int64_t timestamp); diff --git a/sdm/libs/core/drm/hw_device_drm.cpp b/sdm/libs/core/drm/hw_device_drm.cpp index c6547e95..e90a782b 100644 --- a/sdm/libs/core/drm/hw_device_drm.cpp +++ b/sdm/libs/core/drm/hw_device_drm.cpp @@ -1392,10 +1392,6 @@ DisplayError HWDeviceDRM::GetPanelBrightness(int *level) { return err; } -DisplayError HWDeviceDRM::CachePanelBrightness(int level) { - return kErrorNotSupported; -} - DisplayError HWDeviceDRM::GetHWScanInfo(HWScanInfo *scan_info) { return kErrorNotSupported; } diff --git a/sdm/libs/core/drm/hw_device_drm.h b/sdm/libs/core/drm/hw_device_drm.h index a0f579d4..d2fa276f 100644 --- a/sdm/libs/core/drm/hw_device_drm.h +++ b/sdm/libs/core/drm/hw_device_drm.h @@ -83,7 +83,6 @@ class HWDeviceDRM : public HWInterface { virtual DisplayError SetDisplayMode(const HWDisplayMode hw_display_mode); virtual DisplayError SetRefreshRate(uint32_t refresh_rate); virtual DisplayError SetPanelBrightness(int level); - virtual DisplayError CachePanelBrightness(int level); virtual DisplayError GetHWScanInfo(HWScanInfo *scan_info); virtual DisplayError GetVideoFormat(uint32_t config_index, uint32_t *video_format); virtual DisplayError GetMaxCEAFormat(uint32_t *max_cea_format); diff --git a/sdm/libs/core/fb/hw_device.cpp b/sdm/libs/core/fb/hw_device.cpp index 1f733a04..148f866e 100644 --- a/sdm/libs/core/fb/hw_device.cpp +++ b/sdm/libs/core/fb/hw_device.cpp @@ -496,12 +496,6 @@ DisplayError HWDevice::Commit(HWLayers *hw_layers) { if (synchronous_commit_) { mdp_commit.flags |= MDP_COMMIT_WAIT_FOR_FINISH; } - if (bl_update_commit && bl_level_update_commit >= 0) { -#ifdef MDP_COMMIT_UPDATE_BRIGHTNESS - mdp_commit.bl_level = (uint32_t)bl_level_update_commit; - mdp_commit.flags |= MDP_COMMIT_UPDATE_BRIGHTNESS; -#endif - } if (Sys::ioctl_(device_fd_, INT(MSMFB_ATOMIC_COMMIT), &mdp_disp_commit_) < 0) { if (errno == ESHUTDOWN) { DLOGI_IF(kTagDriverConfig, "Driver is processing shutdown sequence"); @@ -556,9 +550,6 @@ DisplayError HWDevice::Commit(HWLayers *hw_layers) { synchronous_commit_ = false; } - if (bl_update_commit) - bl_update_commit = false; - return kErrorNone; } @@ -1202,10 +1193,6 @@ DisplayError HWDevice::SetPanelBrightness(int level) { return kErrorNotSupported; } -DisplayError HWDevice::CachePanelBrightness(int level) { - return kErrorNotSupported; -} - DisplayError HWDevice::GetHWScanInfo(HWScanInfo *scan_info) { return kErrorNotSupported; } diff --git a/sdm/libs/core/fb/hw_device.h b/sdm/libs/core/fb/hw_device.h index 353cce5b..fe954aee 100644 --- a/sdm/libs/core/fb/hw_device.h +++ b/sdm/libs/core/fb/hw_device.h @@ -85,7 +85,6 @@ class HWDevice : public HWInterface { virtual DisplayError SetDisplayMode(const HWDisplayMode hw_display_mode); virtual DisplayError SetRefreshRate(uint32_t refresh_rate); virtual DisplayError SetPanelBrightness(int level); - virtual DisplayError CachePanelBrightness(int level); virtual DisplayError GetHWScanInfo(HWScanInfo *scan_info); virtual DisplayError GetVideoFormat(uint32_t config_index, uint32_t *video_format); virtual DisplayError GetMaxCEAFormat(uint32_t *max_cea_format); @@ -158,8 +157,6 @@ class HWDevice : public HWInterface { HWDisplayAttributes display_attributes_ = {}; HWMixerAttributes mixer_attributes_ = {}; std::vector<mdp_destination_scaler_data> mdp_dest_scalar_data_; - int bl_level_update_commit = -1; - bool bl_update_commit = false; }; } // namespace sdm diff --git a/sdm/libs/core/fb/hw_primary.cpp b/sdm/libs/core/fb/hw_primary.cpp index 3f3c28e2..4c724028 100644 --- a/sdm/libs/core/fb/hw_primary.cpp +++ b/sdm/libs/core/fb/hw_primary.cpp @@ -570,12 +570,6 @@ DisplayError HWPrimary::GetPanelBrightness(int *level) { return kErrorNone; } -DisplayError HWPrimary::CachePanelBrightness(int level) { - bl_level_update_commit = level; - bl_update_commit = true; - return kErrorNone; -} - DisplayError HWPrimary::SetAutoRefresh(bool enable) { const int kWriteLength = 2; char buffer[kWriteLength] = {'\0'}; diff --git a/sdm/libs/core/fb/hw_primary.h b/sdm/libs/core/fb/hw_primary.h index c6ca5a98..b3851096 100644 --- a/sdm/libs/core/fb/hw_primary.h +++ b/sdm/libs/core/fb/hw_primary.h @@ -55,7 +55,6 @@ class HWPrimary : public HWDevice { virtual DisplayError SetDisplayMode(const HWDisplayMode hw_display_mode); virtual DisplayError SetRefreshRate(uint32_t refresh_rate); virtual DisplayError SetPanelBrightness(int level); - virtual DisplayError CachePanelBrightness(int level); virtual DisplayError GetPPFeaturesVersion(PPFeatureVersion *vers); virtual DisplayError SetPPFeatures(PPFeaturesConfig *feature_list); virtual DisplayError GetPanelBrightness(int *level); diff --git a/sdm/libs/core/hw_interface.h b/sdm/libs/core/hw_interface.h index 483a4df4..cdb7cbad 100644 --- a/sdm/libs/core/hw_interface.h +++ b/sdm/libs/core/hw_interface.h @@ -100,7 +100,6 @@ class HWInterface { virtual DisplayError SetDisplayMode(const HWDisplayMode hw_display_mode) = 0; virtual DisplayError SetRefreshRate(uint32_t refresh_rate) = 0; virtual DisplayError SetPanelBrightness(int level) = 0; - virtual DisplayError CachePanelBrightness(int level) = 0; virtual DisplayError GetHWScanInfo(HWScanInfo *scan_info) = 0; virtual DisplayError GetVideoFormat(uint32_t config_index, uint32_t *video_format) = 0; virtual DisplayError GetMaxCEAFormat(uint32_t *max_cea_format) = 0; |