* [PATCH 2/3] drm/i915: Remove bogus FIXME from SKL wm computation
2018-11-13 17:23 [PATCH 1/3] drm/i915: Use explicit old crtc state in skl_compute_wm() Ville Syrjala
@ 2018-11-13 17:23 ` Ville Syrjala
2018-11-30 6:28 ` Rodrigo Vivi
2018-11-13 17:23 ` [PATCH 3/3] drm/i915: Remove dead update_wm_pre assignment from SKL wm code Ville Syrjala
` (3 subsequent siblings)
4 siblings, 1 reply; 9+ messages in thread
From: Ville Syrjala @ 2018-11-13 17:23 UTC (permalink / raw)
To: intel-gfx
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
We do return an error when the watermark calculation fails, so
the FIXME claiming otherwise is outdated. Remove it.
Cc: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/i915/intel_pm.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 6426af873cef..5d823bdc63a9 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -5458,10 +5458,6 @@ skl_compute_wm(struct drm_atomic_state *state)
* Note that the DDB allocation above may have added more CRTC's that
* weren't otherwise being modified (and set bits in dirty_pipes) if
* pipe allocations had to change.
- *
- * FIXME: Now that we're doing this in the atomic check phase, we
- * should allow skl_update_pipe_wm() to return failure in cases where
- * no suitable watermark values can be found.
*/
for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state, cstate, i) {
struct intel_crtc_state *intel_cstate =
--
2.18.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH 2/3] drm/i915: Remove bogus FIXME from SKL wm computation
2018-11-13 17:23 ` [PATCH 2/3] drm/i915: Remove bogus FIXME from SKL wm computation Ville Syrjala
@ 2018-11-30 6:28 ` Rodrigo Vivi
0 siblings, 0 replies; 9+ messages in thread
From: Rodrigo Vivi @ 2018-11-30 6:28 UTC (permalink / raw)
To: Ville Syrjala; +Cc: intel-gfx
On Tue, Nov 13, 2018 at 07:23:29PM +0200, Ville Syrjala wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> We do return an error when the watermark calculation fails, so
> the FIXME claiming otherwise is outdated. Remove it.
>
> Cc: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> ---
> drivers/gpu/drm/i915/intel_pm.c | 4 ----
> 1 file changed, 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index 6426af873cef..5d823bdc63a9 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -5458,10 +5458,6 @@ skl_compute_wm(struct drm_atomic_state *state)
> * Note that the DDB allocation above may have added more CRTC's that
> * weren't otherwise being modified (and set bits in dirty_pipes) if
> * pipe allocations had to change.
> - *
> - * FIXME: Now that we're doing this in the atomic check phase, we
> - * should allow skl_update_pipe_wm() to return failure in cases where
> - * no suitable watermark values can be found.
> */
> for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state, cstate, i) {
> struct intel_crtc_state *intel_cstate =
> --
> 2.18.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 3/3] drm/i915: Remove dead update_wm_pre assignment from SKL wm code
2018-11-13 17:23 [PATCH 1/3] drm/i915: Use explicit old crtc state in skl_compute_wm() Ville Syrjala
2018-11-13 17:23 ` [PATCH 2/3] drm/i915: Remove bogus FIXME from SKL wm computation Ville Syrjala
@ 2018-11-13 17:23 ` Ville Syrjala
2018-11-30 6:30 ` Rodrigo Vivi
2018-11-13 18:16 ` ✓ Fi.CI.BAT: success for series starting with [1/3] drm/i915: Use explicit old crtc state in skl_compute_wm() Patchwork
` (2 subsequent siblings)
4 siblings, 1 reply; 9+ messages in thread
From: Ville Syrjala @ 2018-11-13 17:23 UTC (permalink / raw)
To: intel-gfx
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
SKL+ do not use crtc_state->update_wm_pre, so there is absolutely no
point it setting it. crtc_state->update_wm_pre only exists as a
temporary hack for pre-g4x platforms until we redo their
watermarks to be be atomic.
Cc: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/i915/intel_pm.c | 6 ------
1 file changed, 6 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 5d823bdc63a9..9801412062cc 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -5473,12 +5473,6 @@ skl_compute_wm(struct drm_atomic_state *state)
if (changed)
results->dirty_pipes |= drm_crtc_mask(crtc);
-
- if ((results->dirty_pipes & drm_crtc_mask(crtc)) == 0)
- /* This pipe's WM's did not change */
- continue;
-
- intel_cstate->update_wm_pre = true;
}
skl_print_wm_changes(state);
--
2.18.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH 3/3] drm/i915: Remove dead update_wm_pre assignment from SKL wm code
2018-11-13 17:23 ` [PATCH 3/3] drm/i915: Remove dead update_wm_pre assignment from SKL wm code Ville Syrjala
@ 2018-11-30 6:30 ` Rodrigo Vivi
2018-12-07 18:47 ` Ville Syrjälä
0 siblings, 1 reply; 9+ messages in thread
From: Rodrigo Vivi @ 2018-11-30 6:30 UTC (permalink / raw)
To: Ville Syrjala; +Cc: intel-gfx
On Tue, Nov 13, 2018 at 07:23:30PM +0200, Ville Syrjala wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> SKL+ do not use crtc_state->update_wm_pre, so there is absolutely no
> point it setting it. crtc_state->update_wm_pre only exists as a
> temporary hack for pre-g4x platforms until we redo their
> watermarks to be be atomic.
>
> Cc: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> ---
> drivers/gpu/drm/i915/intel_pm.c | 6 ------
> 1 file changed, 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index 5d823bdc63a9..9801412062cc 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -5473,12 +5473,6 @@ skl_compute_wm(struct drm_atomic_state *state)
>
> if (changed)
> results->dirty_pipes |= drm_crtc_mask(crtc);
> -
> - if ((results->dirty_pipes & drm_crtc_mask(crtc)) == 0)
> - /* This pipe's WM's did not change */
> - continue;
> -
> - intel_cstate->update_wm_pre = true;
> }
>
> skl_print_wm_changes(state);
> --
> 2.18.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 3/3] drm/i915: Remove dead update_wm_pre assignment from SKL wm code
2018-11-30 6:30 ` Rodrigo Vivi
@ 2018-12-07 18:47 ` Ville Syrjälä
0 siblings, 0 replies; 9+ messages in thread
From: Ville Syrjälä @ 2018-12-07 18:47 UTC (permalink / raw)
To: Rodrigo Vivi; +Cc: intel-gfx
On Thu, Nov 29, 2018 at 10:30:37PM -0800, Rodrigo Vivi wrote:
> On Tue, Nov 13, 2018 at 07:23:30PM +0200, Ville Syrjala wrote:
> > From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> >
> > SKL+ do not use crtc_state->update_wm_pre, so there is absolutely no
> > point it setting it. crtc_state->update_wm_pre only exists as a
> > temporary hack for pre-g4x platforms until we redo their
> > watermarks to be be atomic.
> >
> > Cc: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com>
> > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Thanks. Series pushed.
>
> > ---
> > drivers/gpu/drm/i915/intel_pm.c | 6 ------
> > 1 file changed, 6 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> > index 5d823bdc63a9..9801412062cc 100644
> > --- a/drivers/gpu/drm/i915/intel_pm.c
> > +++ b/drivers/gpu/drm/i915/intel_pm.c
> > @@ -5473,12 +5473,6 @@ skl_compute_wm(struct drm_atomic_state *state)
> >
> > if (changed)
> > results->dirty_pipes |= drm_crtc_mask(crtc);
> > -
> > - if ((results->dirty_pipes & drm_crtc_mask(crtc)) == 0)
> > - /* This pipe's WM's did not change */
> > - continue;
> > -
> > - intel_cstate->update_wm_pre = true;
> > }
> >
> > skl_print_wm_changes(state);
> > --
> > 2.18.1
> >
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Ville Syrjälä
Intel
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 9+ messages in thread
* ✓ Fi.CI.BAT: success for series starting with [1/3] drm/i915: Use explicit old crtc state in skl_compute_wm()
2018-11-13 17:23 [PATCH 1/3] drm/i915: Use explicit old crtc state in skl_compute_wm() Ville Syrjala
2018-11-13 17:23 ` [PATCH 2/3] drm/i915: Remove bogus FIXME from SKL wm computation Ville Syrjala
2018-11-13 17:23 ` [PATCH 3/3] drm/i915: Remove dead update_wm_pre assignment from SKL wm code Ville Syrjala
@ 2018-11-13 18:16 ` Patchwork
2018-11-14 16:37 ` ✓ Fi.CI.IGT: " Patchwork
2018-11-30 6:27 ` [PATCH 1/3] " Rodrigo Vivi
4 siblings, 0 replies; 9+ messages in thread
From: Patchwork @ 2018-11-13 18:16 UTC (permalink / raw)
To: Ville Syrjala; +Cc: intel-gfx
== Series Details ==
Series: series starting with [1/3] drm/i915: Use explicit old crtc state in skl_compute_wm()
URL : https://patchwork.freedesktop.org/series/52436/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_5133 -> Patchwork_10816 =
== Summary - SUCCESS ==
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/52436/revisions/1/mbox/
== Known issues ==
Here are the changes found in Patchwork_10816 that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@gem_exec_suspend@basic-s4-devices:
fi-blb-e6850: PASS -> INCOMPLETE (fdo#107718)
igt@kms_busy@basic-flip-b:
fi-hsw-peppy: PASS -> FAIL (fdo#103182)
igt@kms_pipe_crc_basic@nonblocking-crc-pipe-a-frame-sequence:
fi-byt-clapper: PASS -> FAIL (fdo#107362, fdo#103191)
==== Possible fixes ====
igt@drv_selftest@live_hangcheck:
fi-bwr-2160: DMESG-FAIL (fdo#108735) -> PASS
igt@kms_frontbuffer_tracking@basic:
fi-hsw-peppy: DMESG-WARN (fdo#102614) -> PASS
igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
fi-byt-clapper: FAIL (fdo#107362, fdo#103191) -> PASS
fdo#102614 https://bugs.freedesktop.org/show_bug.cgi?id=102614
fdo#103182 https://bugs.freedesktop.org/show_bug.cgi?id=103182
fdo#103191 https://bugs.freedesktop.org/show_bug.cgi?id=103191
fdo#107362 https://bugs.freedesktop.org/show_bug.cgi?id=107362
fdo#107718 https://bugs.freedesktop.org/show_bug.cgi?id=107718
fdo#108735 https://bugs.freedesktop.org/show_bug.cgi?id=108735
== Participating hosts (53 -> 45) ==
Missing (8): fi-kbl-soraka fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-icl-u2 fi-bsw-cyan fi-ctg-p8600 fi-icl-u
== Build changes ==
* Linux: CI_DRM_5133 -> Patchwork_10816
CI_DRM_5133: 5c71926a1834348a68951622a950de0355b73450 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4714: cab148ca3ec904a94d0cd43476cf7e1f8663f906 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_10816: 5aa5c7a34c312bb224f5f22c140ff5d113fb089e @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
5aa5c7a34c31 drm/i915: Remove dead update_wm_pre assignment from SKL wm code
57ff2d377da8 drm/i915: Remove bogus FIXME from SKL wm computation
5c01f5293e5b drm/i915: Use explicit old crtc state in skl_compute_wm()
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_10816/issues.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 9+ messages in thread* ✓ Fi.CI.IGT: success for series starting with [1/3] drm/i915: Use explicit old crtc state in skl_compute_wm()
2018-11-13 17:23 [PATCH 1/3] drm/i915: Use explicit old crtc state in skl_compute_wm() Ville Syrjala
` (2 preceding siblings ...)
2018-11-13 18:16 ` ✓ Fi.CI.BAT: success for series starting with [1/3] drm/i915: Use explicit old crtc state in skl_compute_wm() Patchwork
@ 2018-11-14 16:37 ` Patchwork
2018-11-30 6:27 ` [PATCH 1/3] " Rodrigo Vivi
4 siblings, 0 replies; 9+ messages in thread
From: Patchwork @ 2018-11-14 16:37 UTC (permalink / raw)
To: Ville Syrjälä; +Cc: intel-gfx
== Series Details ==
Series: series starting with [1/3] drm/i915: Use explicit old crtc state in skl_compute_wm()
URL : https://patchwork.freedesktop.org/series/52436/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_5133_full -> Patchwork_10816_full =
== Summary - WARNING ==
Minor unknown changes coming with Patchwork_10816_full need to be verified
manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_10816_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_10816_full:
=== IGT changes ===
==== Warnings ====
igt@kms_atomic_interruptible@universal-setplane-cursor:
shard-snb: SKIP -> PASS +2
igt@pm_rc6_residency@rc6-accuracy:
shard-kbl: SKIP -> PASS +1
== Known issues ==
Here are the changes found in Patchwork_10816_full that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@gem_ppgtt@blt-vs-render-ctx0:
shard-kbl: PASS -> INCOMPLETE (fdo#106023, fdo#103665, fdo#106887)
igt@gem_userptr_blits@readonly-unsync:
shard-skl: NOTRUN -> INCOMPLETE (fdo#108074)
igt@kms_ccs@pipe-b-crc-sprite-planes-basic:
shard-glk: PASS -> FAIL (fdo#108145)
igt@kms_chv_cursor_fail@pipe-b-64x64-right-edge:
shard-glk: PASS -> DMESG-FAIL (fdo#106538, fdo#104671)
igt@kms_cursor_crc@cursor-256x256-suspend:
shard-apl: PASS -> FAIL (fdo#103191, fdo#103232)
igt@kms_cursor_legacy@cursorb-vs-flipb-toggle:
shard-glk: PASS -> DMESG-WARN (fdo#105763, fdo#106538)
igt@kms_flip@2x-flip-vs-expired-vblank:
shard-glk: PASS -> FAIL (fdo#105363)
igt@kms_flip@modeset-vs-vblank-race-interruptible:
shard-snb: PASS -> FAIL (fdo#103060)
igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-onoff:
shard-apl: PASS -> FAIL (fdo#103167) +1
igt@kms_frontbuffer_tracking@fbc-2p-primscrn-spr-indfb-draw-mmap-gtt:
shard-glk: PASS -> FAIL (fdo#103167)
igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-pri-indfb-draw-render:
shard-glk: PASS -> DMESG-FAIL (fdo#106538)
igt@kms_plane@plane-panning-bottom-right-pipe-b-planes:
shard-skl: PASS -> FAIL (fdo#103166)
igt@kms_plane@plane-position-covered-pipe-b-planes:
shard-glk: PASS -> FAIL (fdo#103166) +1
igt@kms_plane_alpha_blend@pipe-b-constant-alpha-max:
shard-skl: NOTRUN -> FAIL (fdo#108145)
igt@kms_vblank@pipe-c-accuracy-idle:
shard-skl: PASS -> FAIL (fdo#102583)
igt@pm_rpm@gem-execbuf:
shard-skl: PASS -> INCOMPLETE (fdo#107803, fdo#107807)
==== Possible fixes ====
igt@drv_suspend@shrink:
shard-glk: INCOMPLETE (fdo#106886, fdo#103359, k.org#198133) -> PASS
igt@kms_busy@extended-pageflip-modeset-hang-oldfb-render-b:
shard-glk: DMESG-WARN (fdo#107956) -> PASS
igt@kms_ccs@pipe-a-crc-sprite-planes-basic:
shard-glk: FAIL (fdo#108145) -> PASS
igt@kms_cursor_crc@cursor-128x128-sliding:
shard-apl: FAIL (fdo#103232) -> PASS
igt@kms_flip@plain-flip-fb-recreate-interruptible:
shard-skl: FAIL (fdo#100368) -> PASS
igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-mmap-cpu:
shard-apl: FAIL (fdo#103167) -> PASS
igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-move:
shard-glk: FAIL (fdo#103167) -> PASS +2
igt@kms_plane@pixel-format-pipe-b-planes:
shard-apl: FAIL (fdo#103166) -> PASS
igt@kms_plane_alpha_blend@pipe-b-coverage-7efc:
shard-skl: FAIL (fdo#107815) -> PASS
igt@kms_setmode@basic:
shard-kbl: FAIL (fdo#99912) -> PASS
igt@kms_vblank@pipe-c-ts-continuation-dpms-suspend:
shard-skl: INCOMPLETE (fdo#107773, fdo#104108) -> PASS
==== Warnings ====
igt@pm_backlight@fade_with_suspend:
shard-skl: FAIL (fdo#107847) -> INCOMPLETE (fdo#107773)
fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#102583 https://bugs.freedesktop.org/show_bug.cgi?id=102583
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#103191 https://bugs.freedesktop.org/show_bug.cgi?id=103191
fdo#103232 https://bugs.freedesktop.org/show_bug.cgi?id=103232
fdo#103359 https://bugs.freedesktop.org/show_bug.cgi?id=103359
fdo#103665 https://bugs.freedesktop.org/show_bug.cgi?id=103665
fdo#104108 https://bugs.freedesktop.org/show_bug.cgi?id=104108
fdo#104671 https://bugs.freedesktop.org/show_bug.cgi?id=104671
fdo#105363 https://bugs.freedesktop.org/show_bug.cgi?id=105363
fdo#105763 https://bugs.freedesktop.org/show_bug.cgi?id=105763
fdo#106023 https://bugs.freedesktop.org/show_bug.cgi?id=106023
fdo#106538 https://bugs.freedesktop.org/show_bug.cgi?id=106538
fdo#106886 https://bugs.freedesktop.org/show_bug.cgi?id=106886
fdo#106887 https://bugs.freedesktop.org/show_bug.cgi?id=106887
fdo#107773 https://bugs.freedesktop.org/show_bug.cgi?id=107773
fdo#107803 https://bugs.freedesktop.org/show_bug.cgi?id=107803
fdo#107807 https://bugs.freedesktop.org/show_bug.cgi?id=107807
fdo#107815 https://bugs.freedesktop.org/show_bug.cgi?id=107815
fdo#107847 https://bugs.freedesktop.org/show_bug.cgi?id=107847
fdo#107956 https://bugs.freedesktop.org/show_bug.cgi?id=107956
fdo#108074 https://bugs.freedesktop.org/show_bug.cgi?id=108074
fdo#108145 https://bugs.freedesktop.org/show_bug.cgi?id=108145
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_5133 -> Patchwork_10816
CI_DRM_5133: 5c71926a1834348a68951622a950de0355b73450 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4714: cab148ca3ec904a94d0cd43476cf7e1f8663f906 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_10816: 5aa5c7a34c312bb224f5f22c140ff5d113fb089e @ 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_10816/shards.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH 1/3] drm/i915: Use explicit old crtc state in skl_compute_wm()
2018-11-13 17:23 [PATCH 1/3] drm/i915: Use explicit old crtc state in skl_compute_wm() Ville Syrjala
` (3 preceding siblings ...)
2018-11-14 16:37 ` ✓ Fi.CI.IGT: " Patchwork
@ 2018-11-30 6:27 ` Rodrigo Vivi
4 siblings, 0 replies; 9+ messages in thread
From: Rodrigo Vivi @ 2018-11-30 6:27 UTC (permalink / raw)
To: Ville Syrjala; +Cc: intel-gfx
On Tue, Nov 13, 2018 at 07:23:28PM +0200, Ville Syrjala wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> skl_compute_wm() wants to compare the old and new watermarks. Currently
> it gets at the old watermarks via crtc->state, which is confusing since
> it can point at either the old or the new state depending on where
> in the sequence we are. In this case it is correct since we have not yet
> swapped the states, but let's make it super clear what this is doing
> by using the explicit old state.
>
> Cc: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> ---
> drivers/gpu/drm/i915/intel_pm.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index 27498ded4949..6426af873cef 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -5435,6 +5435,7 @@ skl_compute_wm(struct drm_atomic_state *state)
> {
> struct drm_crtc *crtc;
> struct drm_crtc_state *cstate;
> + struct drm_crtc_state *old_crtc_state;
> struct intel_atomic_state *intel_state = to_intel_atomic_state(state);
> struct skl_ddb_values *results = &intel_state->wm_results;
> struct skl_pipe_wm *pipe_wm;
> @@ -5462,11 +5463,11 @@ skl_compute_wm(struct drm_atomic_state *state)
> * should allow skl_update_pipe_wm() to return failure in cases where
> * no suitable watermark values can be found.
> */
> - for_each_new_crtc_in_state(state, crtc, cstate, i) {
> + for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state, cstate, i) {
> struct intel_crtc_state *intel_cstate =
> to_intel_crtc_state(cstate);
> const struct skl_pipe_wm *old_pipe_wm =
> - &to_intel_crtc_state(crtc->state)->wm.skl.optimal;
> + &to_intel_crtc_state(old_crtc_state)->wm.skl.optimal;
>
> pipe_wm = &intel_cstate->wm.skl.optimal;
> ret = skl_update_pipe_wm(cstate, old_pipe_wm, pipe_wm,
> --
> 2.18.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 9+ messages in thread