| Message ID | 20181102182200.17219-1-imre.deak@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915/icl: Fix power well 2 wrt. DC-off toggling order | expand |
On Fri, Nov 02, 2018 at 08:22:00PM +0200, Imre Deak wrote: > To enable DC5/6 power well 2 has to be disabled as for previous > platforms, so fix things up. > > Bspec: 4234 > Fixes: 67ca07e7ac10 ("drm/i915/icl: Add power well support") > Cc: Animesh Manna <animesh.manna@intel.com> > Cc: Paulo Zanoni <paulo.r.zanoni@intel.com> > Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> > Signed-off-by: Imre Deak <imre.deak@intel.com> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > --- > drivers/gpu/drm/i915/intel_runtime_pm.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c > index 763912c0245c..c9c1477e648b 100644 > --- a/drivers/gpu/drm/i915/intel_runtime_pm.c > +++ b/drivers/gpu/drm/i915/intel_runtime_pm.c > @@ -2799,6 +2799,12 @@ static const struct i915_power_well_desc icl_power_wells[] = { > }, > }, > { > + .name = "DC off", > + .domains = ICL_DISPLAY_DC_OFF_POWER_DOMAINS, > + .ops = &gen9_dc_off_power_well_ops, > + .id = DISP_PW_ID_NONE, > + }, > + { > .name = "power well 2", > .domains = ICL_PW_2_POWER_DOMAINS, > .ops = &hsw_power_well_ops, > @@ -2810,12 +2816,6 @@ static const struct i915_power_well_desc icl_power_wells[] = { > }, > }, > { > - .name = "DC off", > - .domains = ICL_DISPLAY_DC_OFF_POWER_DOMAINS, > - .ops = &gen9_dc_off_power_well_ops, > - .id = DISP_PW_ID_NONE, > - }, > - { > .name = "power well 3", > .domains = ICL_PW_3_POWER_DOMAINS, > .ops = &hsw_power_well_ops, > -- > 2.13.2
On Fri, Nov 02, 2018 at 11:54:51PM +0000, Patchwork wrote: > == Series Details == > > Series: drm/i915/icl: Fix power well 2 wrt. DC-off toggling order > URL : https://patchwork.freedesktop.org/series/51971/ > State : success Thanks for the review, pushed to -dinq. > > == Summary == > > = CI Bug Log - changes from CI_DRM_5081_full -> Patchwork_10715_full = > > == Summary - WARNING == > > Minor unknown changes coming with Patchwork_10715_full need to be verified > manually. > > If you think the reported changes have nothing to do with the changes > introduced in Patchwork_10715_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_10715_full: > > === IGT changes === > > ==== Warnings ==== > > igt@kms_cursor_legacy@flip-vs-cursor-crc-legacy: > shard-snb: SKIP -> PASS +3 > > igt@perf_pmu@rc6: > shard-kbl: PASS -> SKIP > > > == Known issues == > > Here are the changes found in Patchwork_10715_full that come from known issues: > > === IGT changes === > > ==== Issues hit ==== > > igt@gem_exec_schedule@preempt-contexts-render: > shard-glk: PASS -> DMESG-WARN (fdo#106538, fdo#105763) +1 > > igt@gem_exec_whisper@normal: > shard-skl: PASS -> TIMEOUT (fdo#108592) > > igt@gem_ppgtt@blt-vs-render-ctxn: > shard-kbl: PASS -> INCOMPLETE (fdo#106887, fdo#103665, fdo#106023) > > igt@kms_busy@extended-modeset-hang-newfb-with-reset-render-a: > shard-skl: NOTRUN -> DMESG-WARN (fdo#107956) > > igt@kms_busy@extended-pageflip-modeset-hang-oldfb-render-c: > shard-glk: PASS -> DMESG-WARN (fdo#107956) > > igt@kms_color@pipe-b-ctm-0-75: > shard-apl: PASS -> DMESG-WARN (fdo#103558, fdo#105602) +6 > > igt@kms_color@pipe-c-ctm-negative: > shard-skl: PASS -> FAIL (fdo#107361) > > igt@kms_cursor_crc@cursor-64x64-onscreen: > shard-glk: PASS -> FAIL (fdo#103232) +1 > > igt@kms_cursor_legacy@2x-long-nonblocking-modeset-vs-cursor-atomic: > shard-glk: PASS -> FAIL (fdo#105454) > > igt@kms_flip@basic-flip-vs-dpms: > shard-kbl: PASS -> DMESG-WARN (fdo#103313, fdo#105345) > > igt@kms_flip@flip-vs-expired-vblank: > shard-glk: PASS -> FAIL (fdo#105363) > > igt@kms_flip@modeset-vs-vblank-race: > shard-glk: PASS -> FAIL (fdo#103060) > > igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-mmap-gtt: > shard-apl: PASS -> FAIL (fdo#103167) > > igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-mmap-gtt: > shard-glk: PASS -> FAIL (fdo#103167) > > igt@kms_frontbuffer_tracking@fbc-2p-primscrn-pri-indfb-draw-mmap-wc: > shard-glk: PASS -> DMESG-FAIL (fdo#106538) > > igt@kms_plane_alpha_blend@pipe-b-alpha-basic: > shard-skl: NOTRUN -> FAIL (fdo#108145, fdo#107815) > > igt@kms_plane_multiple@atomic-pipe-b-tiling-yf: > shard-apl: PASS -> FAIL (fdo#103166) > > igt@kms_setmode@basic: > shard-kbl: PASS -> FAIL (fdo#99912) > > igt@kms_vblank@pipe-a-wait-idle-hang: > shard-glk: PASS -> INCOMPLETE (fdo#103359, k.org#198133) > > > ==== Possible fixes ==== > > igt@kms_cursor_crc@cursor-128x128-suspend: > shard-skl: INCOMPLETE (fdo#104108) -> PASS > > igt@kms_cursor_crc@cursor-256x256-sliding: > shard-glk: FAIL (fdo#103232) -> PASS > > igt@kms_cursor_crc@cursor-256x85-random: > shard-apl: FAIL (fdo#103232) -> PASS > > igt@kms_flip@flip-vs-expired-vblank: > shard-skl: FAIL (fdo#105363) -> PASS > > igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-blt: > shard-glk: FAIL (fdo#103167) -> PASS > > igt@kms_plane_multiple@atomic-pipe-b-tiling-yf: > shard-glk: FAIL (fdo#103166) -> PASS > > igt@pm_rpm@legacy-planes-dpms: > shard-skl: INCOMPLETE (fdo#105959, fdo#107807) -> PASS > > > fdo#103060 https://bugs.freedesktop.org/show_bug.cgi?id=103060 > fdo#103166 https://bugs.freedesktop.org/show_bug.cgi?id=103166 > fdo#103167 https://bugs.freedesktop.org/show_bug.cgi?id=103167 > fdo#103232 https://bugs.freedesktop.org/show_bug.cgi?id=103232 > fdo#103313 https://bugs.freedesktop.org/show_bug.cgi?id=103313 > fdo#103359 https://bugs.freedesktop.org/show_bug.cgi?id=103359 > fdo#103558 https://bugs.freedesktop.org/show_bug.cgi?id=103558 > fdo#103665 https://bugs.freedesktop.org/show_bug.cgi?id=103665 > fdo#104108 https://bugs.freedesktop.org/show_bug.cgi?id=104108 > fdo#105345 https://bugs.freedesktop.org/show_bug.cgi?id=105345 > fdo#105363 https://bugs.freedesktop.org/show_bug.cgi?id=105363 > fdo#105454 https://bugs.freedesktop.org/show_bug.cgi?id=105454 > fdo#105602 https://bugs.freedesktop.org/show_bug.cgi?id=105602 > fdo#105763 https://bugs.freedesktop.org/show_bug.cgi?id=105763 > fdo#105959 https://bugs.freedesktop.org/show_bug.cgi?id=105959 > fdo#106023 https://bugs.freedesktop.org/show_bug.cgi?id=106023 > fdo#106538 https://bugs.freedesktop.org/show_bug.cgi?id=106538 > fdo#106887 https://bugs.freedesktop.org/show_bug.cgi?id=106887 > fdo#107361 https://bugs.freedesktop.org/show_bug.cgi?id=107361 > fdo#107807 https://bugs.freedesktop.org/show_bug.cgi?id=107807 > fdo#107815 https://bugs.freedesktop.org/show_bug.cgi?id=107815 > fdo#107956 https://bugs.freedesktop.org/show_bug.cgi?id=107956 > fdo#108145 https://bugs.freedesktop.org/show_bug.cgi?id=108145 > fdo#108592 https://bugs.freedesktop.org/show_bug.cgi?id=108592 > fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912 > k.org#198133 https://bugzilla.kernel.org/show_bug.cgi?id=198133 > > > == Participating hosts (6 -> 6) == > > No changes in participating hosts > > > == Build changes == > > * Linux: CI_DRM_5081 -> Patchwork_10715 > > CI_DRM_5081: f5e16acf6c85d38756c3efdb77ec6aede55df0ba @ git://anongit.freedesktop.org/gfx-ci/linux > IGT_4705: 7983e19ed62ec8db1884f55e07e458a62cc51e37 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools > Patchwork_10715: ece6e91bbcf0dc689304f528f4cba383c6d9daf9 @ 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_10715/shards.html
diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c index 763912c0245c..c9c1477e648b 100644 --- a/drivers/gpu/drm/i915/intel_runtime_pm.c +++ b/drivers/gpu/drm/i915/intel_runtime_pm.c @@ -2799,6 +2799,12 @@ static const struct i915_power_well_desc icl_power_wells[] = { }, }, { + .name = "DC off", + .domains = ICL_DISPLAY_DC_OFF_POWER_DOMAINS, + .ops = &gen9_dc_off_power_well_ops, + .id = DISP_PW_ID_NONE, + }, + { .name = "power well 2", .domains = ICL_PW_2_POWER_DOMAINS, .ops = &hsw_power_well_ops, @@ -2810,12 +2816,6 @@ static const struct i915_power_well_desc icl_power_wells[] = { }, }, { - .name = "DC off", - .domains = ICL_DISPLAY_DC_OFF_POWER_DOMAINS, - .ops = &gen9_dc_off_power_well_ops, - .id = DISP_PW_ID_NONE, - }, - { .name = "power well 3", .domains = ICL_PW_3_POWER_DOMAINS, .ops = &hsw_power_well_ops,
To enable DC5/6 power well 2 has to be disabled as for previous platforms, so fix things up. Bspec: 4234 Fixes: 67ca07e7ac10 ("drm/i915/icl: Add power well support") Cc: Animesh Manna <animesh.manna@intel.com> Cc: Paulo Zanoni <paulo.r.zanoni@intel.com> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> Signed-off-by: Imre Deak <imre.deak@intel.com> --- drivers/gpu/drm/i915/intel_runtime_pm.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)