drm/i915/ddi: Get AUX power domain for DP main link too
Subsystems (2)
PATCH v2 1/1 drm/i915/ddi: Get AUX power domain for DP main link too
So far we got an AUX power domain reference only for the duration of DP AUX transfers. However, the following suggests that we also need these for main link functionality:
- The specification doesn't state whether it's needed or not for main link functionality, but suggests that these power wells need to be enabled already during display core initialization (Sequences to Initialize Display).
- For PSR we need to keep the AUX power well enabled.
- On ICL combo PHY ports (non-TC) the AUX power well is needed for link training too: while the port is enabled with a DP link training test pattern trying to toggle the AUX power well will time out.
- On ICL MG PHY ports (TC) the AUX power well is needed also for main link functionality (both in DP and HDMI modes).
- Windows enables these power wells both for main and AUX lane functionality.
Based on the above take an AUX power reference for main link functionality too. This makes a difference only on GEN10+ (GLK+) platforms, where we have separate port specific AUX power wells.
For PSR we still need to distinguish between port A and the other ports, since on port A DC states must stay enabled for main link functionality, but DC states must be disabled for driver initiated AUX transfers. So re-use the corresponding helper from intel_psr.c.
Since we take now a rereference for main link functionality on all DP ports we can forgo taking the seperate power ref for PSR functionality.
v2:
- Make sure DC states stay enabled when taking the ref on port A. (Ville)
--- drivers/gpu/drm/i915/intel_ddi.c | 54 ++++++++++++++++++++++++++++++--- drivers/gpu/drm/i915/intel_display.c | 12 +++++++- drivers/gpu/drm/i915/intel_drv.h | 3 +- drivers/gpu/drm/i915/intel_psr.c | 41 ------------------------- drivers/gpu/drm/i915/intel_runtime_pm.c | 1 + 5 files changed, 64 insertions(+), 47 deletions(-)
drivers/gpu/drm/i915/intel_ddi.c +50 -4
@@ -1983,15 +1983,55 @@ bool intel_ddi_get_hw_state(struct intel_encoder *encoder,return ret; } -static u64 intel_ddi_get_power_domains (struct intel_encoder *encoder) +static inline enum intel_display_power_domain +intel_ddi_main_link_aux_domain (struct intel_dp *intel_dp) +{ +/* CNL HW requires corresponding AUX IOs to be powered up for PSR with +* DC states enabled at the same time, while for driver initiated AUX +* transfers we need the same AUX IOs to be powered but with DC states +* disabled. Accordingly use the AUX power domain here which leaves DC +* states enabled. +* However, for non-A AUX ports the corresponding non-EDP transcoders +* would have already enabled power well 2 and DC_OFF. This means we can +* acquire a wider POWER_DOMAIN_AUX_{B,C,D,F} reference instead of a +* specific AUX_IO reference without powering up any extra wells. +* Note that PSR is enabled only on Port A even though this function +* returns the correct domain for other ports too. +*/ +return intel_dp->aux_ch ==AUX_CH_A ?POWER_DOMAIN_AUX_IO_A : + intel_dp->aux_power_domain; +} + +static u64 intel_ddi_get_power_domains (struct intel_encoder *encoder, +struct intel_crtc_state *crtc_state) {struct intel_digital_port *dig_port =enc_to_dig_port (&encoder->base);enum pipe pipe; +u64 domains; -if (intel_ddi_get_hw_state (encoder, &pipe)) -return BIT_ULL (dig_port->ddi_io_power_domain); +if (!intel_ddi_get_hw_state (encoder, &pipe)) +return 0 ; -return 0 ; + domains =BIT_ULL (dig_port->ddi_io_power_domain); +if (!crtc_state) +return domains; + +/* +* TODO: Add support for MST encoders. Atm, the following should never +* happen since this function will be called only for the primary +* encoder which doesn't have its own pipe/crtc_state. +*/ +if (WARN_ON (intel_crtc_has_type (crtc_state,INTEL_OUTPUT_DP_MST ))) +return domains; + +/* AUX power is only needed for (e)DP mode, not for HDMI. */ +if (!intel_crtc_has_type (crtc_state,INTEL_OUTPUT_HDMI )) { +struct intel_dp *intel_dp = &dig_port->dp; + + domains |=BIT_ULL (intel_ddi_main_link_aux_domain (intel_dp)); + } + +return domains; }void intel_ddi_enable_pipe_clock (const struct intel_crtc_state *crtc_state)
@@ -2631,6 +2671,9 @@ static void intel_ddi_pre_enable_dp(struct intel_encoder *encoder,WARN_ON (is_mst && (port ==PORT_A || port ==PORT_E )); +intel_display_power_get (dev_priv, +intel_ddi_main_link_aux_domain (intel_dp)); +intel_dp_set_link_params (intel_dp, crtc_state->port_clock, crtc_state->lane_count, is_mst);
@@ -2775,6 +2818,9 @@ static void intel_ddi_post_disable_dp(struct intel_encoder *encoder,intel_display_power_put (dev_priv, dig_port->ddi_io_power_domain);intel_ddi_clk_disable (encoder); + +intel_display_power_put (dev_priv, +intel_ddi_main_link_aux_domain (intel_dp)); } static void intel_ddi_post_disable_hdmi(struct intel_encoder *encoder,
drivers/gpu/drm/i915/intel_display.c +11 -1
@@ -15676,11 +15676,21 @@ get_encoder_power_domains(struct drm_i915_private *dev_priv)for_each_intel_encoder (&dev_priv->drm, encoder) {u64 get_domains;enum intel_display_power_domain domain; +struct intel_crtc_state *crtc_state;if (!encoder->get_power_domains)continue ; - get_domains = encoder->get_power_domains (encoder); +/* +* In case of a dangling encoder without a crtc we still need +* to get power domain refs. Such encoders will be disabled +* dropping these references. +*/ + crtc_state = encoder->base.crtc ? +to_intel_crtc_state (encoder->base.crtc->state) : +NULL ; + + get_domains = encoder->get_power_domains (encoder, crtc_state);for_each_power_domain (domain, get_domains)intel_display_power_get (dev_priv, domain); }
drivers/gpu/drm/i915/intel_drv.h +2 -1
@@ -254,7 +254,8 @@ struct intel_encoder { struct intel_crtc_state *pipe_config);/* Returns a mask of power domains that need to be referenced as part * of the hardware state readout code. */ -u64 (*get_power_domains)(struct intel_encoder *encoder); +u64 (*get_power_domains)(struct intel_encoder *encoder, +struct intel_crtc_state *crtc_state);/* * Called during system suspend after all pending requests for the * encoder are flushed (for example for DP AUX transactions) and
drivers/gpu/drm/i915/intel_psr.c +0 -41
59 lines not on this page · raw message
drivers/gpu/drm/i915/intel_runtime_pm.c +1 -0
@@ -1824,6 +1824,7 @@ void intel_display_power_put(struct drm_i915_private *dev_priv, BIT_ULL(POWER_DOMAIN_INIT))#define GLK_DISPLAY_AUX_A_POWER_DOMAINS ( \ BIT_ULL(POWER_DOMAIN_AUX_A) | \ + BIT_ULL(POWER_DOMAIN_AUX_IO_A) | \ BIT_ULL(POWER_DOMAIN_INIT))#define GLK_DISPLAY_AUX_B_POWER_DOMAINS ( \ BIT_ULL(POWER_DOMAIN_AUX_B) | \
Signature · 6 lines
2.13.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.CHECKPATCH: warning for drm/i915/ddi: Get AUX power domain for DP main link too
== Series Details ==
== Series Details ==
Series: drm/i915/ddi: Get AUX power domain for DP main link too
URL : https://patchwork.freedesktop.org/series/45188/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip e686fff14a1c drm/i915/ddi: Get AUX power domain for DP main link too -:35: WARNING:TYPO_SPELLING: 'seperate' may be misspelled - perhaps 'separate'? #35: ports we can forgo taking the seperate power ref for PSR functionality.
total: 0 errors, 1 warnings, 0 checks, 174 lines checked
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915/ddi: Get AUX power domain for DP main link too
In reply to Imre Deak== Series Details ==
== Series Details ==
Series: drm/i915/ddi: Get AUX power domain for DP main link too
URL : https://patchwork.freedesktop.org/series/45188/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4362 -> Patchwork_9386 =
== Summary - SUCCESS ==
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/45188/revisions/1/mbox/
== Known issues ==
Here are the changes found in Patchwork_9386 that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@gem_ctx_create@basic-files:
fi-skl-guc: PASS -> DMESG-WARN (fdo#106954)
==== Possible fixes ====
igt@gem_ctx_create@basic-files:
fi-skl-6700k2: INCOMPLETE (fdo#106988) -> PASS fdo#106954 https://bugs.freedesktop.org/show_bug.cgi?id=106954
fdo#106988 https://bugs.freedesktop.org/show_bug.cgi?id=106988
== Participating hosts (42 -> 37) ==
Additional (1): fi-bxt-dsi
Missing (6): fi-ilk-m540 fi-hsw-4200u fi-glk-dsi fi-bsw-cyan fi-ctg-p8600 fi-kbl-x1275
== Build changes ==
* Linux: CI_DRM_4362 -> Patchwork_9386
CI_DRM_4362: 7159c27349b070831dfb3512ca055c8dbcf9e1fc @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4528: 6be300d405de5974b262e8b93a445be4ac618e6a @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9386: e686fff14a1c09cd8625de6fe968c0feea20f97c @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
e686fff14a1c drm/i915/ddi: Get AUX power domain for DP main link too
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9386/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 1/1 drm/i915/ddi: Get AUX power domain for DP main link too
In reply to Imre DeakSo far we got an AUX power domain reference only for the duration of DP AUX transfers. However, the following suggests that we also need these for main link functionality:
- The specification doesn't state whether it's needed or not for main link functionality, but suggests that these power wells need to be enabled already during display core initialization (Sequences to Initialize Display).
- For PSR we need to keep the AUX power well enabled.
- On ICL combo PHY ports (non-TC) the AUX power well is needed for link training too: while the port is enabled with a DP link training test pattern trying to toggle the AUX power well will time out.
- On ICL MG PHY ports (TC) the AUX power well is needed also for main link functionality (both in DP and HDMI modes).
- Windows enables these power wells both for main and AUX lane functionality.
Based on the above take an AUX power reference for main link functionality too. This makes a difference only on GEN10+ (GLK+) platforms, where we have separate port specific AUX power wells.
For PSR we still need to distinguish between port A and the other ports, since on port A DC states must stay enabled for main link functionality, but DC states must be disabled for driver initiated AUX transfers. So re-use the corresponding helper from intel_psr.c.
Since we take now a reference for main link functionality on all DP ports we can forgo taking the separate power ref for PSR functionality.
v2:
- Make sure DC states stay enabled when taking the ref on port A. (Ville)
v3: (Ville)
- Fix comment about logic for encoders without a crtc state and add FIXME note for a simplification to avoid calling get_power_domains in such cases.
- Use intel_crtc_has_dp_encoder() instead !intel_crtc_has_type(HDMI).
--- drivers/gpu/drm/i915/intel_ddi.c | 54 ++++++++++++++++++++++++++++++--- drivers/gpu/drm/i915/intel_display.c | 12 +++++++- drivers/gpu/drm/i915/intel_drv.h | 3 +- drivers/gpu/drm/i915/intel_psr.c | 41 ------------------------- drivers/gpu/drm/i915/intel_runtime_pm.c | 1 + 5 files changed, 64 insertions(+), 47 deletions(-)
drivers/gpu/drm/i915/intel_ddi.c +50 -4
@@ -1983,15 +1983,55 @@ bool intel_ddi_get_hw_state(struct intel_encoder *encoder,return ret; } -static u64 intel_ddi_get_power_domains (struct intel_encoder *encoder) +static inline enum intel_display_power_domain +intel_ddi_main_link_aux_domain (struct intel_dp *intel_dp) +{ +/* CNL HW requires corresponding AUX IOs to be powered up for PSR with +* DC states enabled at the same time, while for driver initiated AUX +* transfers we need the same AUX IOs to be powered but with DC states +* disabled. Accordingly use the AUX power domain here which leaves DC +* states enabled. +* However, for non-A AUX ports the corresponding non-EDP transcoders +* would have already enabled power well 2 and DC_OFF. This means we can +* acquire a wider POWER_DOMAIN_AUX_{B,C,D,F} reference instead of a +* specific AUX_IO reference without powering up any extra wells. +* Note that PSR is enabled only on Port A even though this function +* returns the correct domain for other ports too. +*/ +return intel_dp->aux_ch ==AUX_CH_A ?POWER_DOMAIN_AUX_IO_A : + intel_dp->aux_power_domain; +} + +static u64 intel_ddi_get_power_domains (struct intel_encoder *encoder, +struct intel_crtc_state *crtc_state) {struct intel_digital_port *dig_port =enc_to_dig_port (&encoder->base);enum pipe pipe; +u64 domains; -if (intel_ddi_get_hw_state (encoder, &pipe)) -return BIT_ULL (dig_port->ddi_io_power_domain); +if (!intel_ddi_get_hw_state (encoder, &pipe)) +return 0 ; -return 0 ; + domains =BIT_ULL (dig_port->ddi_io_power_domain); +if (!crtc_state) +return domains; + +/* +* TODO: Add support for MST encoders. Atm, the following should never +* happen since this function will be called only for the primary +* encoder which doesn't have its own pipe/crtc_state. +*/ +if (WARN_ON (intel_crtc_has_type (crtc_state,INTEL_OUTPUT_DP_MST ))) +return domains; + +/* AUX power is only needed for (e)DP mode, not for HDMI. */ +if (intel_crtc_has_dp_encoder (crtc_state)) { +struct intel_dp *intel_dp = &dig_port->dp; + + domains |=BIT_ULL (intel_ddi_main_link_aux_domain (intel_dp)); + } + +return domains; }void intel_ddi_enable_pipe_clock (const struct intel_crtc_state *crtc_state)
@@ -2631,6 +2671,9 @@ static void intel_ddi_pre_enable_dp(struct intel_encoder *encoder,WARN_ON (is_mst && (port ==PORT_A || port ==PORT_E )); +intel_display_power_get (dev_priv, +intel_ddi_main_link_aux_domain (intel_dp)); +intel_dp_set_link_params (intel_dp, crtc_state->port_clock, crtc_state->lane_count, is_mst);
@@ -2775,6 +2818,9 @@ static void intel_ddi_post_disable_dp(struct intel_encoder *encoder,intel_display_power_put (dev_priv, dig_port->ddi_io_power_domain);intel_ddi_clk_disable (encoder); + +intel_display_power_put (dev_priv, +intel_ddi_main_link_aux_domain (intel_dp)); } static void intel_ddi_post_disable_hdmi(struct intel_encoder *encoder,
drivers/gpu/drm/i915/intel_display.c +11 -1
@@ -15676,11 +15676,21 @@ get_encoder_power_domains(struct drm_i915_private *dev_priv)for_each_intel_encoder (&dev_priv->drm, encoder) {u64 get_domains;enum intel_display_power_domain domain; +struct intel_crtc_state *crtc_state;if (!encoder->get_power_domains)continue ; - get_domains = encoder->get_power_domains (encoder); +/* +* For MST and inactive encoders we don't have a crtc state. +* FIXME: no need to call get_power_domains in such cases, it +* will always return 0. +*/ + crtc_state = encoder->base.crtc ? +to_intel_crtc_state (encoder->base.crtc->state) : +NULL ; + + get_domains = encoder->get_power_domains (encoder, crtc_state);for_each_power_domain (domain, get_domains)intel_display_power_get (dev_priv, domain); }
drivers/gpu/drm/i915/intel_drv.h +2 -1
@@ -254,7 +254,8 @@ struct intel_encoder { struct intel_crtc_state *pipe_config);/* Returns a mask of power domains that need to be referenced as part * of the hardware state readout code. */ -u64 (*get_power_domains)(struct intel_encoder *encoder); +u64 (*get_power_domains)(struct intel_encoder *encoder, +struct intel_crtc_state *crtc_state);/* * Called during system suspend after all pending requests for the * encoder are flushed (for example for DP AUX transactions) and
drivers/gpu/drm/i915/intel_psr.c +0 -41
59 lines not on this page · raw message
drivers/gpu/drm/i915/intel_runtime_pm.c +1 -0
@@ -1824,6 +1824,7 @@ void intel_display_power_put(struct drm_i915_private *dev_priv, BIT_ULL(POWER_DOMAIN_INIT))#define GLK_DISPLAY_AUX_A_POWER_DOMAINS ( \ BIT_ULL(POWER_DOMAIN_AUX_A) | \ + BIT_ULL(POWER_DOMAIN_AUX_IO_A) | \ BIT_ULL(POWER_DOMAIN_INIT))#define GLK_DISPLAY_AUX_B_POWER_DOMAINS ( \ BIT_ULL(POWER_DOMAIN_AUX_B) | \
Signature · 6 lines
2.13.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 9 lines · Imre Deak
So far we got an AUX power domain reference only for the duration of DP
AUX transfers. However, the following suggests that we also need these
for main link functionality:
- The specification doesn't state whether it's needed or not for main link functionality, but suggests that these power wells need to be enabled already during display core initialization (Sequences to Initialize Display).
Hmm. The sequence also says "If an Aux channel will not be used, it does not need to be powered up."
Quoted 4 lines
- For PSR we need to keep the AUX power well enabled.
- On ICL combo PHY ports (non-TC) the AUX power well is needed for link training too: while the port is enabled with a DP link training
I don't see this in the spec, is this something you observed?
Quoted 1 line
test pattern trying to toggle the AUX power well will time out.
Can we enable AUX power well before link training starts and disable after we are done training? Is that enough?
Quoted 304 lines
- On ICL MG PHY ports (TC) the AUX power well is needed also for main link functionality (both in DP and HDMI modes).
- Windows enables these power wells both for main and AUX lane functionality.Based on the above take an AUX power reference for main link functionality too. This makes a difference only on GEN10+ (GLK+) platforms, where we have separate port specific AUX power wells.
For PSR we still need to distinguish between port A and the other ports, since on port A DC states must stay enabled for main link functionality, but DC states must be disabled for driver initiated AUX transfers. So re-use the corresponding helper from
intel_psr.c.Since we take now a reference for main link functionality on all DP ports we can forgo taking the separate power ref for PSR functionality.
v2:
- Make sure DC states stay enabled when taking the ref on port A. (Ville)v3: (Ville)
- Fix comment about logic for encoders without a crtc state and add FIXME note for a simplification to avoid callingget_power_domains
in such cases.
- Useintel_crtc_has_dp_encoder()instead !intel_crtc_has_type(HDMI).Cc Ville Syrjälä <[email protected]>Cc Dhinakaran Pandiyan <[email protected]>Cc Paulo Zanoni <[email protected]>Signed-off-by Imre Deak <[email protected]>---
drivers/gpu/drm/i915/intel_ddi.c | 54
++++++++++++++++++++++++++++++---
drivers/gpu/drm/i915/intel_display.c | 12 +++++++- drivers/gpu/drm/i915/intel_drv.h | 3 +- drivers/gpu/drm/i915/intel_psr.c | 41 ---------------------
----
drivers/gpu/drm/i915/intel_runtime_pm.c | 1 +5 files changed, 64 insertions(+), 47 deletions(-)drivers/gpu/drm/i915/intel_ddi.c +0
-0@@ -1983,15 +1983,55 @@ bool intel_ddi_get_hw_state(structintel_encoder *encoder, return ret; }
-static u64intel_ddi_get_power_domains(struct intel_encoder *encoder)drivers/gpu/drm/i915/intel_ddi.c +4
-0+static inline enum intel_display_power_domain +intel_ddi_main_link_aux_domain (struct intel_dp *intel_dp) +{ +/* CNL HW requires corresponding AUX IOs to be powered up for PSR with
drivers/gpu/drm/i915/intel_ddi.c +1
-0+ * DC states enabled at the same time, while for driverinitiated AUX
drivers/gpu/drm/i915/intel_ddi.c +1
-0+ * transfers we need the same AUX IOs to be powered but withDC states
drivers/gpu/drm/i915/intel_ddi.c +1
-0+ * disabled. Accordingly use the AUX power domain here whichleaves DC
drivers/gpu/drm/i915/intel_ddi.c +2
-0+ * states enabled. + * However, for non-A AUX ports the corresponding non-EDPtranscoders
drivers/gpu/drm/i915/intel_ddi.c +1
-0+ * would have already enabled power well 2 and DC_OFF. Thismeans we can
drivers/gpu/drm/i915/intel_ddi.c +1
-0+ * acquire a wider POWER_DOMAIN_AUX_{B,C,D,F} referenceinstead of a
drivers/gpu/drm/i915/intel_ddi.c +1
-0+ * specific AUX_IO reference without powering up any extrawells.
drivers/gpu/drm/i915/intel_ddi.c +1
-0+ * Note that PSR is enabled only on Port A even though thisfunction
drivers/gpu/drm/i915/intel_ddi.c +3
-0+* returns the correct domain for other ports too. +*/ + return intel_dp->aux_ch == AUX_CH_A ? POWER_DOMAIN_AUX_IO_A:
drivers/gpu/drm/i915/intel_ddi.c +1
-0+ intel_dp-Quoted 1 line
aux_power_domain;drivers/gpu/drm/i915/intel_ddi.c +3
-0+} + +static u64 intel_ddi_get_power_domains(struct intel_encoder*encoder,
drivers/gpu/drm/i915/intel_ddi.c +1
-0+ struct intel_crtc_state
*crtc_state)
{
structintel_digital_port*dig_port=enc_to_dig_port(&encoder->base);
enum pipe pipe;drivers/gpu/drm/i915/intel_ddi.c +1
-0+u64 domains;drivers/gpu/drm/i915/intel_ddi.c +2
-2-if (intel_ddi_get_hw_state (encoder, &pipe)) -return BIT_ULL (dig_port->ddi_io_power_domain); +if (!intel_ddi_get_hw_state (encoder, &pipe)) +return 0 ;drivers/gpu/drm/i915/intel_ddi.c +6
-1-return 0 ; + domains =BIT_ULL (dig_port->ddi_io_power_domain); +if (!crtc_state) +return domains; + +/* +* TODO: Add support for MST encoders. Atm, the following should never
drivers/gpu/drm/i915/intel_ddi.c +1
-0+ * happen since this function will be called only for theprimary
drivers/gpu/drm/i915/intel_ddi.c +3
-0+* encoder which doesn't have its own pipe/crtc_state. +*/ + if (WARN_ON(intel_crtc_has_type(crtc_state,
INTEL_OUTPUT_DP_MST)))drivers/gpu/drm/i915/intel_ddi.c +7
-0+return domains; + +/* AUX power is only needed for (e)DP mode, not for HDMI. */ +if (intel_crtc_has_dp_encoder (crtc_state)) { +struct intel_dp *intel_dp = &dig_port->dp; + + domains |=BIT_ULL(intel_ddi_main_link_aux_domain(intel_dp));
drivers/gpu/drm/i915/intel_ddi.c +3
-0+ } + +return domains;}
voidintel_ddi_enable_pipe_clock(const struct intel_crtc_state *crtc_state)drivers/gpu/drm/i915/intel_ddi.c +0
-0@@ -2631,6 +2671,9 @@ static void intel_ddi_pre_enable_dp(struct intel_encoder *encoder,
WARN_ON(is_mst && (port == PORT_A || port == PORT_E));drivers/gpu/drm/i915/intel_ddi.c +2
-0+ intel_display_power_get(dev_priv, + intel_ddi_main_link_aux_domain(intel
_dp));
+
intel_dp_set_link_params(intel_dp, crtc_state->port_clock, crtc_state->lane_count, is_mst);drivers/gpu/drm/i915/intel_ddi.c +0
-0@@ -2775,6 +2818,9 @@ static void intel_ddi_post_disable_dp(struct intel_encoder *encoder,intel_display_power_put(dev_priv, dig_port-
Quoted 1 line
ddi_io_power_domain);
intel_ddi_clk_disable(encoder);drivers/gpu/drm/i915/intel_ddi.c +3
-0+ + intel_display_power_put(dev_priv, + intel_ddi_main_link_aux_domain(intel
_dp));
}
static void intel_ddi_post_disable_hdmi(structintel_encoder*encoder,drivers/gpu/drm/i915/intel_display.c +1
-0@@ -15676,11 +15676,21 @@ get_encoder_power_domains(struct drm_i915_private *dev_priv) for_each_intel_encoder(&dev_priv->drm, encoder) { u64 get_domains; enum intel_display_power_domain domain; +struct intel_crtc_state *crtc_state;
if (!encoder->get_power_domains)
continue;drivers/gpu/drm/i915/intel_display.c +2
-1- get_domains = encoder->get_power_domains (encoder); +/* +* For MST and inactive encoders we don't have a crtc state.
drivers/gpu/drm/i915/intel_display.c +1
-0+ * FIXME: no need to call get_power_domains in suchcases, it
drivers/gpu/drm/i915/intel_display.c +4
-0+* will always return 0. +*/ + crtc_state = encoder->base.crtc ? + to_intel_crtc_state(encoder->base.crtc-Quoted 1 line
state) :
drivers/gpu/drm/i915/intel_display.c +3
-0+ NULL; + + get_domains = encoder->get_power_domains(encoder,
crtc_state);
for_each_power_domain(domain, get_domains)intel_display_power_get(dev_priv, domain); }drivers/gpu/drm/i915/intel_drv.h +0
-0@@ -254,7 +254,8 @@ struct intel_encoder { struct intel_crtc_state *pipe_config); /* Returns a mask of power domains that need to bereferenced as part
* of the hardware state readout code. */drivers/gpu/drm/i915/intel_drv.h +2
-1-u64 (*get_power_domains)(struct intel_encoder *encoder); +u64 (*get_power_domains)(struct intel_encoder *encoder, + struct intel_crtc_state
*crtc_state);
/*
* Called during system suspend after all pending requests for the
* encoder are flushed (for example for DP AUX transactions) anddrivers/gpu/drm/i915/intel_psr.c +0
-0@@ -56,43 +56,6 @@ #include "intel_drv.h" #include "i915_drv.h"drivers/gpu/drm/i915/intel_psr.c +0
-4-static inline enum intel_display_power_domain -psr_aux_domain (struct intel_dp *intel_dp) -{ -/* CNL HW requires corresponding AUX IOs to be powered up for PSR.
drivers/gpu/drm/i915/intel_psr.c +0
-1- * However, for non-A AUX ports the corresponding non-EDPtranscoders
drivers/gpu/drm/i915/intel_psr.c +0
-1- * would have already enabled power well 2 and DC_OFF. Thismeans we can
drivers/gpu/drm/i915/intel_psr.c +0
-1- * acquire a wider POWER_DOMAIN_AUX_{B,C,D,F} referenceinstead of a
drivers/gpu/drm/i915/intel_psr.c +0
-1- * specific AUX_IO reference without powering up any extrawells.
drivers/gpu/drm/i915/intel_psr.c +0
-1- * Note that PSR is enabled only on Port A even though thisfunction
drivers/gpu/drm/i915/intel_psr.c +0
-3-* returns the correct domain for other ports too. -*/ - return intel_dp->aux_ch == AUX_CH_A ? POWER_DOMAIN_AUX_IO_A:
drivers/gpu/drm/i915/intel_psr.c +0
-1- intel_dp-Quoted 1 line
aux_power_domain;drivers/gpu/drm/i915/intel_psr.c +0
-5-} - -static void psr_aux_io_power_get (struct intel_dp *intel_dp) -{ - struct intel_digital_port *intel_dig_port =
dp_to_dig_port(intel_dp);drivers/gpu/drm/i915/intel_psr.c +0
-1- struct drm_i915_private *dev_priv = to_i915(intel_dig_port-Quoted 1 line
base.base.dev);
drivers/gpu/drm/i915/intel_psr.c +0
-10- -if (INTEL_GEN (dev_priv) <10 ) -return ; - -intel_display_power_get (dev_priv,psr_aux_domain (intel_dp)); -} - -static void psr_aux_io_power_put (struct intel_dp *intel_dp) -{ - struct intel_digital_port *intel_dig_port =
dp_to_dig_port(intel_dp);drivers/gpu/drm/i915/intel_psr.c +0
-1- struct drm_i915_private *dev_priv = to_i915(intel_dig_port-Quoted 1 line
base.base.dev);
drivers/gpu/drm/i915/intel_psr.c +0
-7- -if (INTEL_GEN (dev_priv) <10 ) -return ; - -intel_display_power_put (dev_priv,psr_aux_domain (intel_dp)); -} -void
intel_psr_irq_control(struct drm_i915_private *dev_priv, bool debug)
{
u32debug_mask, mask;drivers/gpu/drm/i915/intel_psr.c +0
-0@@ -595,8 +558,6 @@ static void hsw_psr_enable_source(struct intel_dp *intel_dp, struct drm_i915_private *dev_priv = to_i915(dev); enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;drivers/gpu/drm/i915/intel_psr.c +0
-2-psr_aux_io_power_get (intel_dp); -/* Only HSW and BDW have PSR AUX registers that need to be setup. SKL+
* use hardcoded values PSR AUX transactions
*/drivers/gpu/drm/i915/intel_psr.c +0
-0@@ -717,8 +678,6 @@ static void hsw_psr_disable(struct intel_dp *intel_dp,else
WARN_ON(I915_READ(EDP_PSR_CTL) & EDP_PSR_ENABLE);
}drivers/gpu/drm/i915/intel_psr.c +0
-2- -psr_aux_io_power_put (intel_dp);}
/**drivers/gpu/drm/i915/intel_runtime_pm.c +1
-0@@ -1824,6 +1824,7 @@ void intel_display_power_put(struct drm_i915_private *dev_priv, BIT_ULL(POWER_DOMAIN_INIT)) #define GLK_DISPLAY_AUX_A_POWER_DOMAINS ( \ BIT_ULL(POWER_DOMAIN_AUX_A) | \ + BIT_ULL(POWER_DOMAIN_AUX_IO_A) | \ BIT_ULL(POWER_DOMAIN_INIT)) #define GLK_DISPLAY_AUX_B_POWER_DOMAINS ( \
Quoted 1 line
BIT_ULL(POWER_DOMAIN_AUX_B)| \
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 10 lines · Dhinakaran Pandiyan
Quoted 9 lines · Imre Deak
So far we got an AUX power domain reference only for the duration of DP
AUX transfers. However, the following suggests that we also need these
for main link functionality:
- The specification doesn't state whether it's needed or not for main link functionality, but suggests that these power wells need to be enabled already during display core initialization (Sequences to Initialize Display).
Quoted 2 lines
Hmm. The sequence also says "If an Aux channel will not be used, it does not need to be powered up."
Well, I consider that hints at not using the port at all for DP, since for DP you will need AUX.
Quoted 6 lines
Quoted 5 lines
- For PSR we need to keep the AUX power well enabled.
- On ICL combo PHY ports (non-TC) the AUX power well is needed for link training too: while the port is enabled with a DP link trainingI don't see this in the spec, is this something you observed?
Yes.
Quoted 5 lines
Quoted 2 lines
test pattern trying to toggle the AUX power well will time out.
Can we enable AUX power well before link training starts and disable after we are done training? Is that enough?
That was my first idea too, but given the rest of the points I consider it a safer option to enable it for main link functionality.
Quoted 298 lines
Quoted 298 lines
- On ICL MG PHY ports (TC) the AUX power well is needed also for main link functionality (both in DP and HDMI modes).
- Windows enables these power wells both for main and AUX lane functionality.Based on the above take an AUX power reference for main link functionality too. This makes a difference only on GEN10+ (GLK+) platforms, where we have separate port specific AUX power wells.
For PSR we still need to distinguish between port A and the other ports, since on port A DC states must stay enabled for main link functionality, but DC states must be disabled for driver initiated AUX transfers. So re-use the corresponding helper from
intel_psr.c.Since we take now a reference for main link functionality on all DP ports we can forgo taking the separate power ref for PSR functionality.
v2:
- Make sure DC states stay enabled when taking the ref on port A. (Ville)v3: (Ville)
- Fix comment about logic for encoders without a crtc state and add FIXME note for a simplification to avoid callingget_power_domains
in such cases.
- Useintel_crtc_has_dp_encoder()instead !intel_crtc_has_type(HDMI).Cc Ville Syrjälä <[email protected]>Cc Dhinakaran Pandiyan <[email protected]>Cc Paulo Zanoni <[email protected]>Signed-off-by Imre Deak <[email protected]>---
drivers/gpu/drm/i915/intel_ddi.c | 54
++++++++++++++++++++++++++++++---
drivers/gpu/drm/i915/intel_display.c | 12 +++++++- drivers/gpu/drm/i915/intel_drv.h | 3 +- drivers/gpu/drm/i915/intel_psr.c | 41 ---------------------
----
drivers/gpu/drm/i915/intel_runtime_pm.c | 1 +5 files changed, 64 insertions(+), 47 deletions(-)drivers/gpu/drm/i915/intel_ddi.c +0
-0@@ -1983,15 +1983,55 @@ bool intel_ddi_get_hw_state(structintel_encoder *encoder, return ret; }
-static u64intel_ddi_get_power_domains(struct intel_encoder *encoder)drivers/gpu/drm/i915/intel_ddi.c +4
-0+static inline enum intel_display_power_domain +intel_ddi_main_link_aux_domain (struct intel_dp *intel_dp) +{ +/* CNL HW requires corresponding AUX IOs to be powered up for PSR with
drivers/gpu/drm/i915/intel_ddi.c +1
-0+ * DC states enabled at the same time, while for driverinitiated AUX
drivers/gpu/drm/i915/intel_ddi.c +1
-0+ * transfers we need the same AUX IOs to be powered but withDC states
drivers/gpu/drm/i915/intel_ddi.c +1
-0+ * disabled. Accordingly use the AUX power domain here whichleaves DC
drivers/gpu/drm/i915/intel_ddi.c +2
-0+ * states enabled. + * However, for non-A AUX ports the corresponding non-EDPtranscoders
drivers/gpu/drm/i915/intel_ddi.c +1
-0+ * would have already enabled power well 2 and DC_OFF. Thismeans we can
drivers/gpu/drm/i915/intel_ddi.c +1
-0+ * acquire a wider POWER_DOMAIN_AUX_{B,C,D,F} referenceinstead of a
drivers/gpu/drm/i915/intel_ddi.c +1
-0+ * specific AUX_IO reference without powering up any extrawells.
drivers/gpu/drm/i915/intel_ddi.c +1
-0+ * Note that PSR is enabled only on Port A even though thisfunction
drivers/gpu/drm/i915/intel_ddi.c +3
-0+* returns the correct domain for other ports too. +*/ + return intel_dp->aux_ch == AUX_CH_A ? POWER_DOMAIN_AUX_IO_A:
drivers/gpu/drm/i915/intel_ddi.c +1
-0+ intel_dp-Quoted 1 line
aux_power_domain;drivers/gpu/drm/i915/intel_ddi.c +3
-0+} + +static u64 intel_ddi_get_power_domains(struct intel_encoder*encoder,
drivers/gpu/drm/i915/intel_ddi.c +1
-0+ struct intel_crtc_state
*crtc_state)
{
structintel_digital_port*dig_port=enc_to_dig_port(&encoder->base);
enum pipe pipe;drivers/gpu/drm/i915/intel_ddi.c +1
-0+u64 domains;drivers/gpu/drm/i915/intel_ddi.c +2
-2-if (intel_ddi_get_hw_state (encoder, &pipe)) -return BIT_ULL (dig_port->ddi_io_power_domain); +if (!intel_ddi_get_hw_state (encoder, &pipe)) +return 0 ;drivers/gpu/drm/i915/intel_ddi.c +6
-1-return 0 ; + domains =BIT_ULL (dig_port->ddi_io_power_domain); +if (!crtc_state) +return domains; + +/* +* TODO: Add support for MST encoders. Atm, the following should never
drivers/gpu/drm/i915/intel_ddi.c +1
-0+ * happen since this function will be called only for theprimary
drivers/gpu/drm/i915/intel_ddi.c +3
-0+* encoder which doesn't have its own pipe/crtc_state. +*/ + if (WARN_ON(intel_crtc_has_type(crtc_state,
INTEL_OUTPUT_DP_MST)))drivers/gpu/drm/i915/intel_ddi.c +7
-0+return domains; + +/* AUX power is only needed for (e)DP mode, not for HDMI. */ +if (intel_crtc_has_dp_encoder (crtc_state)) { +struct intel_dp *intel_dp = &dig_port->dp; + + domains |=BIT_ULL(intel_ddi_main_link_aux_domain(intel_dp));
drivers/gpu/drm/i915/intel_ddi.c +3
-0+ } + +return domains;}
voidintel_ddi_enable_pipe_clock(const struct intel_crtc_state *crtc_state)drivers/gpu/drm/i915/intel_ddi.c +0
-0@@ -2631,6 +2671,9 @@ static void intel_ddi_pre_enable_dp(struct intel_encoder *encoder,
WARN_ON(is_mst && (port == PORT_A || port == PORT_E));drivers/gpu/drm/i915/intel_ddi.c +2
-0+ intel_display_power_get(dev_priv, + intel_ddi_main_link_aux_domain(intel
_dp));
+
intel_dp_set_link_params(intel_dp, crtc_state->port_clock, crtc_state->lane_count, is_mst);drivers/gpu/drm/i915/intel_ddi.c +0
-0@@ -2775,6 +2818,9 @@ static void intel_ddi_post_disable_dp(struct intel_encoder *encoder,intel_display_power_put(dev_priv, dig_port-
Quoted 1 line
ddi_io_power_domain);
intel_ddi_clk_disable(encoder);drivers/gpu/drm/i915/intel_ddi.c +3
-0+ + intel_display_power_put(dev_priv, + intel_ddi_main_link_aux_domain(intel
_dp));
}
static void intel_ddi_post_disable_hdmi(structintel_encoder*encoder,drivers/gpu/drm/i915/intel_display.c +1
-0@@ -15676,11 +15676,21 @@ get_encoder_power_domains(struct drm_i915_private *dev_priv) for_each_intel_encoder(&dev_priv->drm, encoder) { u64 get_domains; enum intel_display_power_domain domain; +struct intel_crtc_state *crtc_state;
if (!encoder->get_power_domains)
continue;drivers/gpu/drm/i915/intel_display.c +2
-1- get_domains = encoder->get_power_domains (encoder); +/* +* For MST and inactive encoders we don't have a crtc state.
drivers/gpu/drm/i915/intel_display.c +1
-0+ * FIXME: no need to call get_power_domains in suchcases, it
drivers/gpu/drm/i915/intel_display.c +4
-0+* will always return 0. +*/ + crtc_state = encoder->base.crtc ? + to_intel_crtc_state(encoder->base.crtc-Quoted 1 line
state) :
drivers/gpu/drm/i915/intel_display.c +3
-0+ NULL; + + get_domains = encoder->get_power_domains(encoder,
crtc_state);
for_each_power_domain(domain, get_domains)intel_display_power_get(dev_priv, domain); }drivers/gpu/drm/i915/intel_drv.h +0
-0@@ -254,7 +254,8 @@ struct intel_encoder { struct intel_crtc_state *pipe_config); /* Returns a mask of power domains that need to bereferenced as part
* of the hardware state readout code. */drivers/gpu/drm/i915/intel_drv.h +2
-1-u64 (*get_power_domains)(struct intel_encoder *encoder); +u64 (*get_power_domains)(struct intel_encoder *encoder, + struct intel_crtc_state
*crtc_state);
/*
* Called during system suspend after all pending requests for the
* encoder are flushed (for example for DP AUX transactions) anddrivers/gpu/drm/i915/intel_psr.c +0
-0@@ -56,43 +56,6 @@ #include "intel_drv.h" #include "i915_drv.h"drivers/gpu/drm/i915/intel_psr.c +0
-4-static inline enum intel_display_power_domain -psr_aux_domain (struct intel_dp *intel_dp) -{ -/* CNL HW requires corresponding AUX IOs to be powered up for PSR.
drivers/gpu/drm/i915/intel_psr.c +0
-1- * However, for non-A AUX ports the corresponding non-EDPtranscoders
drivers/gpu/drm/i915/intel_psr.c +0
-1- * would have already enabled power well 2 and DC_OFF. Thismeans we can
drivers/gpu/drm/i915/intel_psr.c +0
-1- * acquire a wider POWER_DOMAIN_AUX_{B,C,D,F} referenceinstead of a
drivers/gpu/drm/i915/intel_psr.c +0
-1- * specific AUX_IO reference without powering up any extrawells.
drivers/gpu/drm/i915/intel_psr.c +0
-1- * Note that PSR is enabled only on Port A even though thisfunction
drivers/gpu/drm/i915/intel_psr.c +0
-3-* returns the correct domain for other ports too. -*/ - return intel_dp->aux_ch == AUX_CH_A ? POWER_DOMAIN_AUX_IO_A:
drivers/gpu/drm/i915/intel_psr.c +0
-1- intel_dp-Quoted 1 line
aux_power_domain;drivers/gpu/drm/i915/intel_psr.c +0
-5-} - -static void psr_aux_io_power_get (struct intel_dp *intel_dp) -{ - struct intel_digital_port *intel_dig_port =
dp_to_dig_port(intel_dp);drivers/gpu/drm/i915/intel_psr.c +0
-1- struct drm_i915_private *dev_priv = to_i915(intel_dig_port-Quoted 1 line
base.base.dev);
drivers/gpu/drm/i915/intel_psr.c +0
-10- -if (INTEL_GEN (dev_priv) <10 ) -return ; - -intel_display_power_get (dev_priv,psr_aux_domain (intel_dp)); -} - -static void psr_aux_io_power_put (struct intel_dp *intel_dp) -{ - struct intel_digital_port *intel_dig_port =
dp_to_dig_port(intel_dp);drivers/gpu/drm/i915/intel_psr.c +0
-1- struct drm_i915_private *dev_priv = to_i915(intel_dig_port-Quoted 1 line
base.base.dev);
drivers/gpu/drm/i915/intel_psr.c +0
-7- -if (INTEL_GEN (dev_priv) <10 ) -return ; - -intel_display_power_put (dev_priv,psr_aux_domain (intel_dp)); -} -void
intel_psr_irq_control(struct drm_i915_private *dev_priv, bool debug)
{
u32debug_mask, mask;drivers/gpu/drm/i915/intel_psr.c +0
-0@@ -595,8 +558,6 @@ static void hsw_psr_enable_source(struct intel_dp *intel_dp, struct drm_i915_private *dev_priv = to_i915(dev); enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;drivers/gpu/drm/i915/intel_psr.c +0
-2-psr_aux_io_power_get (intel_dp); -/* Only HSW and BDW have PSR AUX registers that need to be setup. SKL+
* use hardcoded values PSR AUX transactions
*/drivers/gpu/drm/i915/intel_psr.c +0
-0@@ -717,8 +678,6 @@ static void hsw_psr_disable(struct intel_dp *intel_dp,else
WARN_ON(I915_READ(EDP_PSR_CTL) & EDP_PSR_ENABLE);
}drivers/gpu/drm/i915/intel_psr.c +0
-2- -psr_aux_io_power_put (intel_dp);}
/**drivers/gpu/drm/i915/intel_runtime_pm.c +0
-0@@ -1824,6 +1824,7 @@ void intel_display_power_put(struct
Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/i915/intel_runtime_pm.c +1
-0drm_i915_private *dev_priv, BIT_ULL(POWER_DOMAIN_INIT)) #define GLK_DISPLAY_AUX_A_POWER_DOMAINS ( \ BIT_ULL(POWER_DOMAIN_AUX_A) | \ + BIT_ULL(POWER_DOMAIN_AUX_IO_A) | \ BIT_ULL(POWER_DOMAIN_INIT)) #define GLK_DISPLAY_AUX_B_POWER_DOMAINS ( \
BIT_ULL(POWER_DOMAIN_AUX_B)| \
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 17 lines · Imre Deak
Quoted 16 lines · Dhinakaran Pandiyan
Quoted 14 lines · Imre Deak
So far we got an AUX power domain reference only for the duration of
DP
AUX transfers. However, the following suggests that we also need these
for main link functionality:
- The specification doesn't state whether it's needed or not for main
link functionality, but suggests that these power wells need to be
enabled already during display core initialization (Sequences to
Initialize Display).
Quoted 6 lines
Quoted 2 lines
Hmm. The sequence also says "If an Aux channel will not be used, it does not need to be powered up."
Well, I consider that hints at not using the port at all for DP, since
for DP you will need AUX.
I also see an instruction to "set PORT_CL_DW12_<port letter> Lane Enable Aux to 1b" for aux channels on combo ports. A quick check shows the register is not defined in the driver. My concern is we might be missing a step for combo ports.
Quoted 372 lines
Quoted 9 lines
Quoted 8 lines
- For PSR we need to keep the AUX power well enabled.
- On ICL combo PHY ports (non-TC) the AUX power well is needed for
link training too: while the port is enabled with a DP link trainingI don't see this in the spec, is this something you observed?
Yes.
Quoted 7 lines
Quoted 4 lines
test pattern trying to toggle the AUX power well will time out.
Can we enable AUX power well before link training starts and disable
after we are done training? Is that enough?That was my first idea too, but given the rest of the points I consider
it a safer option to enable it for main link functionality.Quoted 350 lines
Quoted 350 lines
- On ICL MG PHY ports (TC) the AUX power well is needed also for main
link functionality (both in DP and HDMI modes).
- Windows enables these power wells both for main and AUX lane functionality.Based on the above take an AUX power reference for main link functionality too. This makes a difference only on GEN10+ (GLK+) platforms, where we have separate port specific AUX power wells.
For PSR we still need to distinguish between port A and the other ports, since on port A DC states must stay enabled for main link functionality, but DC states must be disabled for driver initiated
AUX transfers. So re-use the corresponding helper fromintel_psr.c.Since we take now a reference for main link functionality on all DP
ports we can forgo taking the separate power ref for PSR functionality.v2:
- Make sure DC states stay enabled when taking the ref on port A. (Ville)v3: (Ville)
- Fix comment about logic for encoders without a crtc state and add FIXME note for a simplification to avoid callingget_power_domains
in such cases.
- Useintel_crtc_has_dp_encoder()instead !intel_crtc_has_type(HDMI).Cc Ville Syrjälä <[email protected]>Cc Dhinakaran Pandiyan <[email protected]>Cc Paulo Zanoni <[email protected]>Signed-off-by Imre Deak <[email protected]>---
drivers/gpu/drm/i915/intel_ddi.c | 54
++++++++++++++++++++++++++++++---
drivers/gpu/drm/i915/intel_display.c | 12 +++++++- drivers/gpu/drm/i915/intel_drv.h | 3 +- drivers/gpu/drm/i915/intel_psr.c | 41 -----------------
----
----
drivers/gpu/drm/i915/intel_runtime_pm.c | 1 +5 files changed, 64 insertions(+), 47 deletions(-)drivers/gpu/drm/i915/intel_ddi.c +0
-0@@ -1983,15 +1983,55 @@ bool intel_ddi_get_hw_state(structintel_encoder *encoder, return ret; }
-static u64intel_ddi_get_power_domains(struct intel_encoder *encoder)drivers/gpu/drm/i915/intel_ddi.c +4
-0+static inline enum intel_display_power_domain +intel_ddi_main_link_aux_domain (struct intel_dp *intel_dp) +{ +/* CNL HW requires corresponding AUX IOs to be powered up
for PSR withdrivers/gpu/drm/i915/intel_ddi.c +1
-0+ * DC states enabled at the same time, while for driverinitiated AUX
drivers/gpu/drm/i915/intel_ddi.c +1
-0+ * transfers we need the same AUX IOs to be powered butwith
DC statesdrivers/gpu/drm/i915/intel_ddi.c +1
-0+ * disabled. Accordingly use the AUX power domain herewhich
leaves DCdrivers/gpu/drm/i915/intel_ddi.c +2
-0+ * states enabled. + * However, for non-A AUX ports the corresponding non-EDP
transcodersdrivers/gpu/drm/i915/intel_ddi.c +1
-0+ * would have already enabled power well 2 and DC_OFF.This
means we candrivers/gpu/drm/i915/intel_ddi.c +1
-0+ * acquire a wider POWER_DOMAIN_AUX_{B,C,D,F} referenceinstead of a
drivers/gpu/drm/i915/intel_ddi.c +1
-0+ * specific AUX_IO reference without powering up anyextra
wells.drivers/gpu/drm/i915/intel_ddi.c +1
-0+ * Note that PSR is enabled only on Port A even thoughthis
functiondrivers/gpu/drm/i915/intel_ddi.c +3
-0+* returns the correct domain for other ports too. +*/ + return intel_dp->aux_ch == AUX_CH_A ?
POWER_DOMAIN_AUX_IO_A
:drivers/gpu/drm/i915/intel_ddi.c +1
-0+ intel_dp-Quoted 2 lines
aux_power_domain;drivers/gpu/drm/i915/intel_ddi.c +3
-0+} + +static u64 intel_ddi_get_power_domains(struct intel_encoder*encoder,
drivers/gpu/drm/i915/intel_ddi.c +1
-0+ struct intel_crtc_state
*crtc_state)
{
structintel_digital_port*dig_port=enc_to_dig_port(&encoder->base);
enum pipe pipe;drivers/gpu/drm/i915/intel_ddi.c +1
-0+u64 domains;drivers/gpu/drm/i915/intel_ddi.c +2
-2-if (intel_ddi_get_hw_state (encoder, &pipe)) -return BIT_ULL (dig_port->ddi_io_power_domain); +if (!intel_ddi_get_hw_state (encoder, &pipe)) +return 0 ;drivers/gpu/drm/i915/intel_ddi.c +6
-1-return 0 ; + domains =BIT_ULL (dig_port->ddi_io_power_domain); +if (!crtc_state) +return domains; + +/* +* TODO: Add support for MST encoders. Atm, the following
should neverdrivers/gpu/drm/i915/intel_ddi.c +1
-0+ * happen since this function will be called only forthe
primarydrivers/gpu/drm/i915/intel_ddi.c +3
-0+* encoder which doesn't have its own pipe/crtc_state. +*/ + if (WARN_ON(intel_crtc_has_type(crtc_state,
INTEL_OUTPUT_DP_MST)))drivers/gpu/drm/i915/intel_ddi.c +3
-0+return domains; + +/* AUX power is only needed for (e)DP mode, not for HDMI. */
drivers/gpu/drm/i915/intel_ddi.c +4
-0+if (intel_crtc_has_dp_encoder (crtc_state)) { +struct intel_dp *intel_dp = &dig_port->dp; + + domains |=BIT_ULL(intel_ddi_main_link_aux_domain(intel_dp));
drivers/gpu/drm/i915/intel_ddi.c +3
-0+ } + +return domains;}
voidintel_ddi_enable_pipe_clock(const struct intel_crtc_state *crtc_state)drivers/gpu/drm/i915/intel_ddi.c +0
-0@@ -2631,6 +2671,9 @@ static void intel_ddi_pre_enable_dp(struct intel_encoder *encoder,
WARN_ON(is_mst && (port == PORT_A || port == PORT_E));drivers/gpu/drm/i915/intel_ddi.c +2
-0+ intel_display_power_get(dev_priv, + intel_ddi_main_link_aux_domain(intel
_dp));
+
intel_dp_set_link_params(intel_dp, crtc_state-Quoted 1 line
port_clock,crtc_state->lane_count,
is_mst);drivers/gpu/drm/i915/intel_ddi.c +0
-0@@ -2775,6 +2818,9 @@ static voidintel_ddi_post_disable_dp(struct
intel_encoder*encoder, intel_display_power_put(dev_priv, dig_port-Quoted 2 lines
ddi_io_power_domain);
intel_ddi_clk_disable(encoder);drivers/gpu/drm/i915/intel_ddi.c +3
-0+ + intel_display_power_put(dev_priv, + intel_ddi_main_link_aux_domain(intel
_dp));
}
static void intel_ddi_post_disable_hdmi(structintel_encoder*encoder,drivers/gpu/drm/i915/intel_display.c +1
-0@@ -15676,11 +15676,21 @@ get_encoder_power_domains(struct drm_i915_private *dev_priv) for_each_intel_encoder(&dev_priv->drm, encoder) { u64 get_domains; enum intel_display_power_domain domain; +struct intel_crtc_state *crtc_state;
if (!encoder->get_power_domains)
continue;drivers/gpu/drm/i915/intel_display.c +0
-1- get_domains = encoder-Quoted 1 line
get_power_domains(encoder);drivers/gpu/drm/i915/intel_display.c +2
-0+/* +* For MST and inactive encoders we don't have a crtc state.
drivers/gpu/drm/i915/intel_display.c +1
-0+ * FIXME: no need to call get_power_domains insuch
cases, itdrivers/gpu/drm/i915/intel_display.c +4
-0+* will always return 0. +*/ + crtc_state = encoder->base.crtc ? + to_intel_crtc_state(encoder-Quoted 3 lines
base.crtc-
state) :
drivers/gpu/drm/i915/intel_display.c +3
-0+ NULL; + + get_domains = encoder-Quoted 1 line
get_power_domains(encoder,
crtc_state);
for_each_power_domain(domain, get_domains)intel_display_power_get(dev_priv, domain);
}drivers/gpu/drm/i915/intel_drv.h +0
-0@@ -254,7 +254,8 @@ struct intel_encoder {struct
intel_crtc_state*pipe_config);
/* Returns a mask of power domains that need to be referenced as part
* of the hardware state readout code. */drivers/gpu/drm/i915/intel_drv.h +2
-1-u64 (*get_power_domains)(struct intel_encoder *encoder); +u64 (*get_power_domains)(struct intel_encoder *encoder, + struct intel_crtc_state
*crtc_state);
/*
* Called during system suspend after all pending requests
for the
* encoder are flushed (for example for DP AUX transactions)
anddrivers/gpu/drm/i915/intel_psr.c +0
-0@@ -56,43 +56,6 @@ #include "intel_drv.h" #include "i915_drv.h"drivers/gpu/drm/i915/intel_psr.c +0
-4-static inline enum intel_display_power_domain -psr_aux_domain (struct intel_dp *intel_dp) -{ -/* CNL HW requires corresponding AUX IOs to be powered up
for PSR.drivers/gpu/drm/i915/intel_psr.c +0
-1- * However, for non-A AUX ports the corresponding non-EDP
transcodersdrivers/gpu/drm/i915/intel_psr.c +0
-1- * would have already enabled power well 2 and DC_OFF.This
means we candrivers/gpu/drm/i915/intel_psr.c +0
-1- * acquire a wider POWER_DOMAIN_AUX_{B,C,D,F} referenceinstead of a
drivers/gpu/drm/i915/intel_psr.c +0
-1- * specific AUX_IO reference without powering up anyextra
wells.drivers/gpu/drm/i915/intel_psr.c +0
-1- * Note that PSR is enabled only on Port A even thoughthis
functiondrivers/gpu/drm/i915/intel_psr.c +0
-3-* returns the correct domain for other ports too. -*/ - return intel_dp->aux_ch == AUX_CH_A ?
POWER_DOMAIN_AUX_IO_A
:drivers/gpu/drm/i915/intel_psr.c +0
-1- intel_dp-Quoted 2 lines
aux_power_domain;drivers/gpu/drm/i915/intel_psr.c +0
-5-} - -static void psr_aux_io_power_get (struct intel_dp *intel_dp) -{ - struct intel_digital_port *intel_dig_port =
dp_to_dig_port(intel_dp);drivers/gpu/drm/i915/intel_psr.c +0
-1- struct drm_i915_private *dev_priv =to_i915(intel_dig_port-
Quoted 2 lines
base.base.dev);
drivers/gpu/drm/i915/intel_psr.c +0
-5- -if (INTEL_GEN (dev_priv) <10 ) -return ; - - intel_display_power_get(dev_priv,
psr_aux_domain(intel_dp));drivers/gpu/drm/i915/intel_psr.c +0
-5-} - -static void psr_aux_io_power_put (struct intel_dp *intel_dp) -{ - struct intel_digital_port *intel_dig_port =
dp_to_dig_port(intel_dp);drivers/gpu/drm/i915/intel_psr.c +0
-1- struct drm_i915_private *dev_priv =to_i915(intel_dig_port-
Quoted 2 lines
base.base.dev);
drivers/gpu/drm/i915/intel_psr.c +0
-5- -if (INTEL_GEN (dev_priv) <10 ) -return ; - - intel_display_power_put(dev_priv,
psr_aux_domain(intel_dp));drivers/gpu/drm/i915/intel_psr.c +0
-2-} -void intel_psr_irq_control(struct
drm_i915_private*dev_priv, bool
debug)
{
u32debug_mask, mask;drivers/gpu/drm/i915/intel_psr.c +0
-0@@ -595,8 +558,6 @@ static void hsw_psr_enable_source(struct
intel_dp*intel_dp,
structdrm_i915_private*dev_priv=to_i915(dev); enum transcodercpu_transcoder= crtc_state-Quoted 1 line
cpu_transcoder;drivers/gpu/drm/i915/intel_psr.c +0
-2-psr_aux_io_power_get (intel_dp); -/* Only HSW and BDW have PSR AUX registers that need to be
setup. SKL+
* use hardcoded values PSR AUX transactions */drivers/gpu/drm/i915/intel_psr.c +0
-0@@ -717,8 +678,6 @@ static void hsw_psr_disable(struct intel_dp *intel_dp,else
WARN_ON(I915_READ(EDP_PSR_CTL) & EDP_PSR_ENABLE);
}drivers/gpu/drm/i915/intel_psr.c +0
-2- -psr_aux_io_power_put (intel_dp);}
/**drivers/gpu/drm/i915/intel_runtime_pm.c +0
-0@@ -1824,6 +1824,7 @@ void intel_display_power_put(struct
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/i915/intel_runtime_pm.c +1
-0drm_i915_private *dev_priv, BIT_ULL(POWER_DOMAIN_INIT)) #define GLK_DISPLAY_AUX_A_POWER_DOMAINS ( \ BIT_ULL(POWER_DOMAIN_AUX_A) | \ + BIT_ULL(POWER_DOMAIN_AUX_IO_A) | \ BIT_ULL(POWER_DOMAIN_INIT)) #define GLK_DISPLAY_AUX_B_POWER_DOMAINS ( \
BIT_ULL(POWER_DOMAIN_AUX_B)| \
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 25 lines · Dhinakaran Pandiyan
Quoted 17 lines · Imre Deak
Quoted 16 lines · Dhinakaran Pandiyan
Quoted 14 lines · Imre Deak
So far we got an AUX power domain reference only for the duration of
DP
AUX transfers. However, the following suggests that we also need these
for main link functionality:
- The specification doesn't state whether it's needed or not for main
link functionality, but suggests that these power wells need to be
enabled already during display core initialization (Sequences to
Initialize Display).Quoted 6 lines
Quoted 2 lines
Hmm. The sequence also says "If an Aux channel will not be used, it does not need to be powered up."
Well, I consider that hints at not using the port at all for DP, since
for DP you will need AUX.
Quoted 4 lines
I also see an instruction to "set PORT_CL_DW12_<port letter> Lane Enable Aux to 1b" for aux channels on combo ports. A quick check shows the register is not defined in the driver. My concern is we might be missing a step for combo ports.
It is added in the ICL power well enabling patch (see internal branch), and is something I tested the above scenario with.
Quoted 374 lines
Quoted 374 lines
Quoted 11 lines
Quoted 10 lines
- For PSR we need to keep the AUX power well enabled.
- On ICL combo PHY ports (non-TC) the AUX power well is needed for
link training too: while the port is enabled with a DP link trainingI don't see this in the spec, is this something you observed?
Yes.
Quoted 7 lines
Quoted 4 lines
test pattern trying to toggle the AUX power well will time out.
Can we enable AUX power well before link training starts and disable
after we are done training? Is that enough?That was my first idea too, but given the rest of the points I consider
it a safer option to enable it for main link functionality.Quoted 350 lines
Quoted 350 lines
- On ICL MG PHY ports (TC) the AUX power well is needed also for main
link functionality (both in DP and HDMI modes).
- Windows enables these power wells both for main and AUX lane functionality.Based on the above take an AUX power reference for main link functionality too. This makes a difference only on GEN10+ (GLK+) platforms, where we have separate port specific AUX power wells.
For PSR we still need to distinguish between port A and the other ports, since on port A DC states must stay enabled for main link functionality, but DC states must be disabled for driver initiated
AUX transfers. So re-use the corresponding helper fromintel_psr.c.Since we take now a reference for main link functionality on all DP
ports we can forgo taking the separate power ref for PSR functionality.v2:
- Make sure DC states stay enabled when taking the ref on port A. (Ville)v3: (Ville)
- Fix comment about logic for encoders without a crtc state and add FIXME note for a simplification to avoid callingget_power_domains
in such cases.
- Useintel_crtc_has_dp_encoder()instead !intel_crtc_has_type(HDMI).Cc Ville Syrjälä <[email protected]>Cc Dhinakaran Pandiyan <[email protected]>Cc Paulo Zanoni <[email protected]>Signed-off-by Imre Deak <[email protected]>---
drivers/gpu/drm/i915/intel_ddi.c | 54
++++++++++++++++++++++++++++++---
drivers/gpu/drm/i915/intel_display.c | 12 +++++++- drivers/gpu/drm/i915/intel_drv.h | 3 +- drivers/gpu/drm/i915/intel_psr.c | 41 -----------------
----
----
drivers/gpu/drm/i915/intel_runtime_pm.c | 1 +5 files changed, 64 insertions(+), 47 deletions(-)drivers/gpu/drm/i915/intel_ddi.c +0
-0@@ -1983,15 +1983,55 @@ bool intel_ddi_get_hw_state(structintel_encoder *encoder, return ret; }
-static u64intel_ddi_get_power_domains(struct intel_encoder *encoder)drivers/gpu/drm/i915/intel_ddi.c +4
-0+static inline enum intel_display_power_domain +intel_ddi_main_link_aux_domain (struct intel_dp *intel_dp) +{ +/* CNL HW requires corresponding AUX IOs to be powered up
for PSR withdrivers/gpu/drm/i915/intel_ddi.c +1
-0+ * DC states enabled at the same time, while for driverinitiated AUX
drivers/gpu/drm/i915/intel_ddi.c +1
-0+ * transfers we need the same AUX IOs to be powered butwith
DC statesdrivers/gpu/drm/i915/intel_ddi.c +1
-0+ * disabled. Accordingly use the AUX power domain herewhich
leaves DCdrivers/gpu/drm/i915/intel_ddi.c +2
-0+ * states enabled. + * However, for non-A AUX ports the corresponding non-EDP
transcodersdrivers/gpu/drm/i915/intel_ddi.c +1
-0+ * would have already enabled power well 2 and DC_OFF.This
means we candrivers/gpu/drm/i915/intel_ddi.c +1
-0+ * acquire a wider POWER_DOMAIN_AUX_{B,C,D,F} referenceinstead of a
drivers/gpu/drm/i915/intel_ddi.c +1
-0+ * specific AUX_IO reference without powering up anyextra
wells.drivers/gpu/drm/i915/intel_ddi.c +1
-0+ * Note that PSR is enabled only on Port A even thoughthis
functiondrivers/gpu/drm/i915/intel_ddi.c +3
-0+* returns the correct domain for other ports too. +*/ + return intel_dp->aux_ch == AUX_CH_A ?
POWER_DOMAIN_AUX_IO_A
:drivers/gpu/drm/i915/intel_ddi.c +1
-0+ intel_dp-Quoted 2 lines
aux_power_domain;drivers/gpu/drm/i915/intel_ddi.c +3
-0+} + +static u64 intel_ddi_get_power_domains(struct intel_encoder*encoder,
drivers/gpu/drm/i915/intel_ddi.c +1
-0+ struct intel_crtc_state
*crtc_state)
{
structintel_digital_port*dig_port=enc_to_dig_port(&encoder->base);
enum pipe pipe;drivers/gpu/drm/i915/intel_ddi.c +1
-0+u64 domains;drivers/gpu/drm/i915/intel_ddi.c +2
-2-if (intel_ddi_get_hw_state (encoder, &pipe)) -return BIT_ULL (dig_port->ddi_io_power_domain); +if (!intel_ddi_get_hw_state (encoder, &pipe)) +return 0 ;drivers/gpu/drm/i915/intel_ddi.c +6
-1-return 0 ; + domains =BIT_ULL (dig_port->ddi_io_power_domain); +if (!crtc_state) +return domains; + +/* +* TODO: Add support for MST encoders. Atm, the following
should neverdrivers/gpu/drm/i915/intel_ddi.c +1
-0+ * happen since this function will be called only forthe
primarydrivers/gpu/drm/i915/intel_ddi.c +3
-0+* encoder which doesn't have its own pipe/crtc_state. +*/ + if (WARN_ON(intel_crtc_has_type(crtc_state,
INTEL_OUTPUT_DP_MST)))drivers/gpu/drm/i915/intel_ddi.c +3
-0+return domains; + +/* AUX power is only needed for (e)DP mode, not for HDMI. */
drivers/gpu/drm/i915/intel_ddi.c +4
-0+if (intel_crtc_has_dp_encoder (crtc_state)) { +struct intel_dp *intel_dp = &dig_port->dp; + + domains |=BIT_ULL(intel_ddi_main_link_aux_domain(intel_dp));
drivers/gpu/drm/i915/intel_ddi.c +3
-0+ } + +return domains;}
voidintel_ddi_enable_pipe_clock(const struct intel_crtc_state *crtc_state)drivers/gpu/drm/i915/intel_ddi.c +0
-0@@ -2631,6 +2671,9 @@ static void intel_ddi_pre_enable_dp(struct intel_encoder *encoder,
WARN_ON(is_mst && (port == PORT_A || port == PORT_E));drivers/gpu/drm/i915/intel_ddi.c +2
-0+ intel_display_power_get(dev_priv, + intel_ddi_main_link_aux_domain(intel
_dp));
+
intel_dp_set_link_params(intel_dp, crtc_state-Quoted 1 line
port_clock,crtc_state->lane_count,
is_mst);drivers/gpu/drm/i915/intel_ddi.c +0
-0@@ -2775,6 +2818,9 @@ static voidintel_ddi_post_disable_dp(struct
intel_encoder*encoder, intel_display_power_put(dev_priv, dig_port-Quoted 2 lines
ddi_io_power_domain);
intel_ddi_clk_disable(encoder);drivers/gpu/drm/i915/intel_ddi.c +3
-0+ + intel_display_power_put(dev_priv, + intel_ddi_main_link_aux_domain(intel
_dp));
}
static void intel_ddi_post_disable_hdmi(structintel_encoder*encoder,drivers/gpu/drm/i915/intel_display.c +1
-0@@ -15676,11 +15676,21 @@ get_encoder_power_domains(struct drm_i915_private *dev_priv) for_each_intel_encoder(&dev_priv->drm, encoder) { u64 get_domains; enum intel_display_power_domain domain; +struct intel_crtc_state *crtc_state;
if (!encoder->get_power_domains)
continue;drivers/gpu/drm/i915/intel_display.c +0
-1- get_domains = encoder-Quoted 1 line
get_power_domains(encoder);drivers/gpu/drm/i915/intel_display.c +2
-0+/* +* For MST and inactive encoders we don't have a crtc state.
drivers/gpu/drm/i915/intel_display.c +1
-0+ * FIXME: no need to call get_power_domains insuch
cases, itdrivers/gpu/drm/i915/intel_display.c +4
-0+* will always return 0. +*/ + crtc_state = encoder->base.crtc ? + to_intel_crtc_state(encoder-Quoted 3 lines
base.crtc-
state) :
drivers/gpu/drm/i915/intel_display.c +3
-0+ NULL; + + get_domains = encoder-Quoted 1 line
get_power_domains(encoder,
crtc_state);
for_each_power_domain(domain, get_domains)intel_display_power_get(dev_priv, domain);
}drivers/gpu/drm/i915/intel_drv.h +0
-0@@ -254,7 +254,8 @@ struct intel_encoder {struct
intel_crtc_state*pipe_config);
/* Returns a mask of power domains that need to be referenced as part
* of the hardware state readout code. */drivers/gpu/drm/i915/intel_drv.h +2
-1-u64 (*get_power_domains)(struct intel_encoder *encoder); +u64 (*get_power_domains)(struct intel_encoder *encoder, + struct intel_crtc_state
*crtc_state);
/*
* Called during system suspend after all pending requests
for the
* encoder are flushed (for example for DP AUX transactions)
anddrivers/gpu/drm/i915/intel_psr.c +0
-0@@ -56,43 +56,6 @@ #include "intel_drv.h" #include "i915_drv.h"drivers/gpu/drm/i915/intel_psr.c +0
-4-static inline enum intel_display_power_domain -psr_aux_domain (struct intel_dp *intel_dp) -{ -/* CNL HW requires corresponding AUX IOs to be powered up
for PSR.drivers/gpu/drm/i915/intel_psr.c +0
-1- * However, for non-A AUX ports the corresponding non-EDP
transcodersdrivers/gpu/drm/i915/intel_psr.c +0
-1- * would have already enabled power well 2 and DC_OFF.This
means we candrivers/gpu/drm/i915/intel_psr.c +0
-1- * acquire a wider POWER_DOMAIN_AUX_{B,C,D,F} referenceinstead of a
drivers/gpu/drm/i915/intel_psr.c +0
-1- * specific AUX_IO reference without powering up anyextra
wells.drivers/gpu/drm/i915/intel_psr.c +0
-1- * Note that PSR is enabled only on Port A even thoughthis
functiondrivers/gpu/drm/i915/intel_psr.c +0
-3-* returns the correct domain for other ports too. -*/ - return intel_dp->aux_ch == AUX_CH_A ?
POWER_DOMAIN_AUX_IO_A
:drivers/gpu/drm/i915/intel_psr.c +0
-1- intel_dp-Quoted 2 lines
aux_power_domain;drivers/gpu/drm/i915/intel_psr.c +0
-5-} - -static void psr_aux_io_power_get (struct intel_dp *intel_dp) -{ - struct intel_digital_port *intel_dig_port =
dp_to_dig_port(intel_dp);drivers/gpu/drm/i915/intel_psr.c +0
-1- struct drm_i915_private *dev_priv =to_i915(intel_dig_port-
Quoted 2 lines
base.base.dev);
drivers/gpu/drm/i915/intel_psr.c +0
-5- -if (INTEL_GEN (dev_priv) <10 ) -return ; - - intel_display_power_get(dev_priv,
psr_aux_domain(intel_dp));drivers/gpu/drm/i915/intel_psr.c +0
-5-} - -static void psr_aux_io_power_put (struct intel_dp *intel_dp) -{ - struct intel_digital_port *intel_dig_port =
dp_to_dig_port(intel_dp);drivers/gpu/drm/i915/intel_psr.c +0
-1- struct drm_i915_private *dev_priv =to_i915(intel_dig_port-
Quoted 2 lines
base.base.dev);
drivers/gpu/drm/i915/intel_psr.c +0
-5- -if (INTEL_GEN (dev_priv) <10 ) -return ; - - intel_display_power_put(dev_priv,
psr_aux_domain(intel_dp));drivers/gpu/drm/i915/intel_psr.c +0
-2-} -void intel_psr_irq_control(struct
drm_i915_private*dev_priv, bool
debug)
{
u32debug_mask, mask;drivers/gpu/drm/i915/intel_psr.c +0
-0@@ -595,8 +558,6 @@ static void hsw_psr_enable_source(struct
intel_dp*intel_dp,
structdrm_i915_private*dev_priv=to_i915(dev); enum transcodercpu_transcoder= crtc_state-Quoted 1 line
cpu_transcoder;drivers/gpu/drm/i915/intel_psr.c +0
-2-psr_aux_io_power_get (intel_dp); -/* Only HSW and BDW have PSR AUX registers that need to be
setup. SKL+
* use hardcoded values PSR AUX transactions */drivers/gpu/drm/i915/intel_psr.c +0
-0@@ -717,8 +678,6 @@ static void hsw_psr_disable(struct intel_dp *intel_dp,else
WARN_ON(I915_READ(EDP_PSR_CTL) & EDP_PSR_ENABLE);
}drivers/gpu/drm/i915/intel_psr.c +0
-2- -psr_aux_io_power_put (intel_dp);}
/**drivers/gpu/drm/i915/intel_runtime_pm.c +0
-0@@ -1824,6 +1824,7 @@ void intel_display_power_put(struct
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/i915/intel_runtime_pm.c +1
-0drm_i915_private *dev_priv, BIT_ULL(POWER_DOMAIN_INIT)) #define GLK_DISPLAY_AUX_A_POWER_DOMAINS ( \ BIT_ULL(POWER_DOMAIN_AUX_A) | \ + BIT_ULL(POWER_DOMAIN_AUX_IO_A) | \ BIT_ULL(POWER_DOMAIN_INIT)) #define GLK_DISPLAY_AUX_B_POWER_DOMAINS ( \
BIT_ULL(POWER_DOMAIN_AUX_B)| \
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 43 lines · Imre Deak
So far we got an AUX power domain reference only for the duration of DP
AUX transfers. However, the following suggests that we also need these
for main link functionality:
- The specification doesn't state whether it's needed or not for main link functionality, but suggests that these power wells need to be enabled already during display core initialization (Sequences to Initialize Display).
- For PSR we need to keep the AUX power well enabled.
- On ICL combo PHY ports (non-TC) the AUX power well is needed for link training too: while the port is enabled with a DP link
training
test pattern trying to toggle the AUX power well will time out.
- On ICL MG PHY ports (TC) the AUX power well is needed also for main link functionality (both in DP and HDMI modes).
- Windows enables these power wells both for main and AUX lane functionality.Based on the above take an AUX power reference for main link functionality too. This makes a difference only on GEN10+ (GLK+) platforms, where we have separate port specific AUX power wells.
For PSR we still need to distinguish between port A and the other ports, since on port A DC states must stay enabled for main link functionality, but DC states must be disabled for driver initiated AUX transfers. So re-use the corresponding helper from
intel_psr.c.Since we take now a reference for main link functionality on all DP ports we can forgo taking the separate power ref for PSR functionality.
v2:
- Make sure DC states stay enabled when taking the ref on port A. (Ville)v3: (Ville)
- Fix comment about logic for encoders without a crtc state and add FIXME note for a simplification to avoid callingget_power_domains
in such cases.
- Useintel_crtc_has_dp_encoder()instead !intel_crtc_has_type(HDMI).
Quoted 4 lines
Cc Ville Syrjälä <[email protected]>Cc Dhinakaran Pandiyan <[email protected]>Cc Paulo Zanoni <[email protected]>Signed-off-by Imre Deak <[email protected]>
The spec is not clear but this fix the "aux power well" enable timeouts that I was getting in aux B so looks like your interpretation is right.
Quoted 271 lines
--- drivers/gpu/drm/i915/intel_ddi.c | 54 ++++++++++++++++++++++++++++++--- drivers/gpu/drm/i915/intel_display.c | 12 +++++++- drivers/gpu/drm/i915/intel_drv.h | 3 +- drivers/gpu/drm/i915/intel_psr.c | 41 --------------------- ---- drivers/gpu/drm/i915/intel_runtime_pm.c | 1 + 5 files changed, 64 insertions(+), 47 deletions(-)drivers/gpu/drm/i915/intel_ddi.c +4
-1@@ -1983,15 +1983,55 @@ bool intel_ddi_get_hw_state(structintel_encoder *encoder, return ret; } -static u64 intel_ddi_get_power_domains (struct intel_encoder *encoder) +static inline enum intel_display_power_domain +intel_ddi_main_link_aux_domain (struct intel_dp *intel_dp) +{ +/* CNL HW requires corresponding AUX IOs to be powered up for PSR with
drivers/gpu/drm/i915/intel_ddi.c +1
-0+* DC states enabled at the same time, while for driver initiated AUX
drivers/gpu/drm/i915/intel_ddi.c +1
-0+* transfers we need the same AUX IOs to be powered but with DC states
drivers/gpu/drm/i915/intel_ddi.c +1
-0+* disabled. Accordingly use the AUX power domain here which leaves DC
drivers/gpu/drm/i915/intel_ddi.c +2
-0+* states enabled. +* However, for non-A AUX ports the corresponding non-EDP transcoders
drivers/gpu/drm/i915/intel_ddi.c +1
-0+* would have already enabled power well 2 and DC_OFF. This means we can
drivers/gpu/drm/i915/intel_ddi.c +1
-0+* acquire a wider POWER_DOMAIN_AUX_{B,C,D,F} reference instead of a
drivers/gpu/drm/i915/intel_ddi.c +1
-0+* specific AUX_IO reference without powering up any extra wells.
drivers/gpu/drm/i915/intel_ddi.c +1
-0+* Note that PSR is enabled only on Port A even though this function
drivers/gpu/drm/i915/intel_ddi.c +3
-0+* returns the correct domain for other ports too. +*/ + return intel_dp->aux_ch == AUX_CH_A ? POWER_DOMAIN_AUX_IO_A:
drivers/gpu/drm/i915/intel_ddi.c +1
-0+ intel_dp-Quoted 1 line
aux_power_domain;drivers/gpu/drm/i915/intel_ddi.c +3
-0+} + +static u64 intel_ddi_get_power_domains(struct intel_encoder*encoder,
drivers/gpu/drm/i915/intel_ddi.c +1
-0+struct intel_crtc_state
*crtc_state)
{
structintel_digital_port*dig_port=enc_to_dig_port(&encoder->base);drivers/gpu/drm/i915/intel_ddi.c +9
-3enum pipe pipe; +u64 domains; -if (intel_ddi_get_hw_state (encoder, &pipe)) -return BIT_ULL (dig_port->ddi_io_power_domain); +if (!intel_ddi_get_hw_state (encoder, &pipe)) +return 0 ; -return 0 ; + domains =BIT_ULL (dig_port->ddi_io_power_domain); +if (!crtc_state) +return domains; + +/* +* TODO: Add support for MST encoders. Atm, the following should never
drivers/gpu/drm/i915/intel_ddi.c +1
-0+* happen since this function will be called only for the primary
drivers/gpu/drm/i915/intel_ddi.c +3
-0+* encoder which doesn't have its own pipe/crtc_state. +*/ + if (WARN_ON(intel_crtc_has_type(crtc_state,
INTEL_OUTPUT_DP_MST)))drivers/gpu/drm/i915/intel_ddi.c +7
-0+return domains; + +/* AUX power is only needed for (e)DP mode, not for HDMI. */ +if (intel_crtc_has_dp_encoder (crtc_state)) { +struct intel_dp *intel_dp = &dig_port->dp; + + domains |=BIT_ULL(intel_ddi_main_link_aux_domain(intel_dp));
drivers/gpu/drm/i915/intel_ddi.c +3
-0+ } + +return domains; } void intel_ddi_enable_pipe_clock(const struct intel_crtc_state
*crtc_state)drivers/gpu/drm/i915/intel_ddi.c +3
-0@@ -2631,6 +2671,9 @@ static void intel_ddi_pre_enable_dp(struct intel_encoder *encoder,WARN_ON (is_mst && (port ==PORT_A || port ==PORT_E )); +intel_display_power_get (dev_priv, +intel_ddi_main_link_aux_domain (intel _dp)); + intel_dp_set_link_params(intel_dp, crtc_state->port_clock,drivers/gpu/drm/i915/intel_ddi.c +3
-0crtc_state->lane_count, is_mst);@@ -2775,6 +2818,9 @@ static void intel_ddi_post_disable_dp(struct intel_encoder *encoder,intel_display_power_put (dev_priv, dig_port- >ddi_io_power_domain);intel_ddi_clk_disable (encoder); + +intel_display_power_put (dev_priv, +intel_ddi_main_link_aux_domain (intel _dp));}
static void intel_ddi_post_disable_hdmi(struct
intel_encoder
*encoder,drivers/gpu/drm/i915/intel_display.c +3
-1@@ -15676,11 +15676,21 @@ get_encoder_power_domains(struct drm_i915_private *dev_priv)for_each_intel_encoder (&dev_priv->drm, encoder) {u64 get_domains;enum intel_display_power_domain domain; +struct intel_crtc_state *crtc_state;if (!encoder->get_power_domains)continue ; - get_domains = encoder->get_power_domains (encoder); +/* +* For MST and inactive encoders we don't have a crtc state.
drivers/gpu/drm/i915/intel_display.c +1
-0+* FIXME: no need to call get_power_domains in such cases, it
drivers/gpu/drm/i915/intel_display.c +4
-0+* will always return 0. +*/ + crtc_state = encoder->base.crtc ? + to_intel_crtc_state(encoder->base.crtc-Quoted 1 line
state) :
drivers/gpu/drm/i915/intel_display.c +3
-0+NULL ; + + get_domains = encoder->get_power_domains(encoder,
crtc_state);drivers/gpu/drm/i915/intel_display.c +0
-0for_each_power_domain (domain, get_domains)intel_display_power_get (dev_priv, domain); }drivers/gpu/drm/i915/intel_drv.h +0
-0@@ -254,7 +254,8 @@ struct intel_encoder { struct intel_crtc_state *pipe_config);/* Returns a mask of power domains that need to be referenced as part
drivers/gpu/drm/i915/intel_drv.h +2
-1* of the hardware state readout code. */ -u64 (*get_power_domains)(struct intel_encoder *encoder); +u64 (*get_power_domains)(struct intel_encoder *encoder, + struct intel_crtc_state
*crtc_state);drivers/gpu/drm/i915/intel_drv.h +0
-0/* * Called during system suspend after all pending requests for the
* encoder are flushed (for example for DP AUX transactions)
anddrivers/gpu/drm/i915/intel_psr.c +0
-4@@ -56,43 +56,6 @@#include "intel_drv.h" #include "i915_drv.h" -static inline enum intel_display_power_domain -psr_aux_domain (struct intel_dp *intel_dp) -{ -/* CNL HW requires corresponding AUX IOs to be powered up for PSR.
drivers/gpu/drm/i915/intel_psr.c +0
-1-* However, for non-A AUX ports the corresponding non-EDP transcoders
drivers/gpu/drm/i915/intel_psr.c +0
-1-* would have already enabled power well 2 and DC_OFF. This means we can
drivers/gpu/drm/i915/intel_psr.c +0
-1-* acquire a wider POWER_DOMAIN_AUX_{B,C,D,F} reference instead of a
drivers/gpu/drm/i915/intel_psr.c +0
-1-* specific AUX_IO reference without powering up any extra wells.
drivers/gpu/drm/i915/intel_psr.c +0
-1-* Note that PSR is enabled only on Port A even though this function
drivers/gpu/drm/i915/intel_psr.c +0
-3-* returns the correct domain for other ports too. -*/ - return intel_dp->aux_ch == AUX_CH_A ? POWER_DOMAIN_AUX_IO_A:
drivers/gpu/drm/i915/intel_psr.c +0
-1- intel_dp-Quoted 1 line
aux_power_domain;drivers/gpu/drm/i915/intel_psr.c +0
-5-} - -static void psr_aux_io_power_get (struct intel_dp *intel_dp) -{ - struct intel_digital_port *intel_dig_port =
dp_to_dig_port(intel_dp);drivers/gpu/drm/i915/intel_psr.c +0
-1- struct drm_i915_private *dev_priv = to_i915(intel_dig_port-Quoted 1 line
base.base.dev);
drivers/gpu/drm/i915/intel_psr.c +0
-10- -if (INTEL_GEN (dev_priv) <10 ) -return ; - -intel_display_power_get (dev_priv,psr_aux_domain (intel_dp)); -} - -static void psr_aux_io_power_put (struct intel_dp *intel_dp) -{ - struct intel_digital_port *intel_dig_port =
dp_to_dig_port(intel_dp);drivers/gpu/drm/i915/intel_psr.c +0
-1- struct drm_i915_private *dev_priv = to_i915(intel_dig_port-Quoted 1 line
base.base.dev);
drivers/gpu/drm/i915/intel_psr.c +0
-7- -if (INTEL_GEN (dev_priv) <10 ) -return ; - -intel_display_power_put (dev_priv,psr_aux_domain (intel_dp)); -} - void intel_psr_irq_control(struct drm_i915_private *dev_priv, booldebug)
{drivers/gpu/drm/i915/intel_psr.c +0
-2u32 debug_mask, mask;@@ -595,8 +558,6 @@ static void hsw_psr_enable_source(struct intel_dp *intel_dp, struct drm_i915_private *dev_priv = to_i915(dev);enum transcoder cpu_transcoder = crtc_state->cpu_transcoder; -psr_aux_io_power_get (intel_dp); -/* Only HSW and BDW have PSR AUX registers that need to be setup. SKL+
drivers/gpu/drm/i915/intel_psr.c +0
-2* use hardcoded values PSR AUX transactions */ @@ -717,8 +678,6 @@ static void hsw_psr_disable(struct intel_dp *intel_dp, elseWARN_ON (I915_READ (EDP_PSR_CTL ) &EDP_PSR_ENABLE ); } - -psr_aux_io_power_put (intel_dp); }/**
drivers/gpu/drm/i915/intel_runtime_pm.c +1
-0@@ -1824,6 +1824,7 @@ void intel_display_power_put(struct drm_i915_private *dev_priv, BIT_ULL(POWER_DOMAIN_INIT))#define GLK_DISPLAY_AUX_A_POWER_DOMAINS ( \ BIT_ULL(POWER_DOMAIN_AUX_A) | \ + BIT_ULL(POWER_DOMAIN_AUX_IO_A) | \ BIT_ULL(POWER_DOMAIN_INIT))#define GLK_DISPLAY_AUX_B_POWER_DOMAINS ( \
Quoted 1 line
BIT_ULL(POWER_DOMAIN_AUX_B)| \
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Em Seg, 2018-06-25 às 16:55 -0700, Souza, Jose escreveu:
Quoted 5 lines · Imre Deak
Quoted 4 lines
So far we got an AUX power domain reference only for the duration of
DP
AUX transfers. However, the following suggests that we also need
Quoted 8 lines
Quoted 8 lines
these
for main link functionality:
- The specification doesn't state whether it's needed or not for main
link functionality, but suggests that these power wells need to
be
enabled already during display core initialization (Sequences to Initialize Display).
No, the specification states it's needed. Page "Sequences for DisplayPort" (the ICL version, of course), step 1.b:
"TC: Note that AUX power is required for running main link."
Same for the HDMI page.
Quoted 331 lines
Quoted 36 lines
- For PSR we need to keep the AUX power well enabled.
- On ICL combo PHY ports (non-TC) the AUX power well is needed for link training too: while the port is enabled with a DP link
training
test pattern trying to toggle the AUX power well will time out.
- On ICL MG PHY ports (TC) the AUX power well is needed also for main
link functionality (both in DP and HDMI modes).
- Windows enables these power wells both for main and AUX lane functionality.Based on the above take an AUX power reference for main link functionality too. This makes a difference only on GEN10+ (GLK+) platforms, where we have separate port specific AUX power wells.
For PSR we still need to distinguish between port A and the other ports, since on port A DC states must stay enabled for main link functionality, but DC states must be disabled for driver initiated AUX transfers. So re-use the corresponding helper from
intel_psr.c.Since we take now a reference for main link functionality on all DP ports we can forgo taking the separate power ref for PSR functionality.
v2:
- Make sure DC states stay enabled when taking the ref on port A. (Ville)v3: (Ville)
- Fix comment about logic for encoders without a crtc state and add FIXME note for a simplification to avoid callingget_power_domains
in such cases.
- Useintel_crtc_has_dp_encoder()instead !intel_crtc_has_type(HDMI).Quoted 4 lines
Cc Ville Syrjälä <[email protected]>Cc Dhinakaran Pandiyan <[email protected]>Cc Paulo Zanoni <[email protected]>Signed-off-by Imre Deak <[email protected]>The spec is not clear but this fix the "aux power well" enable timeouts
that I was getting in aux B so looks like your interpretation is right.Reviewed-by José Roberto de Souza <[email protected]>Quoted 283 lines
--- drivers/gpu/drm/i915/intel_ddi.c | 54 ++++++++++++++++++++++++++++++--- drivers/gpu/drm/i915/intel_display.c | 12 +++++++- drivers/gpu/drm/i915/intel_drv.h | 3 +- drivers/gpu/drm/i915/intel_psr.c | 41 --------------------- ---- drivers/gpu/drm/i915/intel_runtime_pm.c | 1 + 5 files changed, 64 insertions(+), 47 deletions(-)drivers/gpu/drm/i915/intel_ddi.c +4
-1@@ -1983,15 +1983,55 @@ bool intel_ddi_get_hw_state(structintel_encoder *encoder, return ret; } -static u64 intel_ddi_get_power_domains (struct intel_encoder *encoder) +static inline enum intel_display_power_domain +intel_ddi_main_link_aux_domain (struct intel_dp *intel_dp) +{ +/* CNL HW requires corresponding AUX IOs to be powered up for PSR with
drivers/gpu/drm/i915/intel_ddi.c +1
-0+* DC states enabled at the same time, while for driver initiated AUX
drivers/gpu/drm/i915/intel_ddi.c +1
-0+* transfers we need the same AUX IOs to be powered but with
DC statesdrivers/gpu/drm/i915/intel_ddi.c +1
-0+* disabled. Accordingly use the AUX power domain here which
leaves DCdrivers/gpu/drm/i915/intel_ddi.c +2
-0+* states enabled. +* However, for non-A AUX ports the corresponding non-EDP transcoders
drivers/gpu/drm/i915/intel_ddi.c +1
-0+* would have already enabled power well 2 and DC_OFF. This
means we candrivers/gpu/drm/i915/intel_ddi.c +1
-0+* acquire a wider POWER_DOMAIN_AUX_{B,C,D,F} reference instead of a
drivers/gpu/drm/i915/intel_ddi.c +1
-0+* specific AUX_IO reference without powering up any extra wells.
drivers/gpu/drm/i915/intel_ddi.c +1
-0+* Note that PSR is enabled only on Port A even though this
functiondrivers/gpu/drm/i915/intel_ddi.c +3
-0+* returns the correct domain for other ports too. +*/ + return intel_dp->aux_ch == AUX_CH_A ?
POWER_DOMAIN_AUX_IO_A
:drivers/gpu/drm/i915/intel_ddi.c +1
-0+ intel_dp-Quoted 1 line
aux_power_domain;drivers/gpu/drm/i915/intel_ddi.c +3
-0+} + +static u64 intel_ddi_get_power_domains(struct intel_encoder*encoder,
drivers/gpu/drm/i915/intel_ddi.c +1
-0+struct intel_crtc_state
*crtc_state)
{
structintel_digital_port*dig_port=enc_to_dig_port(&encoder->base);drivers/gpu/drm/i915/intel_ddi.c +9
-3enum pipe pipe; +u64 domains; -if (intel_ddi_get_hw_state (encoder, &pipe)) -return BIT_ULL (dig_port->ddi_io_power_domain); +if (!intel_ddi_get_hw_state (encoder, &pipe)) +return 0 ; -return 0 ; + domains =BIT_ULL (dig_port->ddi_io_power_domain); +if (!crtc_state) +return domains; + +/* +* TODO: Add support for MST encoders. Atm, the following should never
drivers/gpu/drm/i915/intel_ddi.c +1
-0+* happen since this function will be called only for the primary
drivers/gpu/drm/i915/intel_ddi.c +3
-0+* encoder which doesn't have its own pipe/crtc_state. +*/ + if (WARN_ON(intel_crtc_has_type(crtc_state,
INTEL_OUTPUT_DP_MST)))drivers/gpu/drm/i915/intel_ddi.c +3
-0+return domains; + +/* AUX power is only needed for (e)DP mode, not for HDMI. */
drivers/gpu/drm/i915/intel_ddi.c +4
-0+if (intel_crtc_has_dp_encoder (crtc_state)) { +struct intel_dp *intel_dp = &dig_port->dp; + + domains |=BIT_ULL(intel_ddi_main_link_aux_domain(intel_dp));
drivers/gpu/drm/i915/intel_ddi.c +3
-0+ } + +return domains; } void intel_ddi_enable_pipe_clock(const struct intel_crtc_state
*crtc_state)drivers/gpu/drm/i915/intel_ddi.c +2
-0@@ -2631,6 +2671,9 @@ static void intel_ddi_pre_enable_dp(struct intel_encoder *encoder,WARN_ON (is_mst && (port ==PORT_A || port ==PORT_E )); + intel_display_power_get(dev_priv, + intel_ddi_main_link_aux_domain(intel
_dp));drivers/gpu/drm/i915/intel_ddi.c +4
-0+intel_dp_set_link_params (intel_dp, crtc_state->port_clock, crtc_state->lane_count, is_mst);@@ -2775,6 +2818,9 @@ static void intel_ddi_post_disable_dp(struct intel_encoder *encoder,intel_display_power_put (dev_priv, dig_port- > ddi_io_power_domain);intel_ddi_clk_disable (encoder); + + intel_display_power_put(dev_priv, + intel_ddi_main_link_aux_domain(intel
_dp));
}static void intel_ddi_post_disable_hdmi(struct
intel_encoder
*encoder,drivers/gpu/drm/i915/intel_display.c +3
-1@@ -15676,11 +15676,21 @@ get_encoder_power_domains(struct drm_i915_private *dev_priv)for_each_intel_encoder (&dev_priv->drm, encoder) {u64 get_domains;enum intel_display_power_domain domain; +struct intel_crtc_state *crtc_state;if (!encoder->get_power_domains)continue ; - get_domains = encoder->get_power_domains (encoder); +/* +* For MST and inactive encoders we don't have a crtc state.
drivers/gpu/drm/i915/intel_display.c +1
-0+* FIXME: no need to call get_power_domains in such
cases, itdrivers/gpu/drm/i915/intel_display.c +4
-0+* will always return 0. +*/ + crtc_state = encoder->base.crtc ? + to_intel_crtc_state(encoder-Quoted 2 lines
base.crtc-
state) :drivers/gpu/drm/i915/intel_display.c +3
-0+NULL ; + + get_domains = encoder->get_power_domains(encoder,
crtc_state);drivers/gpu/drm/i915/intel_display.c +0
-0for_each_power_domain (domain, get_domains)intel_display_power_get (dev_priv, domain); }drivers/gpu/drm/i915/intel_drv.h +0
-0@@ -254,7 +254,8 @@ struct intel_encoder { struct intel_crtc_state *pipe_config);/* Returns a mask of power domains that need to be referenced as part
drivers/gpu/drm/i915/intel_drv.h +2
-1* of the hardware state readout code. */ -u64 (*get_power_domains)(struct intel_encoder *encoder); +u64 (*get_power_domains)(struct intel_encoder *encoder, + struct intel_crtc_state
*crtc_state);drivers/gpu/drm/i915/intel_drv.h +0
-0/* * Called during system suspend after all pending requests for the
* encoder are flushed (for example for DP AUX
transactions)
anddrivers/gpu/drm/i915/intel_psr.c +0
-4@@ -56,43 +56,6 @@#include "intel_drv.h" #include "i915_drv.h" -static inline enum intel_display_power_domain -psr_aux_domain (struct intel_dp *intel_dp) -{ -/* CNL HW requires corresponding AUX IOs to be powered up for PSR.
drivers/gpu/drm/i915/intel_psr.c +0
-1-* However, for non-A AUX ports the corresponding non-EDP transcoders
drivers/gpu/drm/i915/intel_psr.c +0
-1-* would have already enabled power well 2 and DC_OFF. This
means we candrivers/gpu/drm/i915/intel_psr.c +0
-1-* acquire a wider POWER_DOMAIN_AUX_{B,C,D,F} reference instead of a
drivers/gpu/drm/i915/intel_psr.c +0
-1-* specific AUX_IO reference without powering up any extra wells.
drivers/gpu/drm/i915/intel_psr.c +0
-1-* Note that PSR is enabled only on Port A even though this
functiondrivers/gpu/drm/i915/intel_psr.c +0
-3-* returns the correct domain for other ports too. -*/ - return intel_dp->aux_ch == AUX_CH_A ?
POWER_DOMAIN_AUX_IO_A
:drivers/gpu/drm/i915/intel_psr.c +0
-1- intel_dp-Quoted 1 line
aux_power_domain;drivers/gpu/drm/i915/intel_psr.c +0
-5-} - -static void psr_aux_io_power_get (struct intel_dp *intel_dp) -{ - struct intel_digital_port *intel_dig_port =
dp_to_dig_port(intel_dp);drivers/gpu/drm/i915/intel_psr.c +0
-1- struct drm_i915_private *dev_priv =to_i915(intel_dig_port-
Quoted 1 line
base.base.dev);
drivers/gpu/drm/i915/intel_psr.c +0
-5- -if (INTEL_GEN (dev_priv) <10 ) -return ; - - intel_display_power_get(dev_priv,
psr_aux_domain(intel_dp));drivers/gpu/drm/i915/intel_psr.c +0
-5-} - -static void psr_aux_io_power_put (struct intel_dp *intel_dp) -{ - struct intel_digital_port *intel_dig_port =
dp_to_dig_port(intel_dp);drivers/gpu/drm/i915/intel_psr.c +0
-1- struct drm_i915_private *dev_priv =to_i915(intel_dig_port-
Quoted 1 line
base.base.dev);
drivers/gpu/drm/i915/intel_psr.c +0
-5- -if (INTEL_GEN (dev_priv) <10 ) -return ; - - intel_display_power_put(dev_priv,
psr_aux_domain(intel_dp));drivers/gpu/drm/i915/intel_psr.c +0
-2-} - void intel_psr_irq_control(struct drm_i915_private *dev_priv, booldebug)
{drivers/gpu/drm/i915/intel_psr.c +0
-0u32 debug_mask, mask;@@ -595,8 +558,6 @@ static void hsw_psr_enable_source(struct
intel_dp*intel_dp,drivers/gpu/drm/i915/intel_psr.c +0
-0struct drm_i915_private *dev_priv =to_i915 (dev); enum transcoder cpu_transcoder = crtc_state-Quoted 1 line
cpu_transcoder;drivers/gpu/drm/i915/intel_psr.c +0
-2-psr_aux_io_power_get (intel_dp); -/* Only HSW and BDW have PSR AUX registers that need to be setup. SKL+
drivers/gpu/drm/i915/intel_psr.c +0
-2* use hardcoded values PSR AUX transactions */ @@ -717,8 +678,6 @@ static void hsw_psr_disable(struct intel_dp *intel_dp, elseWARN_ON (I915_READ (EDP_PSR_CTL ) &EDP_PSR_ENABLE ); } - -psr_aux_io_power_put (intel_dp); }
Quoted 15 lines
Quoted 14 lines
/**
drivers/gpu/drm/i915/intel_runtime_pm.c +1
-0@@ -1824,6 +1824,7 @@ void intel_display_power_put(struct drm_i915_private *dev_priv, BIT_ULL(POWER_DOMAIN_INIT))#define GLK_DISPLAY_AUX_A_POWER_DOMAINS ( \ BIT_ULL(POWER_DOMAIN_AUX_A) | \ + BIT_ULL(POWER_DOMAIN_AUX_IO_A) | \ BIT_ULL(POWER_DOMAIN_INIT))#define GLK_DISPLAY_AUX_B_POWER_DOMAINS ( \Quoted 1 line
BIT_ULL(POWER_DOMAIN_AUX_B)| \
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 15 lines · Paulo Zanoni
Em Seg, 2018-06-25 às 16:55 -0700, Souza, Jose escreveu:
Quoted 5 lines · Imre Deak
Quoted 4 lines
So far we got an AUX power domain reference only for the duration of
DP
AUX transfers. However, the following suggests that we also needQuoted 8 lines
Quoted 8 lines
these
for main link functionality:
- The specification doesn't state whether it's needed or not for main
link functionality, but suggests that these power wells need to
be
enabled already during display core initialization (Sequences to Initialize Display).
Quoted 6 lines
No, the specification states it's needed. Page "Sequences for DisplayPort" (the ICL version, of course), step 1.b:
"TC: Note that AUX power is required for running main link."
Same for the HDMI page.
Yes, for ICL MG PHY ports (in all modes) it's clearly stated as I also wrote it below. The above is about the ICL combo PHY ports and the other platforms. For those the only hint is that enabling the AUX power wells is listed as a step in the 'Sequences to Initialize Display".
Quoted 332 lines
Quoted 332 lines
Quoted 37 lines
- For PSR we need to keep the AUX power well enabled.
- On ICL combo PHY ports (non-TC) the AUX power well is needed for link training too: while the port is enabled with a DP link
training
test pattern trying to toggle the AUX power well will time out.
- On ICL MG PHY ports (TC) the AUX power well is needed also for main
link functionality (both in DP and HDMI modes).
- Windows enables these power wells both for main and AUX lane functionality.Based on the above take an AUX power reference for main link functionality too. This makes a difference only on GEN10+ (GLK+) platforms, where we have separate port specific AUX power wells.
For PSR we still need to distinguish between port A and the other ports, since on port A DC states must stay enabled for main link functionality, but DC states must be disabled for driver initiated AUX transfers. So re-use the corresponding helper from
intel_psr.c.Since we take now a reference for main link functionality on all DP ports we can forgo taking the separate power ref for PSR functionality.
v2:
- Make sure DC states stay enabled when taking the ref on port A. (Ville)v3: (Ville)
- Fix comment about logic for encoders without a crtc state and add FIXME note for a simplification to avoid callingget_power_domains
in such cases.
- Useintel_crtc_has_dp_encoder()instead !intel_crtc_has_type(HDMI).Quoted 4 lines
Cc Ville Syrjälä <[email protected]>Cc Dhinakaran Pandiyan <[email protected]>Cc Paulo Zanoni <[email protected]>Signed-off-by Imre Deak <[email protected]>The spec is not clear but this fix the "aux power well" enable timeouts
that I was getting in aux B so looks like your interpretation is right.Reviewed-by José Roberto de Souza <[email protected]>Quoted 283 lines
--- drivers/gpu/drm/i915/intel_ddi.c | 54 ++++++++++++++++++++++++++++++--- drivers/gpu/drm/i915/intel_display.c | 12 +++++++- drivers/gpu/drm/i915/intel_drv.h | 3 +- drivers/gpu/drm/i915/intel_psr.c | 41 --------------------- ---- drivers/gpu/drm/i915/intel_runtime_pm.c | 1 + 5 files changed, 64 insertions(+), 47 deletions(-)drivers/gpu/drm/i915/intel_ddi.c +4
-1@@ -1983,15 +1983,55 @@ bool intel_ddi_get_hw_state(structintel_encoder *encoder, return ret; } -static u64 intel_ddi_get_power_domains (struct intel_encoder *encoder) +static inline enum intel_display_power_domain +intel_ddi_main_link_aux_domain (struct intel_dp *intel_dp) +{ +/* CNL HW requires corresponding AUX IOs to be powered up for PSR with
drivers/gpu/drm/i915/intel_ddi.c +1
-0+* DC states enabled at the same time, while for driver initiated AUX
drivers/gpu/drm/i915/intel_ddi.c +1
-0+* transfers we need the same AUX IOs to be powered but with
DC statesdrivers/gpu/drm/i915/intel_ddi.c +1
-0+* disabled. Accordingly use the AUX power domain here which
leaves DCdrivers/gpu/drm/i915/intel_ddi.c +2
-0+* states enabled. +* However, for non-A AUX ports the corresponding non-EDP transcoders
drivers/gpu/drm/i915/intel_ddi.c +1
-0+* would have already enabled power well 2 and DC_OFF. This
means we candrivers/gpu/drm/i915/intel_ddi.c +1
-0+* acquire a wider POWER_DOMAIN_AUX_{B,C,D,F} reference instead of a
drivers/gpu/drm/i915/intel_ddi.c +1
-0+* specific AUX_IO reference without powering up any extra wells.
drivers/gpu/drm/i915/intel_ddi.c +1
-0+* Note that PSR is enabled only on Port A even though this
functiondrivers/gpu/drm/i915/intel_ddi.c +3
-0+* returns the correct domain for other ports too. +*/ + return intel_dp->aux_ch == AUX_CH_A ?
POWER_DOMAIN_AUX_IO_A
:drivers/gpu/drm/i915/intel_ddi.c +1
-0+ intel_dp-Quoted 1 line
aux_power_domain;drivers/gpu/drm/i915/intel_ddi.c +3
-0+} + +static u64 intel_ddi_get_power_domains(struct intel_encoder*encoder,
drivers/gpu/drm/i915/intel_ddi.c +1
-0+struct intel_crtc_state
*crtc_state)
{
structintel_digital_port*dig_port=enc_to_dig_port(&encoder->base);drivers/gpu/drm/i915/intel_ddi.c +9
-3enum pipe pipe; +u64 domains; -if (intel_ddi_get_hw_state (encoder, &pipe)) -return BIT_ULL (dig_port->ddi_io_power_domain); +if (!intel_ddi_get_hw_state (encoder, &pipe)) +return 0 ; -return 0 ; + domains =BIT_ULL (dig_port->ddi_io_power_domain); +if (!crtc_state) +return domains; + +/* +* TODO: Add support for MST encoders. Atm, the following should never
drivers/gpu/drm/i915/intel_ddi.c +1
-0+* happen since this function will be called only for the primary
drivers/gpu/drm/i915/intel_ddi.c +3
-0+* encoder which doesn't have its own pipe/crtc_state. +*/ + if (WARN_ON(intel_crtc_has_type(crtc_state,
INTEL_OUTPUT_DP_MST)))drivers/gpu/drm/i915/intel_ddi.c +3
-0+return domains; + +/* AUX power is only needed for (e)DP mode, not for HDMI. */
drivers/gpu/drm/i915/intel_ddi.c +4
-0+if (intel_crtc_has_dp_encoder (crtc_state)) { +struct intel_dp *intel_dp = &dig_port->dp; + + domains |=BIT_ULL(intel_ddi_main_link_aux_domain(intel_dp));
drivers/gpu/drm/i915/intel_ddi.c +3
-0+ } + +return domains; } void intel_ddi_enable_pipe_clock(const struct intel_crtc_state
*crtc_state)drivers/gpu/drm/i915/intel_ddi.c +2
-0@@ -2631,6 +2671,9 @@ static void intel_ddi_pre_enable_dp(struct intel_encoder *encoder,WARN_ON (is_mst && (port ==PORT_A || port ==PORT_E )); + intel_display_power_get(dev_priv, + intel_ddi_main_link_aux_domain(intel
_dp));drivers/gpu/drm/i915/intel_ddi.c +4
-0+intel_dp_set_link_params (intel_dp, crtc_state->port_clock, crtc_state->lane_count, is_mst);@@ -2775,6 +2818,9 @@ static void intel_ddi_post_disable_dp(struct intel_encoder *encoder,intel_display_power_put (dev_priv, dig_port- > ddi_io_power_domain);intel_ddi_clk_disable (encoder); + + intel_display_power_put(dev_priv, + intel_ddi_main_link_aux_domain(intel
_dp));
}static void intel_ddi_post_disable_hdmi(struct
intel_encoder
*encoder,drivers/gpu/drm/i915/intel_display.c +3
-1@@ -15676,11 +15676,21 @@ get_encoder_power_domains(struct drm_i915_private *dev_priv)for_each_intel_encoder (&dev_priv->drm, encoder) {u64 get_domains;enum intel_display_power_domain domain; +struct intel_crtc_state *crtc_state;if (!encoder->get_power_domains)continue ; - get_domains = encoder->get_power_domains (encoder); +/* +* For MST and inactive encoders we don't have a crtc state.
drivers/gpu/drm/i915/intel_display.c +1
-0+* FIXME: no need to call get_power_domains in such
cases, itdrivers/gpu/drm/i915/intel_display.c +4
-0+* will always return 0. +*/ + crtc_state = encoder->base.crtc ? + to_intel_crtc_state(encoder-Quoted 2 lines
base.crtc-
state) :drivers/gpu/drm/i915/intel_display.c +3
-0+NULL ; + + get_domains = encoder->get_power_domains(encoder,
crtc_state);drivers/gpu/drm/i915/intel_display.c +0
-0for_each_power_domain (domain, get_domains)intel_display_power_get (dev_priv, domain); }drivers/gpu/drm/i915/intel_drv.h +0
-0@@ -254,7 +254,8 @@ struct intel_encoder { struct intel_crtc_state *pipe_config);/* Returns a mask of power domains that need to be referenced as part
drivers/gpu/drm/i915/intel_drv.h +2
-1* of the hardware state readout code. */ -u64 (*get_power_domains)(struct intel_encoder *encoder); +u64 (*get_power_domains)(struct intel_encoder *encoder, + struct intel_crtc_state
*crtc_state);drivers/gpu/drm/i915/intel_drv.h +0
-0/* * Called during system suspend after all pending requests for the
* encoder are flushed (for example for DP AUX
transactions)
anddrivers/gpu/drm/i915/intel_psr.c +0
-4@@ -56,43 +56,6 @@#include "intel_drv.h" #include "i915_drv.h" -static inline enum intel_display_power_domain -psr_aux_domain (struct intel_dp *intel_dp) -{ -/* CNL HW requires corresponding AUX IOs to be powered up for PSR.
drivers/gpu/drm/i915/intel_psr.c +0
-1-* However, for non-A AUX ports the corresponding non-EDP transcoders
drivers/gpu/drm/i915/intel_psr.c +0
-1-* would have already enabled power well 2 and DC_OFF. This
means we candrivers/gpu/drm/i915/intel_psr.c +0
-1-* acquire a wider POWER_DOMAIN_AUX_{B,C,D,F} reference instead of a
drivers/gpu/drm/i915/intel_psr.c +0
-1-* specific AUX_IO reference without powering up any extra wells.
drivers/gpu/drm/i915/intel_psr.c +0
-1-* Note that PSR is enabled only on Port A even though this
functiondrivers/gpu/drm/i915/intel_psr.c +0
-3-* returns the correct domain for other ports too. -*/ - return intel_dp->aux_ch == AUX_CH_A ?
POWER_DOMAIN_AUX_IO_A
:drivers/gpu/drm/i915/intel_psr.c +0
-1- intel_dp-Quoted 1 line
aux_power_domain;drivers/gpu/drm/i915/intel_psr.c +0
-5-} - -static void psr_aux_io_power_get (struct intel_dp *intel_dp) -{ - struct intel_digital_port *intel_dig_port =
dp_to_dig_port(intel_dp);drivers/gpu/drm/i915/intel_psr.c +0
-1- struct drm_i915_private *dev_priv =to_i915(intel_dig_port-
Quoted 1 line
base.base.dev);
drivers/gpu/drm/i915/intel_psr.c +0
-5- -if (INTEL_GEN (dev_priv) <10 ) -return ; - - intel_display_power_get(dev_priv,
psr_aux_domain(intel_dp));drivers/gpu/drm/i915/intel_psr.c +0
-5-} - -static void psr_aux_io_power_put (struct intel_dp *intel_dp) -{ - struct intel_digital_port *intel_dig_port =
dp_to_dig_port(intel_dp);drivers/gpu/drm/i915/intel_psr.c +0
-1- struct drm_i915_private *dev_priv =to_i915(intel_dig_port-
Quoted 1 line
base.base.dev);
drivers/gpu/drm/i915/intel_psr.c +0
-5- -if (INTEL_GEN (dev_priv) <10 ) -return ; - - intel_display_power_put(dev_priv,
psr_aux_domain(intel_dp));drivers/gpu/drm/i915/intel_psr.c +0
-2-} - void intel_psr_irq_control(struct drm_i915_private *dev_priv, booldebug)
{drivers/gpu/drm/i915/intel_psr.c +0
-0u32 debug_mask, mask;@@ -595,8 +558,6 @@ static void hsw_psr_enable_source(struct
intel_dp*intel_dp,drivers/gpu/drm/i915/intel_psr.c +0
-0struct drm_i915_private *dev_priv =to_i915 (dev); enum transcoder cpu_transcoder = crtc_state-Quoted 1 line
cpu_transcoder;drivers/gpu/drm/i915/intel_psr.c +0
-2-psr_aux_io_power_get (intel_dp); -/* Only HSW and BDW have PSR AUX registers that need to be setup. SKL+
drivers/gpu/drm/i915/intel_psr.c +0
-2* use hardcoded values PSR AUX transactions */ @@ -717,8 +678,6 @@ static void hsw_psr_disable(struct intel_dp *intel_dp, elseWARN_ON (I915_READ (EDP_PSR_CTL ) &EDP_PSR_ENABLE ); } - -psr_aux_io_power_put (intel_dp); }
Quoted 15 lines
Quoted 7 lines
Quoted 7 lines
/**
drivers/gpu/drm/i915/intel_runtime_pm.c +0
-0@@ -1824,6 +1824,7 @@ void intel_display_power_put(structQuoted 8 lines
Quoted 8 lines
drivers/gpu/drm/i915/intel_runtime_pm.c +1
-0drm_i915_private *dev_priv, BIT_ULL(POWER_DOMAIN_INIT))#define GLK_DISPLAY_AUX_A_POWER_DOMAINS ( \ BIT_ULL(POWER_DOMAIN_AUX_A) | \ + BIT_ULL(POWER_DOMAIN_AUX_IO_A) | \ BIT_ULL(POWER_DOMAIN_INIT))#define GLK_DISPLAY_AUX_B_POWER_DOMAINS ( \
BIT_ULL(POWER_DOMAIN_AUX_B)| \
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Manasi Navare
Tested-byQuoted 19 lines · Imre Deak
Quoted 18 lines · Paulo Zanoni
Em Seg, 2018-06-25 às 16:55 -0700, Souza, Jose escreveu:
Quoted 5 lines · Imre Deak
Quoted 4 lines
So far we got an AUX power domain reference only for the duration of
DP
AUX transfers. However, the following suggests that we also needQuoted 8 lines
Quoted 8 lines
these
for main link functionality:
- The specification doesn't state whether it's needed or not for main
link functionality, but suggests that these power wells need to
be
enabled already during display core initialization (Sequences to Initialize Display).No, the specification states it's needed. Page "Sequences for DisplayPort" (the ICL version, of course), step 1.b:
Quoted 9 lines
Quoted 3 lines
"TC: Note that AUX power is required for running main link."
Same for the HDMI page.
Yes, for ICL MG PHY ports (in all modes) it's clearly stated as I also wrote it below. The above is about the ICL combo PHY ports and the other platforms. For those the only hint is that enabling the AUX power wells is listed as a step in the 'Sequences to Initialize Display".
I tested this patch with the latest stepping with DP on Combo PHY port. Without this patch it was giving me AUX timeouts and could never succeed with link training. I needed this patch to successfully train the link and get display out on Combo PHy Port B DP.
So,
Manasi
Quoted 343 lines
Quoted 343 lines
Quoted 343 lines
Quoted 37 lines
- For PSR we need to keep the AUX power well enabled.
- On ICL combo PHY ports (non-TC) the AUX power well is needed for link training too: while the port is enabled with a DP link
training
test pattern trying to toggle the AUX power well will time out.
- On ICL MG PHY ports (TC) the AUX power well is needed also for main
link functionality (both in DP and HDMI modes).
- Windows enables these power wells both for main and AUX lane functionality.Based on the above take an AUX power reference for main link functionality too. This makes a difference only on GEN10+ (GLK+) platforms, where we have separate port specific AUX power wells.
For PSR we still need to distinguish between port A and the other ports, since on port A DC states must stay enabled for main link functionality, but DC states must be disabled for driver initiated AUX transfers. So re-use the corresponding helper from
intel_psr.c.Since we take now a reference for main link functionality on all DP ports we can forgo taking the separate power ref for PSR functionality.
v2:
- Make sure DC states stay enabled when taking the ref on port A. (Ville)v3: (Ville)
- Fix comment about logic for encoders without a crtc state and add FIXME note for a simplification to avoid callingget_power_domains
in such cases.
- Useintel_crtc_has_dp_encoder()instead !intel_crtc_has_type(HDMI).Quoted 4 lines
Cc Ville Syrjälä <[email protected]>Cc Dhinakaran Pandiyan <[email protected]>Cc Paulo Zanoni <[email protected]>Signed-off-by Imre Deak <[email protected]>The spec is not clear but this fix the "aux power well" enable timeouts
that I was getting in aux B so looks like your interpretation is right.Reviewed-by José Roberto de Souza <[email protected]>Quoted 294 lines
--- drivers/gpu/drm/i915/intel_ddi.c | 54 ++++++++++++++++++++++++++++++--- drivers/gpu/drm/i915/intel_display.c | 12 +++++++- drivers/gpu/drm/i915/intel_drv.h | 3 +- drivers/gpu/drm/i915/intel_psr.c | 41 --------------------- ---- drivers/gpu/drm/i915/intel_runtime_pm.c | 1 + 5 files changed, 64 insertions(+), 47 deletions(-)drivers/gpu/drm/i915/intel_ddi.c +4
-1@@ -1983,15 +1983,55 @@ bool intel_ddi_get_hw_state(structintel_encoder *encoder, return ret; } -static u64 intel_ddi_get_power_domains (struct intel_encoder *encoder) +static inline enum intel_display_power_domain +intel_ddi_main_link_aux_domain (struct intel_dp *intel_dp) +{ +/* CNL HW requires corresponding AUX IOs to be powered up for PSR with
drivers/gpu/drm/i915/intel_ddi.c +1
-0+* DC states enabled at the same time, while for driver initiated AUX
drivers/gpu/drm/i915/intel_ddi.c +1
-0+* transfers we need the same AUX IOs to be powered but with
DC statesdrivers/gpu/drm/i915/intel_ddi.c +1
-0+* disabled. Accordingly use the AUX power domain here which
leaves DCdrivers/gpu/drm/i915/intel_ddi.c +2
-0+* states enabled. +* However, for non-A AUX ports the corresponding non-EDP transcoders
drivers/gpu/drm/i915/intel_ddi.c +1
-0+* would have already enabled power well 2 and DC_OFF. This
means we candrivers/gpu/drm/i915/intel_ddi.c +1
-0+* acquire a wider POWER_DOMAIN_AUX_{B,C,D,F} reference instead of a
drivers/gpu/drm/i915/intel_ddi.c +1
-0+* specific AUX_IO reference without powering up any extra wells.
drivers/gpu/drm/i915/intel_ddi.c +1
-0+* Note that PSR is enabled only on Port A even though this
functiondrivers/gpu/drm/i915/intel_ddi.c +3
-0+* returns the correct domain for other ports too. +*/ + return intel_dp->aux_ch == AUX_CH_A ?
POWER_DOMAIN_AUX_IO_A
:drivers/gpu/drm/i915/intel_ddi.c +1
-0+ intel_dp-Quoted 1 line
aux_power_domain;drivers/gpu/drm/i915/intel_ddi.c +3
-0+} + +static u64 intel_ddi_get_power_domains(struct intel_encoder*encoder,
drivers/gpu/drm/i915/intel_ddi.c +1
-0+struct intel_crtc_state
*crtc_state)
{
structintel_digital_port*dig_port=enc_to_dig_port(&encoder->base);drivers/gpu/drm/i915/intel_ddi.c +9
-3enum pipe pipe; +u64 domains; -if (intel_ddi_get_hw_state (encoder, &pipe)) -return BIT_ULL (dig_port->ddi_io_power_domain); +if (!intel_ddi_get_hw_state (encoder, &pipe)) +return 0 ; -return 0 ; + domains =BIT_ULL (dig_port->ddi_io_power_domain); +if (!crtc_state) +return domains; + +/* +* TODO: Add support for MST encoders. Atm, the following should never
drivers/gpu/drm/i915/intel_ddi.c +1
-0+* happen since this function will be called only for the primary
drivers/gpu/drm/i915/intel_ddi.c +3
-0+* encoder which doesn't have its own pipe/crtc_state. +*/ + if (WARN_ON(intel_crtc_has_type(crtc_state,
INTEL_OUTPUT_DP_MST)))drivers/gpu/drm/i915/intel_ddi.c +3
-0+return domains; + +/* AUX power is only needed for (e)DP mode, not for HDMI. */
drivers/gpu/drm/i915/intel_ddi.c +4
-0+if (intel_crtc_has_dp_encoder (crtc_state)) { +struct intel_dp *intel_dp = &dig_port->dp; + + domains |=BIT_ULL(intel_ddi_main_link_aux_domain(intel_dp));
drivers/gpu/drm/i915/intel_ddi.c +3
-0+ } + +return domains; } void intel_ddi_enable_pipe_clock(const struct intel_crtc_state
*crtc_state)drivers/gpu/drm/i915/intel_ddi.c +2
-0@@ -2631,6 +2671,9 @@ static void intel_ddi_pre_enable_dp(struct intel_encoder *encoder,WARN_ON (is_mst && (port ==PORT_A || port ==PORT_E )); + intel_display_power_get(dev_priv, + intel_ddi_main_link_aux_domain(intel
_dp));drivers/gpu/drm/i915/intel_ddi.c +4
-0+intel_dp_set_link_params (intel_dp, crtc_state->port_clock, crtc_state->lane_count, is_mst);@@ -2775,6 +2818,9 @@ static void intel_ddi_post_disable_dp(struct intel_encoder *encoder,intel_display_power_put (dev_priv, dig_port- > ddi_io_power_domain);intel_ddi_clk_disable (encoder); + + intel_display_power_put(dev_priv, + intel_ddi_main_link_aux_domain(intel
_dp));
}static void intel_ddi_post_disable_hdmi(struct
intel_encoder
*encoder,drivers/gpu/drm/i915/intel_display.c +3
-1@@ -15676,11 +15676,21 @@ get_encoder_power_domains(struct drm_i915_private *dev_priv)for_each_intel_encoder (&dev_priv->drm, encoder) {u64 get_domains;enum intel_display_power_domain domain; +struct intel_crtc_state *crtc_state;if (!encoder->get_power_domains)continue ; - get_domains = encoder->get_power_domains (encoder); +/* +* For MST and inactive encoders we don't have a crtc state.
drivers/gpu/drm/i915/intel_display.c +1
-0+* FIXME: no need to call get_power_domains in such
cases, itdrivers/gpu/drm/i915/intel_display.c +4
-0+* will always return 0. +*/ + crtc_state = encoder->base.crtc ? + to_intel_crtc_state(encoder-Quoted 2 lines
base.crtc-
state) :drivers/gpu/drm/i915/intel_display.c +3
-0+NULL ; + + get_domains = encoder->get_power_domains(encoder,
crtc_state);drivers/gpu/drm/i915/intel_display.c +0
-0for_each_power_domain (domain, get_domains)intel_display_power_get (dev_priv, domain); }drivers/gpu/drm/i915/intel_drv.h +0
-0@@ -254,7 +254,8 @@ struct intel_encoder { struct intel_crtc_state *pipe_config);/* Returns a mask of power domains that need to be referenced as part
drivers/gpu/drm/i915/intel_drv.h +2
-1* of the hardware state readout code. */ -u64 (*get_power_domains)(struct intel_encoder *encoder); +u64 (*get_power_domains)(struct intel_encoder *encoder, + struct intel_crtc_state
*crtc_state);drivers/gpu/drm/i915/intel_drv.h +0
-0/* * Called during system suspend after all pending requests for the
* encoder are flushed (for example for DP AUX
transactions)
anddrivers/gpu/drm/i915/intel_psr.c +0
-4@@ -56,43 +56,6 @@#include "intel_drv.h" #include "i915_drv.h" -static inline enum intel_display_power_domain -psr_aux_domain (struct intel_dp *intel_dp) -{ -/* CNL HW requires corresponding AUX IOs to be powered up for PSR.
drivers/gpu/drm/i915/intel_psr.c +0
-1-* However, for non-A AUX ports the corresponding non-EDP transcoders
drivers/gpu/drm/i915/intel_psr.c +0
-1-* would have already enabled power well 2 and DC_OFF. This
means we candrivers/gpu/drm/i915/intel_psr.c +0
-1-* acquire a wider POWER_DOMAIN_AUX_{B,C,D,F} reference instead of a
drivers/gpu/drm/i915/intel_psr.c +0
-1-* specific AUX_IO reference without powering up any extra wells.
drivers/gpu/drm/i915/intel_psr.c +0
-1-* Note that PSR is enabled only on Port A even though this
functiondrivers/gpu/drm/i915/intel_psr.c +0
-3-* returns the correct domain for other ports too. -*/ - return intel_dp->aux_ch == AUX_CH_A ?
POWER_DOMAIN_AUX_IO_A
:drivers/gpu/drm/i915/intel_psr.c +0
-1- intel_dp-Quoted 1 line
aux_power_domain;drivers/gpu/drm/i915/intel_psr.c +0
-5-} - -static void psr_aux_io_power_get (struct intel_dp *intel_dp) -{ - struct intel_digital_port *intel_dig_port =
dp_to_dig_port(intel_dp);drivers/gpu/drm/i915/intel_psr.c +0
-1- struct drm_i915_private *dev_priv =to_i915(intel_dig_port-
Quoted 1 line
base.base.dev);
drivers/gpu/drm/i915/intel_psr.c +0
-5- -if (INTEL_GEN (dev_priv) <10 ) -return ; - - intel_display_power_get(dev_priv,
psr_aux_domain(intel_dp));drivers/gpu/drm/i915/intel_psr.c +0
-5-} - -static void psr_aux_io_power_put (struct intel_dp *intel_dp) -{ - struct intel_digital_port *intel_dig_port =
dp_to_dig_port(intel_dp);drivers/gpu/drm/i915/intel_psr.c +0
-1- struct drm_i915_private *dev_priv =to_i915(intel_dig_port-
Quoted 1 line
base.base.dev);
drivers/gpu/drm/i915/intel_psr.c +0
-5- -if (INTEL_GEN (dev_priv) <10 ) -return ; - - intel_display_power_put(dev_priv,
psr_aux_domain(intel_dp));drivers/gpu/drm/i915/intel_psr.c +0
-2-} - void intel_psr_irq_control(struct drm_i915_private *dev_priv, booldebug)
{drivers/gpu/drm/i915/intel_psr.c +0
-0u32 debug_mask, mask;@@ -595,8 +558,6 @@ static void hsw_psr_enable_source(struct
intel_dp*intel_dp,drivers/gpu/drm/i915/intel_psr.c +0
-0struct drm_i915_private *dev_priv =to_i915 (dev); enum transcoder cpu_transcoder = crtc_state-Quoted 1 line
cpu_transcoder;drivers/gpu/drm/i915/intel_psr.c +0
-2-psr_aux_io_power_get (intel_dp); -/* Only HSW and BDW have PSR AUX registers that need to be setup. SKL+
drivers/gpu/drm/i915/intel_psr.c +0
-2* use hardcoded values PSR AUX transactions */ @@ -717,8 +678,6 @@ static void hsw_psr_disable(struct intel_dp *intel_dp, elseWARN_ON (I915_READ (EDP_PSR_CTL ) &EDP_PSR_ENABLE ); } - -psr_aux_io_power_put (intel_dp); }/**
drivers/gpu/drm/i915/intel_runtime_pm.c +0
-0@@ -1824,6 +1824,7 @@ void intel_display_power_put(struct drm_i915_private *dev_priv, BIT_ULL(POWER_DOMAIN_INIT))#define GLK_DISPLAY_AUX_A_POWER_DOMAINS ( \ BIT_ULL(POWER_DOMAIN_AUX_A) | \
Quoted 8 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
drivers/gpu/drm/i915/intel_runtime_pm.c +1
-0+ BIT_ULL(POWER_DOMAIN_AUX_IO_A) | \ BIT_ULL(POWER_DOMAIN_INIT))#define GLK_DISPLAY_AUX_B_POWER_DOMAINS ( \
BIT_ULL(POWER_DOMAIN_AUX_B)| \_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915/ddi: Get AUX power domain for DP main link too (rev2)
In reply to Imre Deak== Series Details ==
== Series Details ==
Series: drm/i915/ddi: Get AUX power domain for DP main link too (rev2)
URL : https://patchwork.freedesktop.org/series/45188/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4363 -> Patchwork_9388 =
== Summary - SUCCESS ==
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/45188/revisions/2/mbox/
== Known issues ==
Here are the changes found in Patchwork_9388 that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@debugfs_test@read_all_entries:
fi-snb-2520m: PASS -> INCOMPLETE (fdo#103713)
==== Possible fixes ====
igt@kms_frontbuffer_tracking@basic:
fi-hsw-peppy: DMESG-FAIL (fdo#102614, fdo#106103) -> PASS fdo#102614 https://bugs.freedesktop.org/show_bug.cgi?id=102614
fdo#103713 https://bugs.freedesktop.org/show_bug.cgi?id=103713
fdo#106103 https://bugs.freedesktop.org/show_bug.cgi?id=106103
== Participating hosts (43 -> 37) ==
Missing (6): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-glk-dsi fi-ctg-p8600 fi-kbl-x1275
== Build changes ==
* Linux: CI_DRM_4363 -> Patchwork_9388
CI_DRM_4363: 9e52e63f91e95af0f7475ccce206d4bdfca8933a @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4528: 6be300d405de5974b262e8b93a445be4ac618e6a @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9388: 6df9a07560c7c1343343e5d9332972e84a4c27bb @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
6df9a07560c7 drm/i915/ddi: Get AUX power domain for DP main link too
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9388/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for drm/i915/ddi: Get AUX power domain for DP main link too (rev2)
In reply to Imre Deak== Series Details ==
== Series Details ==
Series: drm/i915/ddi: Get AUX power domain for DP main link too (rev2)
URL : https://patchwork.freedesktop.org/series/45188/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4363_full -> Patchwork_9388_full =
== Summary - WARNING ==
Minor unknown changes coming with Patchwork_9388_full need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_9388_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
== Possible new issues ==
Here are the unknown changes that may have been introduced in Patchwork_9388_full:
=== IGT changes ===
==== Warnings ====
igt@gem_mocs_settings@mocs-rc6-vebox:
shard-kbl: SKIP -> PASS
igt@perf_pmu@rc6:
shard-kbl: PASS -> SKIP== Known issues ==
Here are the changes found in Patchwork_9388_full that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@drv_suspend@shrink:
shard-apl: PASS -> FAIL (fdo#106886)
igt@gem_ppgtt@blt-vs-render-ctx0:
shard-kbl: PASS -> INCOMPLETE (fdo#103665, fdo#106023)
igt@gem_workarounds@suspend-resume-context:
shard-apl: PASS -> FAIL (fdo#103375) +1
igt@kms_cursor_legacy@2x-nonblocking-modeset-vs-cursor-atomic:
shard-glk: PASS -> FAIL (fdo#106509, fdo#105454)
igt@kms_flip@plain-flip-ts-check-interruptible:
shard-glk: PASS -> FAIL (fdo#100368)
igt@kms_sysfs_edid_timing:
shard-glk: NOTRUN -> WARN (fdo#100047)
igt@perf_pmu@busy-idle-check-all-rcs0:
shard-snb: PASS -> INCOMPLETE (fdo#105411)
==== Possible fixes ====
igt@drv_selftest@live_gtt:
shard-kbl: FAIL (fdo#105347) -> PASS
igt@drv_selftest@live_hangcheck:
shard-kbl: DMESG-FAIL (fdo#106560, fdo#106947) -> PASS
shard-apl: DMESG-FAIL (fdo#106560, fdo#106947) -> PASS
igt@kms_flip@flip-vs-expired-vblank:
shard-glk: FAIL (fdo#105189) -> PASS
igt@kms_flip_tiling@flip-to-x-tiled:
shard-glk: FAIL (fdo#104724) -> PASS +1
igt@kms_setmode@basic:
shard-apl: FAIL (fdo#99912) -> PASS fdo#100047 https://bugs.freedesktop.org/show_bug.cgi?id=100047
fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#103375 https://bugs.freedesktop.org/show_bug.cgi?id=103375
fdo#103665 https://bugs.freedesktop.org/show_bug.cgi?id=103665
fdo#104724 https://bugs.freedesktop.org/show_bug.cgi?id=104724
fdo#105189 https://bugs.freedesktop.org/show_bug.cgi?id=105189
fdo#105347 https://bugs.freedesktop.org/show_bug.cgi?id=105347
fdo#105411 https://bugs.freedesktop.org/show_bug.cgi?id=105411
fdo#105454 https://bugs.freedesktop.org/show_bug.cgi?id=105454
fdo#106023 https://bugs.freedesktop.org/show_bug.cgi?id=106023
fdo#106509 https://bugs.freedesktop.org/show_bug.cgi?id=106509
fdo#106560 https://bugs.freedesktop.org/show_bug.cgi?id=106560
fdo#106886 https://bugs.freedesktop.org/show_bug.cgi?id=106886
fdo#106947 https://bugs.freedesktop.org/show_bug.cgi?id=106947
fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912
== Participating hosts (5 -> 5) ==
No changes in participating hosts
== Build changes ==
* Linux: CI_DRM_4363 -> Patchwork_9388
CI_DRM_4363: 9e52e63f91e95af0f7475ccce206d4bdfca8933a @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4528: 6be300d405de5974b262e8b93a445be4ac618e6a @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9388: 6df9a07560c7c1343343e5d9332972e84a4c27bb @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9388/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Imre Deak
AppliedRe: ✓ Fi.CI.IGT: success for drm/i915/ddi: Get AUX power domain for DP main link too (rev2)
Quoted 5 lines · Patchwork
== Series Details ==
Series: drm/i915/ddi: Get AUX power domain for DP main link too (rev2)
URL : https://patchwork.freedesktop.org/series/45188/
State : success
Pushed to -dinq, thanks for the reviews.
Quoted 106 lines
== Summary ==
= CI Bug Log - changes from
CI_DRM_4363_full->Patchwork_9388_full=== Summary - WARNING ==
Minor unknown changes coming with
Patchwork_9388_fullneed to be verified manually.If you think the reported changes have nothing to do with the changes introduced in
Patchwork_9388_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.== Possible new issues ==
Here are the unknown changes that may have been introduced in
Patchwork_9388_full:=== IGT changes ===
==== Warnings ==== igt@gem_mocs_settings@mocs-rc6-vebox: shard-kbl: SKIP -> PASS igt@perf_pmu@rc6: shard-kbl: PASS -> SKIP== Known issues ==
Here are the changes found in
Patchwork_9388_fullthat come from known issues:=== IGT changes ===
==== Issues hit ==== igt@drv_suspend@shrink: shard-apl: PASS -> FAIL (fdo#106886) igt@gem_ppgtt@blt-vs-render-ctx0: shard-kbl: PASS -> INCOMPLETE (fdo#103665, fdo#106023) igt@gem_workarounds@suspend-resume-context: shard-apl: PASS -> FAIL (fdo#103375) +1 igt@kms_cursor_legacy@2x-nonblocking-modeset-vs-cursor-atomic: shard-glk: PASS -> FAIL (fdo#106509, fdo#105454) igt@kms_flip@plain-flip-ts-check-interruptible: shard-glk: PASS -> FAIL (fdo#100368) igt@kms_sysfs_edid_timing: shard-glk: NOTRUN -> WARN (fdo#100047) igt@perf_pmu@busy-idle-check-all-rcs0: shard-snb: PASS -> INCOMPLETE (fdo#105411) ==== Possible fixes ==== igt@drv_selftest@live_gtt: shard-kbl: FAIL (fdo#105347) -> PASS igt@drv_selftest@live_hangcheck: shard-kbl: DMESG-FAIL (fdo#106560, fdo#106947) -> PASS shard-apl: DMESG-FAIL (fdo#106560, fdo#106947) -> PASS igt@kms_flip@flip-vs-expired-vblank: shard-glk: FAIL (fdo#105189) -> PASS igt@kms_flip_tiling@flip-to-x-tiled: shard-glk: FAIL (fdo#104724) -> PASS +1 igt@kms_setmode@basic: shard-apl: FAIL (fdo#99912) -> PASSfdo#100047 https://bugs.freedesktop.org/show_bug.cgi?id=100047
fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#103375 https://bugs.freedesktop.org/show_bug.cgi?id=103375
fdo#103665 https://bugs.freedesktop.org/show_bug.cgi?id=103665
fdo#104724 https://bugs.freedesktop.org/show_bug.cgi?id=104724
fdo#105189 https://bugs.freedesktop.org/show_bug.cgi?id=105189
fdo#105347 https://bugs.freedesktop.org/show_bug.cgi?id=105347
fdo#105411 https://bugs.freedesktop.org/show_bug.cgi?id=105411
fdo#105454 https://bugs.freedesktop.org/show_bug.cgi?id=105454
fdo#106023 https://bugs.freedesktop.org/show_bug.cgi?id=106023
fdo#106509 https://bugs.freedesktop.org/show_bug.cgi?id=106509
fdo#106560 https://bugs.freedesktop.org/show_bug.cgi?id=106560
fdo#106886 https://bugs.freedesktop.org/show_bug.cgi?id=106886
fdo#106947 https://bugs.freedesktop.org/show_bug.cgi?id=106947
fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912== Participating hosts (5 -> 5) ==
No changes in participating hosts
== Build changes ==
* Linux:
CI_DRM_4363->Patchwork_9388
Quoted 8 lines
CI_DRM_4363:9e52e63f91e95af0f7475ccce206d4bdfca8933a@git://anongit.freedesktop.org/gfx-ci/linux
IGT_4528:6be300d405de5974b262e8b93a445be4ac618e6a@git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9388:6df9a07560c7c1343343e5d9332972e84a4c27bb@git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509:fdc5a4ca11124ab8413c7988896eec4c97336694@git://anongit.freedesktop.org/piglit== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9388/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx