drm/i915/icl: Enable DC9 as lowest possible state during screen-off
Subsystems (2)
PATCH 1/1 drm/i915/icl: Enable DC9 as lowest possible state during screen-off
From: Animesh Manna <[email protected]>
ICL supports DC5, DC6, and DC9. Enable DC9 during screen-off, and enable DC5/6 when appropriate.
v2: (James Ausmus)
- Also handle ICL as GEN9_LP in i915_drm_suspend_late and i915_drm_suspend_early
- Add DC9 to gen9_dc_mask for ICL
- Re-order GEN checks for newest platform first
- Use INTEL_GEN instead of INTEL_INFO->gen
- Use INTEL_GEN >= 11 instead of IS_ICELAKE
- Consolidate GEN checks
v3: (James Ausmus)
- Also allow DC6 for ICL (Imre, Art)
- Simplify !(GEN >= 11) to GEN < 11 (Imre)
v4: (James Ausmus)
- Don't call intel_power_sequencer_reset after DC9 for Gen11+, as the PPS regs are Always On
- Rebase against upstream changes
v5: (Anusha Srivatsa)
- rebased against the latest upstream changes.
v6: (Anusha Srivatsa)
- rebased.Use INTEL_GEN consistently.
- Simplify the code (Rodrigo)
v7: rebased. Change order according to platforms(Jyoti)
v8: rebased. Change the check from platform specific to HAS_PCH_SPLIT(). Add comment in code to be more clear.(Rodrigo)
--- drivers/gpu/drm/i915/i915_drv.c | 20 +++++++++++++--- drivers/gpu/drm/i915/intel_drv.h | 3 +++ drivers/gpu/drm/i915/intel_runtime_pm.c | 31 ++++++++++++++++--------- 3 files changed, 40 insertions(+), 14 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +17 -3
@@ -2156,7 +2156,7 @@ static int i915_drm_resume_early(struct drm_device *dev)intel_uncore_resume_early (dev_priv); -if (IS_GEN9_LP (dev_priv)) { +if (INTEL_GEN (dev_priv) >=11 ||IS_GEN9_LP (dev_priv)) {gen9_sanitize_dc_state (dev_priv);bxt_disable_dc9 (dev_priv); }else if (IS_HASWELL (dev_priv) ||IS_BROADWELL (dev_priv)) {
@@ -2923,7 +2923,10 @@ static int intel_runtime_suspend(struct device *kdev)intel_uncore_suspend (dev_priv); ret =0 ; -if (IS_GEN9_LP (dev_priv)) { +if (INTEL_GEN (dev_priv) >=11 ) { +icl_display_core_uninit (dev_priv); +bxt_enable_dc9 (dev_priv); + }else if (IS_GEN9_LP (dev_priv)) {bxt_display_core_uninit (dev_priv);bxt_enable_dc9 (dev_priv); }else if (IS_HASWELL (dev_priv) ||IS_BROADWELL (dev_priv)) {
@@ -3008,7 +3011,18 @@ static int intel_runtime_resume(struct device *kdev)if (intel_uncore_unclaimed_mmio (dev_priv))DRM_DEBUG_DRIVER ("Unclaimed access during suspend, bios?\n" ); -if (IS_GEN9_LP (dev_priv)) { +if (INTEL_GEN (dev_priv) >=11 ) { +bxt_disable_dc9 (dev_priv); +icl_display_core_init (dev_priv, true); +if (dev_priv->csr.dmc_payload) { +if (dev_priv->csr.allowed_dc_mask & +DC_STATE_EN_UPTO_DC6 ) +skl_enable_dc6 (dev_priv); +else if (dev_priv->csr.allowed_dc_mask & +DC_STATE_EN_UPTO_DC5 ) +gen9_enable_dc5 (dev_priv); + } + }else if (IS_GEN9_LP (dev_priv)) {bxt_disable_dc9 (dev_priv);bxt_display_core_init (dev_priv, true); if (dev_priv->csr.dmc_payload &&
drivers/gpu/drm/i915/intel_drv.h +3 -0
@@ -1640,6 +1640,7 @@ void bxt_enable_dc9(struct drm_i915_private *dev_priv);void bxt_disable_dc9 (struct drm_i915_private *dev_priv);void gen9_enable_dc5 (struct drm_i915_private *dev_priv);unsigned int skl_cdclk_get_vco (unsigned int freq); +void skl_enable_dc6 (struct drm_i915_private *dev_priv);void intel_dp_get_m_n (struct intel_crtc *crtc,struct intel_crtc_state *pipe_config); void intel_dp_set_m_n(const struct intel_crtc_state *crtc_state,
@@ -1989,6 +1990,8 @@ int intel_power_domains_init(struct drm_i915_private *);void intel_power_domains_cleanup (struct drm_i915_private *dev_priv);void intel_power_domains_init_hw (struct drm_i915_private *dev_priv,bool resume);void intel_power_domains_fini_hw (struct drm_i915_private *dev_priv); +void icl_display_core_init (struct drm_i915_private *dev_priv,bool resume); +void icl_display_core_uninit (struct drm_i915_private *dev_priv);void intel_power_domains_enable (struct drm_i915_private *dev_priv);void intel_power_domains_disable (struct drm_i915_private *dev_priv);
drivers/gpu/drm/i915/intel_runtime_pm.c +20 -11
@@ -560,7 +560,9 @@ static u32 gen9_dc_mask(struct drm_i915_private *dev_priv)u32 mask; mask =DC_STATE_EN_UPTO_DC5 ; -if (IS_GEN9_LP (dev_priv)) +if (INTEL_GEN (dev_priv) >=11 ) + mask |=DC_STATE_EN_UPTO_DC6 |DC_STATE_EN_DC9 ; +else if (IS_GEN9_LP (dev_priv)) mask |=DC_STATE_EN_DC9 ;else mask |=DC_STATE_EN_UPTO_DC6 ;
@@ -633,8 +635,12 @@ void bxt_enable_dc9(struct drm_i915_private *dev_priv)assert_can_enable_dc9 (dev_priv);DRM_DEBUG_KMS ("Enabling DC9\n" ); - -intel_power_sequencer_reset (dev_priv); +/* In case of Gen11+, PPS registers are always on, due +* to PCH split. Reset power sequencer on platforms +* without the PCH split. +*/ +if (!HAS_PCH_SPLIT (dev_priv)) +intel_power_sequencer_reset (dev_priv);gen9_set_dc_state (dev_priv,DC_STATE_EN_DC9 ); }
@@ -716,7 +722,7 @@ static void assert_can_enable_dc6(struct drm_i915_private *dev_priv)assert_csr_loaded (dev_priv); } -static void skl_enable_dc6 (struct drm_i915_private *dev_priv) +void skl_enable_dc6 (struct drm_i915_private *dev_priv) {assert_can_enable_dc6 (dev_priv);
@@ -2978,17 +2984,20 @@ static uint32_t get_allowed_dc_mask(const struct drm_i915_private *dev_priv,int requested_dc;int max_dc; -if (IS_GEN9_BC (dev_priv) ||INTEL_INFO (dev_priv)->gen >=10 ) { +if (INTEL_GEN (dev_priv) >=11 ) { max_dc =2 ; - mask =0 ; - }else if (IS_GEN9_LP (dev_priv)) { - max_dc =1 ;/* * DC9 has a separate HW flow from the rest of the DC states, * not depending on the DMC firmware. It's needed by system * suspend/resume, so allow it unconditionally. */ mask =DC_STATE_EN_DC9 ; + }else if (IS_GEN10 (dev_priv) ||IS_GEN9_BC (dev_priv)) { + max_dc =2 ; + mask =0 ; + }else if (IS_GEN9_LP (dev_priv)) { + max_dc =1 ; + mask =DC_STATE_EN_DC9 ; }else { max_dc =0 ; mask =0 ;
@@ -3539,8 +3548,8 @@ static void cnl_display_core_uninit(struct drm_i915_private *dev_priv)I915_WRITE (CHICKEN_MISC_2 , val); } -static void icl_display_core_init (struct drm_i915_private *dev_priv, -bool resume) +void icl_display_core_init (struct drm_i915_private *dev_priv, +bool resume) {struct i915_power_domains *power_domains = &dev_priv->power_domains;struct i915_power_well *well;
@@ -3592,7 +3601,7 @@ static void icl_display_core_init(struct drm_i915_private *dev_priv,intel_csr_load_program (dev_priv); } -static void icl_display_core_uninit (struct drm_i915_private *dev_priv) +void icl_display_core_uninit (struct drm_i915_private *dev_priv) {struct i915_power_domains *power_domains = &dev_priv->power_domains;struct i915_power_well *well;
Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 128 lines · Anusha Srivatsa
From: Animesh Manna <[email protected]>
ICL supports DC5, DC6, and DC9. Enable DC9 during screen-off, and enable DC5/6 when appropriate.
v2: (James Ausmus)
- Also handle ICL asGEN9_LPini915_drm_suspend_lateandi915_drm_suspend_early
- Add DC9 togen9_dc_maskfor ICL
- Re-order GEN checks for newest platform first
- UseINTEL_GENinstead ofINTEL_INFO->gen
- UseINTEL_GEN>= 11 instead ofIS_ICELAKE
- Consolidate GEN checksv3: (James Ausmus)
- Also allow DC6 for ICL (Imre, Art)
- Simplify !(GEN >= 11) to GEN < 11 (Imre)v4: (James Ausmus)
- Don't callintel_power_sequencer_resetafter DC9 for Gen11+, as the PPS regs are Always On
- Rebase against upstream changesv5: (Anusha Srivatsa)
- rebased against the latest upstream changes.v6: (Anusha Srivatsa)
- rebased.UseINTEL_GENconsistently.
- Simplify the code (Rodrigo)v7: rebased. Change order according to platforms(Jyoti)
v8: rebased. Change the check from platform specific to
HAS_PCH_SPLIT(). Add comment in code to be more clear.(Rodrigo)Cc Imre Deak <[email protected]>Cc Rodrigo Vivi <[email protected]>Signed-off-by Animesh Manna <[email protected]>Signed-off-by James Ausmus <[email protected]>Signed-off-by Anusha Srivatsa <[email protected]>--- drivers/gpu/drm/i915/i915_drv.c | 20 +++++++++++++--- drivers/gpu/drm/i915/intel_drv.h | 3 +++ drivers/gpu/drm/i915/intel_runtime_pm.c | 31 ++++++++++++++++--------- 3 files changed, 40 insertions(+), 14 deletions(-)drivers/gpu/drm/i915/i915_drv.c +17
-3@@ -2156,7 +2156,7 @@ static int i915_drm_resume_early(struct drm_device *dev)intel_uncore_resume_early (dev_priv); -if (IS_GEN9_LP (dev_priv)) { +if (INTEL_GEN (dev_priv) >=11 ||IS_GEN9_LP (dev_priv)) {gen9_sanitize_dc_state (dev_priv);bxt_disable_dc9 (dev_priv); }else if (IS_HASWELL (dev_priv) ||IS_BROADWELL (dev_priv)) {@@ -2923,7 +2923,10 @@ static int intel_runtime_suspend(struct device *kdev)intel_uncore_suspend (dev_priv); ret =0 ; -if (IS_GEN9_LP (dev_priv)) { +if (INTEL_GEN (dev_priv) >=11 ) { +icl_display_core_uninit (dev_priv); +bxt_enable_dc9 (dev_priv); + }else if (IS_GEN9_LP (dev_priv)) {bxt_display_core_uninit (dev_priv);bxt_enable_dc9 (dev_priv); }else if (IS_HASWELL (dev_priv) ||IS_BROADWELL (dev_priv)) {@@ -3008,7 +3011,18 @@ static int intel_runtime_resume(struct device *kdev)if (intel_uncore_unclaimed_mmio (dev_priv))DRM_DEBUG_DRIVER ("Unclaimed access during suspend, bios?\n" ); -if (IS_GEN9_LP (dev_priv)) { +if (INTEL_GEN (dev_priv) >=11 ) { +bxt_disable_dc9 (dev_priv); +icl_display_core_init (dev_priv, true); +if (dev_priv->csr.dmc_payload) { +if (dev_priv->csr.allowed_dc_mask & +DC_STATE_EN_UPTO_DC6 ) +skl_enable_dc6 (dev_priv); +else if (dev_priv->csr.allowed_dc_mask & +DC_STATE_EN_UPTO_DC5 ) +gen9_enable_dc5 (dev_priv); + } + }else if (IS_GEN9_LP (dev_priv)) {bxt_disable_dc9 (dev_priv);bxt_display_core_init (dev_priv, true); if (dev_priv->csr.dmc_payload &&drivers/gpu/drm/i915/intel_drv.h +3
-0@@ -1640,6 +1640,7 @@ void bxt_enable_dc9(struct drm_i915_private *dev_priv);void bxt_disable_dc9 (struct drm_i915_private *dev_priv);void gen9_enable_dc5 (struct drm_i915_private *dev_priv);unsigned int skl_cdclk_get_vco (unsigned int freq); +void skl_enable_dc6 (struct drm_i915_private *dev_priv);void intel_dp_get_m_n (struct intel_crtc *crtc,struct intel_crtc_state *pipe_config); void intel_dp_set_m_n(const struct intel_crtc_state *crtc_state,@@ -1989,6 +1990,8 @@ int intel_power_domains_init(struct drm_i915_private *);void intel_power_domains_cleanup (struct drm_i915_private *dev_priv);void intel_power_domains_init_hw (struct drm_i915_private *dev_priv,bool resume);void intel_power_domains_fini_hw (struct drm_i915_private *dev_priv); +void icl_display_core_init (struct drm_i915_private *dev_priv,bool resume); +void icl_display_core_uninit (struct drm_i915_private *dev_priv);void intel_power_domains_enable (struct drm_i915_private *dev_priv);void intel_power_domains_disable (struct drm_i915_private *dev_priv);drivers/gpu/drm/i915/intel_runtime_pm.c +3
-1@@ -560,7 +560,9 @@ static u32 gen9_dc_mask(struct drm_i915_private *dev_priv)u32 mask; mask =DC_STATE_EN_UPTO_DC5 ; -if (IS_GEN9_LP (dev_priv)) +if (INTEL_GEN (dev_priv) >=11 ) + mask |=DC_STATE_EN_UPTO_DC6 |DC_STATE_EN_DC9 ; +else if (IS_GEN9_LP (dev_priv)) mask |=DC_STATE_EN_DC9 ;else mask |=DC_STATE_EN_UPTO_DC6 ;
drivers/gpu/drm/i915/intel_runtime_pm.c void bxt_enable_dc9(struct drm_i915_private *dev_priv) · line 638
Quoted 6 lines
drivers/gpu/drm/i915/intel_runtime_pm.c +1
-2@@ -633,8 +635,12 @@ void bxt_enable_dc9(struct drm_i915_private *dev_priv)assert_can_enable_dc9 (dev_priv);DRM_DEBUG_KMS ("Enabling DC9\n" ); - -intel_power_sequencer_reset (dev_priv); +/* In case of Gen11+, PPS registers are always on, due
/*
* In case...
(but can be fixed while merging.
drivers/gpu/drm/i915/intel_runtime_pm.c void bxt_enable_dc9(struct drm_i915_private *dev_priv) · line 641
Quoted 3 lines
drivers/gpu/drm/i915/intel_runtime_pm.c +3
-0+* to PCH split. Reset power sequencer on platforms +* without the PCH split. +*/
What about:
/*
* Power sequencer reset is not needed on platforms with
* South Display Engine on PCH, because PPS registers are always on. */
with or without accepting this bikeshed
Quoted 62 lines
drivers/gpu/drm/i915/intel_runtime_pm.c +13
-8+if (!HAS_PCH_SPLIT (dev_priv)) +intel_power_sequencer_reset (dev_priv);gen9_set_dc_state (dev_priv,DC_STATE_EN_DC9 ); }@@ -716,7 +722,7 @@ static void assert_can_enable_dc6(struct drm_i915_private *dev_priv)assert_csr_loaded (dev_priv); } -static void skl_enable_dc6 (struct drm_i915_private *dev_priv) +void skl_enable_dc6 (struct drm_i915_private *dev_priv) {assert_can_enable_dc6 (dev_priv);@@ -2978,17 +2984,20 @@ static uint32_t get_allowed_dc_mask(const struct drm_i915_private *dev_priv,int requested_dc;int max_dc; -if (IS_GEN9_BC (dev_priv) ||INTEL_INFO (dev_priv)->gen >=10 ) { +if (INTEL_GEN (dev_priv) >=11 ) { max_dc =2 ; - mask =0 ; - }else if (IS_GEN9_LP (dev_priv)) { - max_dc =1 ;/* * DC9 has a separate HW flow from the rest of the DC states, * not depending on the DMC firmware. It's needed by system * suspend/resume, so allow it unconditionally. */ mask =DC_STATE_EN_DC9 ; + }else if (IS_GEN10 (dev_priv) ||IS_GEN9_BC (dev_priv)) { + max_dc =2 ; + mask =0 ; + }else if (IS_GEN9_LP (dev_priv)) { + max_dc =1 ; + mask =DC_STATE_EN_DC9 ; }else { max_dc =0 ; mask =0 ;@@ -3539,8 +3548,8 @@ static void cnl_display_core_uninit(struct drm_i915_private *dev_priv)I915_WRITE (CHICKEN_MISC_2 , val); } -static void icl_display_core_init (struct drm_i915_private *dev_priv, -bool resume) +void icl_display_core_init (struct drm_i915_private *dev_priv, +bool resume) {struct i915_power_domains *power_domains = &dev_priv->power_domains;struct i915_power_well *well;@@ -3592,7 +3601,7 @@ static void icl_display_core_init(struct drm_i915_private *dev_priv,intel_csr_load_program (dev_priv); } -static void icl_display_core_uninit (struct drm_i915_private *dev_priv) +void icl_display_core_uninit (struct drm_i915_private *dev_priv) {struct i915_power_domains *power_domains = &dev_priv->power_domains;struct i915_power_well *well;Signature · 1 line
2.17.1
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915/icl: Enable DC9 as lowest possible state during screen-off (rev5)
In reply to Anusha Srivatsa== Series Details ==
== Series Details ==
Series: drm/i915/icl: Enable DC9 as lowest possible state during screen-off (rev5)
URL : https://patchwork.freedesktop.org/series/49447/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_5033 -> Patchwork_10570 =
== Summary - WARNING ==
Minor unknown changes coming with Patchwork_10570 need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_10570, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://patchwork.freedesktop.org/api/1.0/series/49447/revisions/5/mbox/
== Possible new issues ==
Here are the unknown changes that may have been introduced in Patchwork_10570:
=== IGT changes ===
==== Warnings ====
igt@pm_rpm@module-reload:
fi-hsw-4770r: SKIP -> PASS== Known issues ==
Here are the changes found in Patchwork_10570 that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@drv_module_reload@basic-reload:
fi-blb-e6850: PASS -> INCOMPLETE (fdo#107718)
fi-glk-j4005: PASS -> DMESG-WARN (fdo#106725, fdo#106248)
igt@drv_selftest@live_contexts:
fi-icl-u: NOTRUN -> INCOMPLETE (fdo#108535)
igt@kms_flip@basic-flip-vs-dpms:
fi-glk-j4005: PASS -> DMESG-WARN (fdo#106000)
igt@kms_flip@basic-flip-vs-wf_vblank:
fi-glk-j4005: PASS -> FAIL (fdo#106724)
igt@kms_frontbuffer_tracking@basic:
fi-byt-clapper: PASS -> FAIL (fdo#103167)
==== Possible fixes ====
igt@drv_module_reload@basic-reload-inject:
fi-hsw-4770r: DMESG-WARN (fdo#107924, fdo#107425) -> PASS
igt@drv_selftest@live_hangcheck:
fi-kbl-7560u: INCOMPLETE (fdo#108044) -> PASS
igt@kms_flip@basic-flip-vs-dpms:
fi-skl-6700hq: DMESG-WARN (fdo#105998) -> PASS
igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b:
fi-icl-u: INCOMPLETE (fdo#107713) -> PASS fdo#103167 https://bugs.freedesktop.org/show_bug.cgi?id=103167
fdo#105998 https://bugs.freedesktop.org/show_bug.cgi?id=105998
fdo#106000 https://bugs.freedesktop.org/show_bug.cgi?id=106000
fdo#106248 https://bugs.freedesktop.org/show_bug.cgi?id=106248
fdo#106724 https://bugs.freedesktop.org/show_bug.cgi?id=106724
fdo#106725 https://bugs.freedesktop.org/show_bug.cgi?id=106725
fdo#107425 https://bugs.freedesktop.org/show_bug.cgi?id=107425
fdo#107713 https://bugs.freedesktop.org/show_bug.cgi?id=107713
fdo#107718 https://bugs.freedesktop.org/show_bug.cgi?id=107718
fdo#107924 https://bugs.freedesktop.org/show_bug.cgi?id=107924
fdo#108044 https://bugs.freedesktop.org/show_bug.cgi?id=108044
fdo#108535 https://bugs.freedesktop.org/show_bug.cgi?id=108535
== Participating hosts (47 -> 42) ==
Missing (5): fi-kbl-soraka fi-ilk-m540 fi-byt-squawks fi-bsw-cyan fi-ctg-p8600
== Build changes ==
* Linux: CI_DRM_5033 -> Patchwork_10570
CI_DRM_5033: f935e4c7634781e6ffef10bb8a1c93225ac42d90 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4691: d445be01f5edc7e7a324444c73e221c9ed75602e @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_10570: 901447ca5a4d5edfbded8c47f901147a2ce784bb @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
901447ca5a4d drm/i915/icl: Enable DC9 as lowest possible state during screen-off
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_10570/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx