Commit 91ba2c8b authored by Manasi Navare's avatar Manasi Navare
Browse files

drm/i915/dsc: Add a power domain for VDSC on eDP/MIPI DSI 



On Icelake, a separate power well PG2 is created for
VDSC engine used for eDP/MIPI DSI. This patch adds a new
display power domain for Power well 2.

v3:
* Call it POWER_DOMAIN_TRANSCODER_EDP_VDSC (Ville)
* Move it around TRANSCODER power domain defs (Ville)

v2:
* Fix the power well mismatch CI error (Ville)
* Rename as VDSC_PIPE_A (Imre)
* Fix a whitespace (Anusha)
* Fix Comments (Imre)

Cc: Ville Syrjala <ville.syrjala@linux.intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Imre Deak <imre.deak@intel.com>
Signed-off-by: default avatarManasi Navare <manasi.d.navare@intel.com>
Reviewed-by: default avatarVille Syrjala <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181128202628.20238-7-manasi.d.navare@intel.com
parent 2279298d

drivers/gpu/drm/i915/intel_display.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -242,6 +242,7 @@ enum intel_display_power_domain { 
	POWER_DOMAIN_TRANSCODER_B,

	POWER_DOMAIN_TRANSCODER_B,

	POWER_DOMAIN_TRANSCODER_C,

	POWER_DOMAIN_TRANSCODER_C,

	POWER_DOMAIN_TRANSCODER_EDP,

	POWER_DOMAIN_TRANSCODER_EDP,

	POWER_DOMAIN_TRANSCODER_EDP_VDSC,

	POWER_DOMAIN_TRANSCODER_DSI_A,

	POWER_DOMAIN_TRANSCODER_DSI_A,

	POWER_DOMAIN_TRANSCODER_DSI_C,

	POWER_DOMAIN_TRANSCODER_DSI_C,

	POWER_DOMAIN_PORT_DDI_A_LANES,

	POWER_DOMAIN_PORT_DDI_A_LANES,

drivers/gpu/drm/i915/intel_runtime_pm.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -76,6 +76,8 @@ intel_display_power_domain_str(enum intel_display_power_domain domain) 
		return "TRANSCODER_C";

		return "TRANSCODER_C";

	case POWER_DOMAIN_TRANSCODER_EDP:

	case POWER_DOMAIN_TRANSCODER_EDP:

		return "TRANSCODER_EDP";

		return "TRANSCODER_EDP";

	case POWER_DOMAIN_TRANSCODER_EDP_VDSC:

		return "TRANSCODER_EDP_VDSC";

	case POWER_DOMAIN_TRANSCODER_DSI_A:

	case POWER_DOMAIN_TRANSCODER_DSI_A:

		return "TRANSCODER_DSI_A";

		return "TRANSCODER_DSI_A";

	case POWER_DOMAIN_TRANSCODER_DSI_C:

	case POWER_DOMAIN_TRANSCODER_DSI_C:
@@ -2028,9 +2030,9 @@ void intel_display_power_put(struct drm_i915_private *dev_priv, 
	 */

	 */

#define ICL_PW_2_POWER_DOMAINS (			\

#define ICL_PW_2_POWER_DOMAINS (			\

	ICL_PW_3_POWER_DOMAINS |			\

	ICL_PW_3_POWER_DOMAINS |			\

	BIT_ULL(POWER_DOMAIN_TRANSCODER_EDP_VDSC) |		\

	BIT_ULL(POWER_DOMAIN_INIT))

	BIT_ULL(POWER_DOMAIN_INIT))

	/*

	/*

	 * - eDP/DSI VDSC

	 * - KVMR (HW control)

	 * - KVMR (HW control)

	 */

	 */

#define ICL_DISPLAY_DC_OFF_POWER_DOMAINS (		\

#define ICL_DISPLAY_DC_OFF_POWER_DOMAINS (		\

CRA Git | Maintained and supported by SUSTech CRA and CCSE