| Message ID | 20230424200205.1732941-1-imre.deak@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915/adlp+: Disable DC5/6 states for TC port DDI/AUX and for combo port AUX | expand |
On 24.04.2023 22:02, Imre Deak wrote: > On ADLP+ Bspec allows DC5/6 to be enabled while power well 2 is enabled. > Since the AUX and DDI power wells (except for port A/B) are also backed > by power well 2, this would suggest that DC5/6 can be enabled while any > of these AUX or DDI port functionalities are used. As opposed to this > AUX transfers will time out on ADLP TypeC ports while DC6 is enabled. > > Until the restriction for DC5/6 is clarified in Bspec let's assume that > the intention is to allow for using these power states while pipe A/B is > enabled, but only for combo ports which can be used with eDP outputs. > Similarly assume that AUX transaction initiated by the driver on any port > requires DC states to be disabled. > > Cc: Matt Roper <matthew.d.roper@intel.com> > Cc: Radhakrishna Sripada <radhakrishna.sripada@intel.com> > Fixes: 88c487938414 ("drm/i915: Use separate "DC off" power well for ADL-P and DG2") > Signed-off-by: Imre Deak <imre.deak@intel.com> Great it revives bat-dg2-11. Reviewed-by: Andrzej Hajda <andrzej.hajda@intel.com> Regards Andrzej > --- > .../i915/display/intel_display_power_map.c | 28 +++++++++++-------- > 1 file changed, 16 insertions(+), 12 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display_power_map.c b/drivers/gpu/drm/i915/display/intel_display_power_map.c > index 100582f105905..ca448359a8226 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_power_map.c > +++ b/drivers/gpu/drm/i915/display/intel_display_power_map.c > @@ -1251,22 +1251,11 @@ I915_DECL_PW_DOMAINS(xelpd_pwdoms_pw_a, > POWER_DOMAIN_PIPE_PANEL_FITTER_A, > POWER_DOMAIN_INIT); > > -#define XELPD_PW_2_POWER_DOMAINS \ > - XELPD_PW_B_POWER_DOMAINS, \ > - XELPD_PW_C_POWER_DOMAINS, \ > - XELPD_PW_D_POWER_DOMAINS, \ > - POWER_DOMAIN_PORT_DDI_LANES_C, \ > - POWER_DOMAIN_PORT_DDI_LANES_D, \ > - POWER_DOMAIN_PORT_DDI_LANES_E, \ > +#define XELPD_DC_OFF_PORT_POWER_DOMAINS \ > POWER_DOMAIN_PORT_DDI_LANES_TC1, \ > POWER_DOMAIN_PORT_DDI_LANES_TC2, \ > POWER_DOMAIN_PORT_DDI_LANES_TC3, \ > POWER_DOMAIN_PORT_DDI_LANES_TC4, \ > - POWER_DOMAIN_VGA, \ > - POWER_DOMAIN_AUDIO_PLAYBACK, \ > - POWER_DOMAIN_AUX_IO_C, \ > - POWER_DOMAIN_AUX_IO_D, \ > - POWER_DOMAIN_AUX_IO_E, \ > POWER_DOMAIN_AUX_C, \ > POWER_DOMAIN_AUX_D, \ > POWER_DOMAIN_AUX_E, \ > @@ -1279,6 +1268,20 @@ I915_DECL_PW_DOMAINS(xelpd_pwdoms_pw_a, > POWER_DOMAIN_AUX_TBT3, \ > POWER_DOMAIN_AUX_TBT4 > > +#define XELPD_PW_2_POWER_DOMAINS \ > + XELPD_PW_B_POWER_DOMAINS, \ > + XELPD_PW_C_POWER_DOMAINS, \ > + XELPD_PW_D_POWER_DOMAINS, \ > + POWER_DOMAIN_PORT_DDI_LANES_C, \ > + POWER_DOMAIN_PORT_DDI_LANES_D, \ > + POWER_DOMAIN_PORT_DDI_LANES_E, \ > + POWER_DOMAIN_VGA, \ > + POWER_DOMAIN_AUDIO_PLAYBACK, \ > + POWER_DOMAIN_AUX_IO_C, \ > + POWER_DOMAIN_AUX_IO_D, \ > + POWER_DOMAIN_AUX_IO_E, \ > + XELPD_DC_OFF_PORT_POWER_DOMAINS > + > I915_DECL_PW_DOMAINS(xelpd_pwdoms_pw_2, > XELPD_PW_2_POWER_DOMAINS, > POWER_DOMAIN_INIT); > @@ -1301,6 +1304,7 @@ I915_DECL_PW_DOMAINS(xelpd_pwdoms_pw_2, > */ > > I915_DECL_PW_DOMAINS(xelpd_pwdoms_dc_off, > + XELPD_DC_OFF_PORT_POWER_DOMAINS, > XELPD_PW_C_POWER_DOMAINS, > XELPD_PW_D_POWER_DOMAINS, > POWER_DOMAIN_PORT_DSI,
On Tue, Apr 25, 2023 at 07:06:20AM +0000, Patchwork wrote: > == Series Details == > > Series: drm/i915/adlp+: Disable DC5/6 states for TC port DDI/AUX and for combo port AUX > URL : https://patchwork.freedesktop.org/series/116909/ > State : success Thanks for the review, pushed to drm-intel-next. > > == Summary == > > CI Bug Log - changes from CI_DRM_13056_full -> Patchwork_116909v1_full > ==================================================== > > Summary > ------- > > **SUCCESS** > > No regressions found. > > > > Participating hosts (7 -> 8) > ------------------------------ > > Additional (1): shard-rkl0 > > Known issues > ------------ > > Here are the changes found in Patchwork_116909v1_full that come from known issues: > > ### IGT changes ### > > #### Issues hit #### > > * igt@gem_exec_fair@basic-deadline: > - shard-glk: [PASS][1] -> [FAIL][2] ([i915#2846]) > [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13056/shard-glk8/igt@gem_exec_fair@basic-deadline.html > [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116909v1/shard-glk2/igt@gem_exec_fair@basic-deadline.html > > * igt@gem_exec_fair@basic-pace-share@rcs0: > - shard-glk: [PASS][3] -> [FAIL][4] ([i915#2842]) > [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13056/shard-glk5/igt@gem_exec_fair@basic-pace-share@rcs0.html > [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116909v1/shard-glk4/igt@gem_exec_fair@basic-pace-share@rcs0.html > > * igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size: > - shard-apl: [PASS][5] -> [FAIL][6] ([i915#2346]) > [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13056/shard-apl6/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html > [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116909v1/shard-apl1/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html > - shard-glk: [PASS][7] -> [FAIL][8] ([i915#2346]) > [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13056/shard-glk4/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html > [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116909v1/shard-glk6/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html > > * igt@kms_dither@fb-8bpc-vs-panel-6bpc@pipe-a-hdmi-a-1: > - shard-glk: NOTRUN -> [SKIP][9] ([fdo#109271]) > [9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116909v1/shard-glk2/igt@kms_dither@fb-8bpc-vs-panel-6bpc@pipe-a-hdmi-a-1.html > > * igt@kms_plane_scaling@planes-downscale-factor-0-25-upscale-0-25@pipe-a-hdmi-a-1: > - shard-snb: NOTRUN -> [SKIP][10] ([fdo#109271]) +18 similar issues > [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116909v1/shard-snb1/igt@kms_plane_scaling@planes-downscale-factor-0-25-upscale-0-25@pipe-a-hdmi-a-1.html > > > #### Possible fixes #### > > * igt@drm_fdinfo@most-busy-idle-check-all@rcs0: > - {shard-rkl}: [FAIL][11] ([i915#7742]) -> [PASS][12] > [11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13056/shard-rkl-3/igt@drm_fdinfo@most-busy-idle-check-all@rcs0.html > [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116909v1/shard-rkl-4/igt@drm_fdinfo@most-busy-idle-check-all@rcs0.html > > * igt@gem_ppgtt@blt-vs-render-ctxn: > - shard-snb: [FAIL][13] ([i915#8295]) -> [PASS][14] > [13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13056/shard-snb1/igt@gem_ppgtt@blt-vs-render-ctxn.html > [14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116909v1/shard-snb4/igt@gem_ppgtt@blt-vs-render-ctxn.html > > * igt@i915_pm_rpm@dpms-lpsp: > - {shard-rkl}: [SKIP][15] ([i915#1397]) -> [PASS][16] > [15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13056/shard-rkl-4/igt@i915_pm_rpm@dpms-lpsp.html > [16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116909v1/shard-rkl-7/igt@i915_pm_rpm@dpms-lpsp.html > > * igt@kms_cursor_legacy@forked-move@pipe-b: > - {shard-dg1}: [INCOMPLETE][17] ([i915#8011] / [i915#8347]) -> [PASS][18] > [17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13056/shard-dg1-14/igt@kms_cursor_legacy@forked-move@pipe-b.html > [18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116909v1/shard-dg1-18/igt@kms_cursor_legacy@forked-move@pipe-b.html > > * igt@kms_flip@2x-flip-vs-expired-vblank@ac-hdmi-a1-hdmi-a2: > - shard-glk: [FAIL][19] ([i915#79]) -> [PASS][20] > [19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13056/shard-glk4/igt@kms_flip@2x-flip-vs-expired-vblank@ac-hdmi-a1-hdmi-a2.html > [20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116909v1/shard-glk7/igt@kms_flip@2x-flip-vs-expired-vblank@ac-hdmi-a1-hdmi-a2.html > > * igt@kms_flip@flip-vs-expired-vblank-interruptible@c-dp1: > - shard-apl: [FAIL][21] ([i915#79]) -> [PASS][22] > [21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13056/shard-apl1/igt@kms_flip@flip-vs-expired-vblank-interruptible@c-dp1.html > [22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116909v1/shard-apl6/igt@kms_flip@flip-vs-expired-vblank-interruptible@c-dp1.html > > > {name}: This element is suppressed. This means it is ignored when computing > the status of the difference (SUCCESS, WARNING, or FAILURE). > > [fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271 > [fdo#109289]: https://bugs.freedesktop.org/show_bug.cgi?id=109289 > [fdo#109291]: https://bugs.freedesktop.org/show_bug.cgi?id=109291 > [fdo#109302]: https://bugs.freedesktop.org/show_bug.cgi?id=109302 > [fdo#110189]: https://bugs.freedesktop.org/show_bug.cgi?id=110189 > [fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068 > [fdo#111825]: https://bugs.freedesktop.org/show_bug.cgi?id=111825 > [fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827 > [i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072 > [i915#1397]: https://gitlab.freedesktop.org/drm/intel/issues/1397 > [i915#1839]: https://gitlab.freedesktop.org/drm/intel/issues/1839 > [i915#2346]: https://gitlab.freedesktop.org/drm/intel/issues/2346 > [i915#2437]: https://gitlab.freedesktop.org/drm/intel/issues/2437 > [i915#2527]: https://gitlab.freedesktop.org/drm/intel/issues/2527 > [i915#2575]: https://gitlab.freedesktop.org/drm/intel/issues/2575 > [i915#2587]: https://gitlab.freedesktop.org/drm/intel/issues/2587 > [i915#2672]: https://gitlab.freedesktop.org/drm/intel/issues/2672 > [i915#2842]: https://gitlab.freedesktop.org/drm/intel/issues/2842 > [i915#2846]: https://gitlab.freedesktop.org/drm/intel/issues/2846 > [i915#3281]: https://gitlab.freedesktop.org/drm/intel/issues/3281 > [i915#3282]: https://gitlab.freedesktop.org/drm/intel/issues/3282 > [i915#3297]: https://gitlab.freedesktop.org/drm/intel/issues/3297 > [i915#3359]: https://gitlab.freedesktop.org/drm/intel/issues/3359 > [i915#3458]: https://gitlab.freedesktop.org/drm/intel/issues/3458 > [i915#3539]: https://gitlab.freedesktop.org/drm/intel/issues/3539 > [i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555 > [i915#3638]: https://gitlab.freedesktop.org/drm/intel/issues/3638 > [i915#3689]: https://gitlab.freedesktop.org/drm/intel/issues/3689 > [i915#3708]: https://gitlab.freedesktop.org/drm/intel/issues/3708 > [i915#3886]: https://gitlab.freedesktop.org/drm/intel/issues/3886 > [i915#3955]: https://gitlab.freedesktop.org/drm/intel/issues/3955 > [i915#4077]: https://gitlab.freedesktop.org/drm/intel/issues/4077 > [i915#4083]: https://gitlab.freedesktop.org/drm/intel/issues/4083 > [i915#4212]: https://gitlab.freedesktop.org/drm/intel/issues/4212 > [i915#4215]: https://gitlab.freedesktop.org/drm/intel/issues/4215 > [i915#4270]: https://gitlab.freedesktop.org/drm/intel/issues/4270 > [i915#4538]: https://gitlab.freedesktop.org/drm/intel/issues/4538 > [i915#4565]: https://gitlab.freedesktop.org/drm/intel/issues/4565 > [i915#4579]: https://gitlab.freedesktop.org/drm/intel/issues/4579 > [i915#4812]: https://gitlab.freedesktop.org/drm/intel/issues/4812 > [i915#4833]: https://gitlab.freedesktop.org/drm/intel/issues/4833 > [i915#4852]: https://gitlab.freedesktop.org/drm/intel/issues/4852 > [i915#4860]: https://gitlab.freedesktop.org/drm/intel/issues/4860 > [i915#4879]: https://gitlab.freedesktop.org/drm/intel/issues/4879 > [i915#4881]: https://gitlab.freedesktop.org/drm/intel/issues/4881 > [i915#4983]: https://gitlab.freedesktop.org/drm/intel/issues/4983 > [i915#5176]: https://gitlab.freedesktop.org/drm/intel/issues/5176 > [i915#5235]: https://gitlab.freedesktop.org/drm/intel/issues/5235 > [i915#5286]: https://gitlab.freedesktop.org/drm/intel/issues/5286 > [i915#5289]: https://gitlab.freedesktop.org/drm/intel/issues/5289 > [i915#5354]: https://gitlab.freedesktop.org/drm/intel/issues/5354 > [i915#5563]: https://gitlab.freedesktop.org/drm/intel/issues/5563 > [i915#6095]: https://gitlab.freedesktop.org/drm/intel/issues/6095 > [i915#6268]: https://gitlab.freedesktop.org/drm/intel/issues/6268 > [i915#658]: https://gitlab.freedesktop.org/drm/intel/issues/658 > [i915#7116]: https://gitlab.freedesktop.org/drm/intel/issues/7116 > [i915#7561]: https://gitlab.freedesktop.org/drm/intel/issues/7561 > [i915#7701]: https://gitlab.freedesktop.org/drm/intel/issues/7701 > [i915#7711]: https://gitlab.freedesktop.org/drm/intel/issues/7711 > [i915#7742]: https://gitlab.freedesktop.org/drm/intel/issues/7742 > [i915#7828]: https://gitlab.freedesktop.org/drm/intel/issues/7828 > [i915#79]: https://gitlab.freedesktop.org/drm/intel/issues/79 > [i915#8011]: https://gitlab.freedesktop.org/drm/intel/issues/8011 > [i915#8253]: https://gitlab.freedesktop.org/drm/intel/issues/8253 > [i915#8295]: https://gitlab.freedesktop.org/drm/intel/issues/8295 > [i915#8347]: https://gitlab.freedesktop.org/drm/intel/issues/8347 > [i915#8381]: https://gitlab.freedesktop.org/drm/intel/issues/8381 > > > Build changes > ------------- > > * Linux: CI_DRM_13056 -> Patchwork_116909v1 > > CI-20190529: 20190529 > CI_DRM_13056: 308c0163d9e46238948942260e6d2abcad3d8bff @ git://anongit.freedesktop.org/gfx-ci/linux > IGT_7267: a267f0236e06fc282e3dc3b8c7d76f9ed6088d9b @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git > Patchwork_116909v1: 308c0163d9e46238948942260e6d2abcad3d8bff @ 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_116909v1/index.html
diff --git a/drivers/gpu/drm/i915/display/intel_display_power_map.c b/drivers/gpu/drm/i915/display/intel_display_power_map.c index 100582f105905..ca448359a8226 100644 --- a/drivers/gpu/drm/i915/display/intel_display_power_map.c +++ b/drivers/gpu/drm/i915/display/intel_display_power_map.c @@ -1251,22 +1251,11 @@ I915_DECL_PW_DOMAINS(xelpd_pwdoms_pw_a, POWER_DOMAIN_PIPE_PANEL_FITTER_A, POWER_DOMAIN_INIT); -#define XELPD_PW_2_POWER_DOMAINS \ - XELPD_PW_B_POWER_DOMAINS, \ - XELPD_PW_C_POWER_DOMAINS, \ - XELPD_PW_D_POWER_DOMAINS, \ - POWER_DOMAIN_PORT_DDI_LANES_C, \ - POWER_DOMAIN_PORT_DDI_LANES_D, \ - POWER_DOMAIN_PORT_DDI_LANES_E, \ +#define XELPD_DC_OFF_PORT_POWER_DOMAINS \ POWER_DOMAIN_PORT_DDI_LANES_TC1, \ POWER_DOMAIN_PORT_DDI_LANES_TC2, \ POWER_DOMAIN_PORT_DDI_LANES_TC3, \ POWER_DOMAIN_PORT_DDI_LANES_TC4, \ - POWER_DOMAIN_VGA, \ - POWER_DOMAIN_AUDIO_PLAYBACK, \ - POWER_DOMAIN_AUX_IO_C, \ - POWER_DOMAIN_AUX_IO_D, \ - POWER_DOMAIN_AUX_IO_E, \ POWER_DOMAIN_AUX_C, \ POWER_DOMAIN_AUX_D, \ POWER_DOMAIN_AUX_E, \ @@ -1279,6 +1268,20 @@ I915_DECL_PW_DOMAINS(xelpd_pwdoms_pw_a, POWER_DOMAIN_AUX_TBT3, \ POWER_DOMAIN_AUX_TBT4 +#define XELPD_PW_2_POWER_DOMAINS \ + XELPD_PW_B_POWER_DOMAINS, \ + XELPD_PW_C_POWER_DOMAINS, \ + XELPD_PW_D_POWER_DOMAINS, \ + POWER_DOMAIN_PORT_DDI_LANES_C, \ + POWER_DOMAIN_PORT_DDI_LANES_D, \ + POWER_DOMAIN_PORT_DDI_LANES_E, \ + POWER_DOMAIN_VGA, \ + POWER_DOMAIN_AUDIO_PLAYBACK, \ + POWER_DOMAIN_AUX_IO_C, \ + POWER_DOMAIN_AUX_IO_D, \ + POWER_DOMAIN_AUX_IO_E, \ + XELPD_DC_OFF_PORT_POWER_DOMAINS + I915_DECL_PW_DOMAINS(xelpd_pwdoms_pw_2, XELPD_PW_2_POWER_DOMAINS, POWER_DOMAIN_INIT); @@ -1301,6 +1304,7 @@ I915_DECL_PW_DOMAINS(xelpd_pwdoms_pw_2, */ I915_DECL_PW_DOMAINS(xelpd_pwdoms_dc_off, + XELPD_DC_OFF_PORT_POWER_DOMAINS, XELPD_PW_C_POWER_DOMAINS, XELPD_PW_D_POWER_DOMAINS, POWER_DOMAIN_PORT_DSI,
On ADLP+ Bspec allows DC5/6 to be enabled while power well 2 is enabled. Since the AUX and DDI power wells (except for port A/B) are also backed by power well 2, this would suggest that DC5/6 can be enabled while any of these AUX or DDI port functionalities are used. As opposed to this AUX transfers will time out on ADLP TypeC ports while DC6 is enabled. Until the restriction for DC5/6 is clarified in Bspec let's assume that the intention is to allow for using these power states while pipe A/B is enabled, but only for combo ports which can be used with eDP outputs. Similarly assume that AUX transaction initiated by the driver on any port requires DC states to be disabled. Cc: Matt Roper <matthew.d.roper@intel.com> Cc: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Fixes: 88c487938414 ("drm/i915: Use separate "DC off" power well for ADL-P and DG2") Signed-off-by: Imre Deak <imre.deak@intel.com> --- .../i915/display/intel_display_power_map.c | 28 +++++++++++-------- 1 file changed, 16 insertions(+), 12 deletions(-)