Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ab7f432 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drm/msm/dsi-staging: Debugfs node for ULPS status" into dev/msm-4.14-display

parents 4ad1c00c d22536c0

drivers/gpu/drm/msm/dsi-staging/dsi_display.c

+12 −5
Original line number Diff line number Diff line
@@ -1493,16 +1493,23 @@ static int dsi_display_debugfs_init(struct dsi_display *display) 
		}

	}



	if (!debugfs_create_bool("ulps_enable", 0600, dir,

			&display->panel->ulps_enabled)) {

		pr_err("[%s] debugfs create ulps enable file failed\n",

	if (!debugfs_create_bool("ulps_feature_enable", 0600, dir,

			&display->panel->ulps_feature_enabled)) {

		pr_err("[%s] debugfs create ulps feature enable file failed\n",

		       display->name);

		goto error_remove_dir;

	}



	if (!debugfs_create_bool("ulps_suspend_enable", 0600, dir,

	if (!debugfs_create_bool("ulps_suspend_feature_enable", 0600, dir,

			&display->panel->ulps_suspend_enabled)) {

		pr_err("[%s] debugfs create ulps-suspend enable file failed\n",

		pr_err("[%s] debugfs create ulps-suspend feature enable file failed\n",

		       display->name);

		goto error_remove_dir;

	}



	if (!debugfs_create_bool("ulps_status", 0400, dir,

			&display->ulps_enabled)) {

		pr_err("[%s] debugfs create ulps status file failed\n",

		       display->name);

		goto error_remove_dir;

	}

drivers/gpu/drm/msm/dsi-staging/dsi_panel.c

+2 −2
Original line number Diff line number Diff line
@@ -1754,11 +1754,11 @@ static int dsi_panel_parse_misc_features(struct dsi_panel *panel) 
{

	struct dsi_parser_utils *utils = &panel->utils;



	panel->ulps_enabled =

	panel->ulps_feature_enabled =

		utils->read_bool(utils->data, "qcom,ulps-enabled");



	pr_info("%s: ulps feature %s\n", __func__,

		(panel->ulps_enabled ? "enabled" : "disabled"));

		(panel->ulps_feature_enabled ? "enabled" : "disabled"));



	panel->ulps_suspend_enabled =

		utils->read_bool(utils->data, "qcom,suspend-ulps-enabled");

drivers/gpu/drm/msm/dsi-staging/dsi_panel.h

+2 −2
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ struct dsi_panel { 
	struct dsi_parser_utils utils;



	bool lp11_init;

	bool ulps_enabled;

	bool ulps_feature_enabled;

	bool ulps_suspend_enabled;

	bool allow_phy_power_off;

	atomic_t esd_recovery_pending;
@@ -192,7 +192,7 @@ struct dsi_panel { 


static inline bool dsi_panel_ulps_feature_enabled(struct dsi_panel *panel)

{

	return panel->ulps_enabled;

	return panel->ulps_feature_enabled;

}



static inline bool dsi_panel_initialized(struct dsi_panel *panel)