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

Commit 1407121a authored by Satheeshakrishna M's avatar Satheeshakrishna M Committed by Daniel Vetter
Browse files

drm/i915/skl: Adding power domains for AUX controllers 



Adding new power doamins for AUX controllers

v2: Added new power domains in power_domain_str per Imre's comment

v3: Added AUX power domains to older platforms

v4: Rebase on top of POWER_DOMAIN_PLLS.

v5: Modified to address review comments from Imre

Reviewed-by: default avatarImre Deak <imre.deak@intel.com>
Signed-off-by: default avatarSatheeshakrishna M <satheeshakrishna.m@intel.com>
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com> (v3)
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarDamien Lespiau <damien.lespiau@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent f65367b5

drivers/gpu/drm/i915/i915_debugfs.c

+8 −0
Original line number Diff line number Diff line
@@ -2382,6 +2382,14 @@ static const char *power_domain_str(enum intel_display_power_domain domain) 
		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_INIT:

		return "INIT";

	default:

drivers/gpu/drm/i915/i915_drv.h

+4 −0
Original line number Diff line number Diff line
@@ -184,6 +184,10 @@ enum intel_display_power_domain { 
	POWER_DOMAIN_VGA,

	POWER_DOMAIN_AUDIO,

	POWER_DOMAIN_PLLS,

	POWER_DOMAIN_AUX_A,

	POWER_DOMAIN_AUX_B,

	POWER_DOMAIN_AUX_C,

	POWER_DOMAIN_AUX_D,

	POWER_DOMAIN_INIT,



	POWER_DOMAIN_NUM,

drivers/gpu/drm/i915/intel_runtime_pm.c

+15 −0
Original line number Diff line number Diff line
@@ -703,6 +703,10 @@ void intel_display_power_put(struct drm_i915_private *dev_priv, 
	BIT(POWER_DOMAIN_PORT_DDI_D_4_LANES) |		\

	BIT(POWER_DOMAIN_PORT_CRT) |			\

	BIT(POWER_DOMAIN_PLLS) |			\

	BIT(POWER_DOMAIN_AUX_A) |			\

	BIT(POWER_DOMAIN_AUX_B) |			\

	BIT(POWER_DOMAIN_AUX_C) |			\

	BIT(POWER_DOMAIN_AUX_D) |			\

	BIT(POWER_DOMAIN_INIT))

#define HSW_DISPLAY_POWER_DOMAINS (				\

	(POWER_DOMAIN_MASK & ~HSW_ALWAYS_ON_POWER_DOMAINS) |	\
@@ -724,24 +728,30 @@ void intel_display_power_put(struct drm_i915_private *dev_priv, 
	BIT(POWER_DOMAIN_PORT_DDI_C_2_LANES) |	\

	BIT(POWER_DOMAIN_PORT_DDI_C_4_LANES) |	\

	BIT(POWER_DOMAIN_PORT_CRT) |		\

	BIT(POWER_DOMAIN_AUX_B) |		\

	BIT(POWER_DOMAIN_AUX_C) |		\

	BIT(POWER_DOMAIN_INIT))



#define VLV_DPIO_TX_B_LANES_01_POWER_DOMAINS (	\

	BIT(POWER_DOMAIN_PORT_DDI_B_2_LANES) |	\

	BIT(POWER_DOMAIN_PORT_DDI_B_4_LANES) |	\

	BIT(POWER_DOMAIN_AUX_B) |		\

	BIT(POWER_DOMAIN_INIT))



#define VLV_DPIO_TX_B_LANES_23_POWER_DOMAINS (	\

	BIT(POWER_DOMAIN_PORT_DDI_B_4_LANES) |	\

	BIT(POWER_DOMAIN_AUX_B) |		\

	BIT(POWER_DOMAIN_INIT))



#define VLV_DPIO_TX_C_LANES_01_POWER_DOMAINS (	\

	BIT(POWER_DOMAIN_PORT_DDI_C_2_LANES) |	\

	BIT(POWER_DOMAIN_PORT_DDI_C_4_LANES) |	\

	BIT(POWER_DOMAIN_AUX_C) |		\

	BIT(POWER_DOMAIN_INIT))



#define VLV_DPIO_TX_C_LANES_23_POWER_DOMAINS (	\

	BIT(POWER_DOMAIN_PORT_DDI_C_4_LANES) |	\

	BIT(POWER_DOMAIN_AUX_C) |		\

	BIT(POWER_DOMAIN_INIT))



#define CHV_PIPE_A_POWER_DOMAINS (	\
@@ -761,20 +771,25 @@ void intel_display_power_put(struct drm_i915_private *dev_priv, 
	BIT(POWER_DOMAIN_PORT_DDI_B_4_LANES) |	\

	BIT(POWER_DOMAIN_PORT_DDI_C_2_LANES) |	\

	BIT(POWER_DOMAIN_PORT_DDI_C_4_LANES) |	\

	BIT(POWER_DOMAIN_AUX_B) |		\

	BIT(POWER_DOMAIN_AUX_C) |		\

	BIT(POWER_DOMAIN_INIT))



#define CHV_DPIO_CMN_D_POWER_DOMAINS (		\

	BIT(POWER_DOMAIN_PORT_DDI_D_2_LANES) |	\

	BIT(POWER_DOMAIN_PORT_DDI_D_4_LANES) |	\

	BIT(POWER_DOMAIN_AUX_D) |		\

	BIT(POWER_DOMAIN_INIT))



#define CHV_DPIO_TX_D_LANES_01_POWER_DOMAINS (	\

	BIT(POWER_DOMAIN_PORT_DDI_D_2_LANES) |	\

	BIT(POWER_DOMAIN_PORT_DDI_D_4_LANES) |	\

	BIT(POWER_DOMAIN_AUX_D) |		\

	BIT(POWER_DOMAIN_INIT))



#define CHV_DPIO_TX_D_LANES_23_POWER_DOMAINS (	\

	BIT(POWER_DOMAIN_PORT_DDI_D_4_LANES) |	\

	BIT(POWER_DOMAIN_AUX_D) |		\

	BIT(POWER_DOMAIN_INIT))



static const struct i915_power_well_ops i9xx_always_on_power_well_ops = {