BOBtheBlinker/android_device_oneplus_dre
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sm8250-common: livedisplay: Say hello to IDisplayModes ^.^

Browse source
This commit is contained in:
LuK1337 2020-06-25 10:06:37 +02:00
parent f03b5d364a
commit 6e2bca5af7
6 changed files with 79 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
livedisplay/DisplayModes.cpp
View file

@ -17,7 +17,10 @@
#define LOG_TAG "DisplayModesService" #define LOG_TAG "DisplayModesService"
#include "DisplayModes.h" #include "DisplayModes.h"
#include <android-base/logging.h> #include <android-base/logging.h>
#include <android-base/properties.h>
#include <fstream> #include <fstream>
namespace vendor { namespace vendor {
@ -26,15 +29,15 @@ namespace livedisplay {
namespace V2_0 { namespace V2_0 {
namespace implementation { namespace implementation {
static constexpr const char* kModePath = static constexpr const char* kDisplayModeProp = "sys.display.mode";
"/sys/devices/platform/soc/ae00000.qcom,mdss_mdp/main_display/display_mode"; static const std::string kModeBasePath = "/sys/class/drm/card0-DSI-1/";
static constexpr const char* kDefaultPath = "/data/misc/display/default_display_mode"; static const std::string kDefaultPath = "/data/misc/display/default_display_mode";
const std::map<int32_t, DisplayModes::ModeInfo> DisplayModes::kModeMap = { const std::map<int32_t, DisplayModes::ModeInfo> DisplayModes::kModeMap = {
{0, {"Standard", "default"}}, {0, {"Standard", "default"}},
{1, {"sRGB", "srgb"}}, {1, {"DCI P3", "native_display_p3_mode"}},
{2, {"DCI P3", "dci-p3"}}, {2, {"Wide Color", "native_display_wide_color_mode"}},
{3, {"Wide Color", "widecolor"}}, {3, {"sRGB", "native_display_srgb_color_mode"}},
}; };
DisplayModes::DisplayModes() : mDefaultModeId(0) { DisplayModes::DisplayModes() : mDefaultModeId(0) {
@ -48,18 +51,19 @@ DisplayModes::DisplayModes() : mDefaultModeId(0) {
} }
for (const auto& entry : kModeMap) { for (const auto& entry : kModeMap) {
if (value == entry.second.value) { // Check if default mode is a valid mode
if (value == std::to_string(entry.first)) {
mDefaultModeId = entry.first; mDefaultModeId = entry.first;
android::base::SetProperty(kDisplayModeProp, entry.second.node);
break; break;
} }
} }
setDisplayMode(mDefaultModeId, false);
} }
// Methods from ::vendor::lineage::livedisplay::V2_0::IDisplayModes follow. // Methods from ::vendor::lineage::livedisplay::V2_0::IDisplayModes follow.
Return<void> DisplayModes::getDisplayModes(getDisplayModes_cb resultCb) { Return<void> DisplayModes::getDisplayModes(getDisplayModes_cb resultCb) {
std::vector<DisplayMode> modes; std::vector<DisplayMode> modes;
for (const auto& entry : kModeMap) { for (const auto& entry : kModeMap) {
modes.push_back({entry.first, entry.second.name}); modes.push_back({entry.first, entry.second.name});
} }
@ -69,13 +73,17 @@ Return<void> DisplayModes::getDisplayModes(getDisplayModes_cb resultCb) {
Return<void> DisplayModes::getCurrentDisplayMode(getCurrentDisplayMode_cb resultCb) { Return<void> DisplayModes::getCurrentDisplayMode(getCurrentDisplayMode_cb resultCb) {
int32_t currentModeId = mDefaultModeId; int32_t currentModeId = mDefaultModeId;
std::ifstream modeFile(kModePath);
std::string value; std::string value;
modeFile >> value; for (const auto& entry : kModeMap) {
if (!modeFile.fail()) { if (entry.first == 0) {
for (const auto& entry : kModeMap) { continue;
if (value == entry.second.value) { }
std::ifstream modeFile(kModeBasePath + entry.second.node);
if (!modeFile.fail()) {
modeFile >> value;
if (value == "1") {
currentModeId = entry.first; currentModeId = entry.first;
break; break;
} }
@ -91,24 +99,39 @@ Return<void> DisplayModes::getDefaultDisplayMode(getDefaultDisplayMode_cb result
} }
Return<bool> DisplayModes::setDisplayMode(int32_t modeID, bool makeDefault) { Return<bool> DisplayModes::setDisplayMode(int32_t modeID, bool makeDefault) {
// Disable all modes
for (const auto& entry : kModeMap) {
if (entry.first == 0) {
continue;
}
std::ofstream modeFile(kModeBasePath + entry.second.node);
if (!modeFile.fail()) {
modeFile << 0;
}
}
const auto iter = kModeMap.find(modeID); const auto iter = kModeMap.find(modeID);
if (iter == kModeMap.end()) { if (iter == kModeMap.end()) {
return false; return false;
} }
std::ofstream modeFile(kModePath); if (modeID != 0) {
modeFile << iter->second.value; std::ofstream modeFile(kModeBasePath + iter->second.node);
if (modeFile.fail()) { modeFile << 1;
return false; if (modeFile.fail()) {
return false;
}
android::base::SetProperty(kDisplayModeProp, iter->second.node);
} }
if (makeDefault) { if (makeDefault) {
std::ofstream defaultFile(kDefaultPath); std::ofstream defaultFile(kDefaultPath);
defaultFile << iter->second.value; defaultFile << iter->first;
if (defaultFile.fail()) { if (defaultFile.fail()) {
return false; return false;
} }
mDefaultModeId = iter->first; mDefaultModeId = iter->first;
} }
return true; return true;
} }

4
livedisplay/DisplayModes.h
View file

@ -44,8 +44,8 @@ class DisplayModes : public IDisplayModes {
private: private:
struct ModeInfo { struct ModeInfo {
const char* name; std::string name;
const char* value; std::string node;
}; };
static const std::map<int32_t, ModeInfo> kModeMap; static const std::map<int32_t, ModeInfo> kModeMap;
int32_t mDefaultModeId; int32_t mDefaultModeId;

28
livedisplay/lineage.livedisplay@2.0-service.oneplus_kona.rc
View file

@ -1,8 +1,18 @@
on init on init
chmod 0660 /sys/devices/platform/soc/ae00000.qcom,mdss_mdp/main_display/display_mode chown system graphics /sys/class/drm/card0-DSI-1/DCI_P3
chmod 0660 /sys/devices/platform/soc/ae00000.qcom,mdss_mdp/main_display/hbm chown system graphics /sys/class/drm/card0-DSI-1/hbm
chown system system /sys/devices/platform/soc/ae00000.qcom,mdss_mdp/main_display/display_mode chown system graphics /sys/class/drm/card0-DSI-1/night_mode
chown system system /sys/devices/platform/soc/ae00000.qcom,mdss_mdp/main_display/hbm chown system graphics /sys/class/drm/card0-DSI-1/native_display_loading_effect_mode
chown system graphics /sys/class/drm/card0-DSI-1/native_display_p3_mode
chown system graphics /sys/class/drm/card0-DSI-1/native_display_srgb_color_mode
chown system graphics /sys/class/drm/card0-DSI-1/native_display_wide_color_mode
chmod 0666 /sys/class/drm/card0-DSI-1/DCI_P3
chmod 0666 /sys/class/drm/card0-DSI-1/hbm
chmod 0666 /sys/class/drm/card0-DSI-1/night_mode
chmod 0666 /sys/class/drm/card0-DSI-1/native_display_loading_effect_mode
chmod 0666 /sys/class/drm/card0-DSI-1/native_display_p3_mode
chmod 0666 /sys/class/drm/card0-DSI-1/native_display_srgb_color_mode
chmod 0666 /sys/class/drm/card0-DSI-1/native_display_wide_color_mode
on post-fs-data on post-fs-data
mkdir /data/misc/display 0770 system graphics mkdir /data/misc/display 0770 system graphics
@ -11,3 +21,13 @@ service livedisplay-hal-2-0 /system/bin/hw/lineage.livedisplay@2.0-service.onepl
class hal class hal
user system user system
group system group system
on property:sys.boot_completed=1
write /sys/class/drm/card0-DSI-1/DCI_P3 0
write /sys/class/drm/card0-DSI-1/hbm 0
write /sys/class/drm/card0-DSI-1/night_mode 0
write /sys/class/drm/card0-DSI-1/native_display_loading_effect_mode 0
write /sys/class/drm/card0-DSI-1/native_display_p3_mode 0
write /sys/class/drm/card0-DSI-1/native_display_srgb_color_mode 0
write /sys/class/drm/card0-DSI-1/native_display_wide_color_mode 0
write /sys/class/drm/card0-DSI-1/${sys.display.mode} 1

10
sepolicy/private/genfs_contexts
View file

@ -1,11 +1,13 @@
# Display # Display
genfscon proc /touchpanel u:object_r:proc_touchpanel:s0 genfscon proc /touchpanel u:object_r:proc_touchpanel:s0
genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/card0-DSI-1/DCI_P3 u:object_r:sysfs_livedisplay_tuneable:s0
genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/card0-DSI-1/dim_alpha u:object_r:sysfs_fod:s0 genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/card0-DSI-1/dim_alpha u:object_r:sysfs_fod:s0
genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/card0-DSI-1/native_display_loading_effect_mode u:object_r:sysfs_livedisplay_tuneable:s0
genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/card0-DSI-1/native_display_p3_mode u:object_r:sysfs_livedisplay_tuneable:s0
genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/card0-DSI-1/native_display_srgb_color_mode u:object_r:sysfs_livedisplay_tuneable:s0
genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/card0-DSI-1/native_display_wide_color_mode u:object_r:sysfs_livedisplay_tuneable:s0
genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/card0-DSI-1/night_mode u:object_r:sysfs_livedisplay_tuneable:s0
genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/card0-DSI-1/op_friginer_print_hbm u:object_r:sysfs_fod:s0 genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/card0-DSI-1/op_friginer_print_hbm u:object_r:sysfs_fod:s0
genfscon sysfs /devices/platform/soc/soc:qcom,dsi-display-primary/display_mode u:object_r:sysfs_livedisplay_tuneable:s0
genfscon sysfs /devices/platform/soc/soc:qcom,dsi-display-primary/hbm u:object_r:sysfs_livedisplay_tuneable:s0
genfscon sysfs /devices/platform/soc/soc:qcom,dsi-display-secondary/display_mode u:object_r:sysfs_livedisplay_tuneable:s0
genfscon sysfs /devices/platform/soc/soc:qcom,dsi-display-secondary/hbm u:object_r:sysfs_livedisplay_tuneable:s0
# Power supply # Power supply
genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-02/c440000.qcom,spmi:qcom,pm8150b@2:qcom,qpnp-smb2/power_supply/dc u:object_r:sysfs_battery_supply:s0 genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-02/c440000.qcom,spmi:qcom,pm8150b@2:qcom,qpnp-smb2/power_supply/dc u:object_r:sysfs_battery_supply:s0

5
sepolicy/private/hal_livedisplay_kona.te
View file

@ -20,4 +20,7 @@ allow hal_livedisplay_kona display_misc_file:dir rw_dir_perms;
allow hal_livedisplay_kona display_misc_file:file create_file_perms; allow hal_livedisplay_kona display_misc_file:file create_file_perms;
# Grant access over LiveDisplay tuneables # Grant access over LiveDisplay tuneables
allow hal_livedisplay_kona sysfs_livedisplay_tuneable:file rw_file_perms; allow hal_livedisplay_kona { sysfs_livedisplay_tuneable sysfs_oem }:file rw_file_perms;
# Allow hal_livedisplay_kona to set config_prop
set_prop(hal_livedisplay_kona, config_prop)

1
sepolicy/private/property_contexts Normal file
View file

@ -0,0 +1 @@
sys.display.mode u:object_r:config_prop:s0