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

Commit 9895ad03 authored by Daniel Stone's avatar Daniel Stone Committed by Imre Deak
Browse files

drm/i915/pm: Unstatic power_domain_str 



Let us print human-parseable values from the power domain code; upcoming
display code also wants to use it.

This requires moving it out of i915_debugfs.c, as that is only conditionally
compiled.

v2: Move it out of the header.

Signed-off-by: default avatarDaniel Stone <daniels@collabora.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1448034934-11926-1-git-send-email-daniels@collabora.com
parent a7de5506

drivers/gpu/drm/i915/i915_debugfs.c

+1 −66
Original line number Diff line number Diff line
@@ -2685,71 +2685,6 @@ static int i915_runtime_pm_status(struct seq_file *m, void *unused) 
	return 0;

}



static const char *power_domain_str(enum intel_display_power_domain domain)

{

	switch (domain) {

	case POWER_DOMAIN_PIPE_A:

		return "PIPE_A";

	case POWER_DOMAIN_PIPE_B:

		return "PIPE_B";

	case POWER_DOMAIN_PIPE_C:

		return "PIPE_C";

	case POWER_DOMAIN_PIPE_A_PANEL_FITTER:

		return "PIPE_A_PANEL_FITTER";

	case POWER_DOMAIN_PIPE_B_PANEL_FITTER:

		return "PIPE_B_PANEL_FITTER";

	case POWER_DOMAIN_PIPE_C_PANEL_FITTER:

		return "PIPE_C_PANEL_FITTER";

	case POWER_DOMAIN_TRANSCODER_A:

		return "TRANSCODER_A";

	case POWER_DOMAIN_TRANSCODER_B:

		return "TRANSCODER_B";

	case POWER_DOMAIN_TRANSCODER_C:

		return "TRANSCODER_C";

	case POWER_DOMAIN_TRANSCODER_EDP:

		return "TRANSCODER_EDP";

	case POWER_DOMAIN_PORT_DDI_A_LANES:

		return "PORT_DDI_A_LANES";

	case POWER_DOMAIN_PORT_DDI_B_LANES:

		return "PORT_DDI_B_LANES";

	case POWER_DOMAIN_PORT_DDI_C_LANES:

		return "PORT_DDI_C_LANES";

	case POWER_DOMAIN_PORT_DDI_D_LANES:

		return "PORT_DDI_D_LANES";

	case POWER_DOMAIN_PORT_DDI_E_LANES:

		return "PORT_DDI_E_LANES";

	case POWER_DOMAIN_PORT_DSI:

		return "PORT_DSI";

	case POWER_DOMAIN_PORT_CRT:

		return "PORT_CRT";

	case POWER_DOMAIN_PORT_OTHER:

		return "PORT_OTHER";

	case POWER_DOMAIN_VGA:

		return "VGA";

	case POWER_DOMAIN_AUDIO:

		return "AUDIO";

	case POWER_DOMAIN_PLLS:

		return "PLLS";

	case POWER_DOMAIN_AUX_A:

		return "AUX_A";

	case POWER_DOMAIN_AUX_B:

		return "AUX_B";

	case POWER_DOMAIN_AUX_C:

		return "AUX_C";

	case POWER_DOMAIN_AUX_D:

		return "AUX_D";

	case POWER_DOMAIN_GMBUS:

		return "GMBUS";

	case POWER_DOMAIN_MODESET:

		return "MODESET";

	case POWER_DOMAIN_INIT:

		return "INIT";

	default:

		MISSING_CASE(domain);

		return "?";

	}

}



static int i915_power_domain_info(struct seq_file *m, void *unused)

{

	struct drm_info_node *node = m->private;
@@ -2775,7 +2710,7 @@ static int i915_power_domain_info(struct seq_file *m, void *unused) 
				continue;



			seq_printf(m, "  %-23s %d\n",

				 power_domain_str(power_domain),

				 intel_display_power_domain_str(power_domain),

				 power_domains->domain_use_count[power_domain]);

		}

	}

drivers/gpu/drm/i915/intel_drv.h

+2 −0
Original line number Diff line number Diff line
@@ -1412,6 +1412,8 @@ void intel_power_domains_suspend(struct drm_i915_private *dev_priv); 
void skl_pw1_misc_io_init(struct drm_i915_private *dev_priv);

void skl_pw1_misc_io_fini(struct drm_i915_private *dev_priv);

void intel_runtime_pm_enable(struct drm_i915_private *dev_priv);

const char *

intel_display_power_domain_str(enum intel_display_power_domain domain);



bool intel_display_power_is_enabled(struct drm_i915_private *dev_priv,

				    enum intel_display_power_domain domain);

drivers/gpu/drm/i915/intel_runtime_pm.c

+66 −0
Original line number Diff line number Diff line
@@ -65,6 +65,72 @@ 
bool intel_display_power_well_is_enabled(struct drm_i915_private *dev_priv,

				    int power_well_id);



const char *

intel_display_power_domain_str(enum intel_display_power_domain domain)

{

	switch (domain) {

	case POWER_DOMAIN_PIPE_A:

		return "PIPE_A";

	case POWER_DOMAIN_PIPE_B:

		return "PIPE_B";

	case POWER_DOMAIN_PIPE_C:

		return "PIPE_C";

	case POWER_DOMAIN_PIPE_A_PANEL_FITTER:

		return "PIPE_A_PANEL_FITTER";

	case POWER_DOMAIN_PIPE_B_PANEL_FITTER:

		return "PIPE_B_PANEL_FITTER";

	case POWER_DOMAIN_PIPE_C_PANEL_FITTER:

		return "PIPE_C_PANEL_FITTER";

	case POWER_DOMAIN_TRANSCODER_A:

		return "TRANSCODER_A";

	case POWER_DOMAIN_TRANSCODER_B:

		return "TRANSCODER_B";

	case POWER_DOMAIN_TRANSCODER_C:

		return "TRANSCODER_C";

	case POWER_DOMAIN_TRANSCODER_EDP:

		return "TRANSCODER_EDP";

	case POWER_DOMAIN_PORT_DDI_A_LANES:

		return "PORT_DDI_A_LANES";

	case POWER_DOMAIN_PORT_DDI_B_LANES:

		return "PORT_DDI_B_LANES";

	case POWER_DOMAIN_PORT_DDI_C_LANES:

		return "PORT_DDI_C_LANES";

	case POWER_DOMAIN_PORT_DDI_D_LANES:

		return "PORT_DDI_D_LANES";

	case POWER_DOMAIN_PORT_DDI_E_LANES:

		return "PORT_DDI_E_LANES";

	case POWER_DOMAIN_PORT_DSI:

		return "PORT_DSI";

	case POWER_DOMAIN_PORT_CRT:

		return "PORT_CRT";

	case POWER_DOMAIN_PORT_OTHER:

		return "PORT_OTHER";

	case POWER_DOMAIN_VGA:

		return "VGA";

	case POWER_DOMAIN_AUDIO:

		return "AUDIO";

	case POWER_DOMAIN_PLLS:

		return "PLLS";

	case POWER_DOMAIN_AUX_A:

		return "AUX_A";

	case POWER_DOMAIN_AUX_B:

		return "AUX_B";

	case POWER_DOMAIN_AUX_C:

		return "AUX_C";

	case POWER_DOMAIN_AUX_D:

		return "AUX_D";

	case POWER_DOMAIN_GMBUS:

		return "GMBUS";

	case POWER_DOMAIN_INIT:

		return "INIT";

	case POWER_DOMAIN_MODESET:

		return "MODESET";

	default:

		MISSING_CASE(domain);

		return "?";

	}

}



static void intel_power_well_enable(struct drm_i915_private *dev_priv,

				    struct i915_power_well *power_well)

{