diff mbox series

[1/4] drm/i915: Enable transition watermarks for glk

Message ID 20190131074216.3994-1-ville.syrjala@linux.intel.com (mailing list archive)
State New, archived
Headers show
Series [1/4] drm/i915: Enable transition watermarks for glk | expand

Commit Message

Ville Syrjala Jan. 31, 2019, 7:42 a.m. UTC 
From: Ville Syrjälä <ville.syrjala@linux.intel.com>

We are mistakenly skipping transition watermarks on glk. Fix
up the condition for glk, and toss in the w/a name from
the database.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 drivers/gpu/drm/i915/intel_pm.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

Comments

Rodrigo Vivi Jan. 31, 2019, 6:04 p.m. UTC | #1 
On Thu, Jan 31, 2019 at 09:42:13AM +0200, Ville Syrjala wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> 
> We are mistakenly skipping transition watermarks on glk. Fix
> up the condition for glk, and toss in the w/a name from
> the database.
> 
> 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 | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index ed9786241307..5ce60faef28c 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -4848,8 +4848,11 @@ static void skl_compute_transition_wm(const struct intel_crtc_state *cstate,
>  	const u16 trans_amount = 10; /* This is configurable amount */
>  	u16 wm0_sel_res_b, trans_offset_b, res_blocks;
>  
> -	/* Transition WM are not recommended by HW team for GEN9 */
> -	if (INTEL_GEN(dev_priv) <= 9)
> +	/*
> +	 * WaDisableTWM:skl,kbl,cfl,bxt
> +	 * Transition WM are not recommended by HW team for GEN9
> +	 */
> +	if (IS_GEN9_BC(dev_priv) || IS_BROXTON(dev_priv))
>  		return;
>  
>  	/* Transition WM don't make any sense if ipc is disabled */
> -- 
> 2.19.2
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Ville Syrjala Feb. 4, 2019, 5:38 p.m. UTC | #2 
On Thu, Jan 31, 2019 at 08:07:35PM -0000, Patchwork wrote:
> == Series Details ==
> 
> Series: series starting with [1/4] drm/i915: Enable transition watermarks for glk
> URL   : https://patchwork.freedesktop.org/series/56025/
> State : failure
> 
> == Summary ==
> 
> CI Bug Log - changes from CI_DRM_5518_full -> Patchwork_12103_full
> ====================================================
> 
> Summary
> -------
> 
>   **FAILURE**
> 
>   Serious unknown changes coming with Patchwork_12103_full absolutely need to be
>   verified manually.
>   
>   If you think the reported changes have nothing to do with the changes
>   introduced in Patchwork_12103_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_12103_full:
> 
> ### IGT changes ###
> 
> #### Possible regressions ####
> 
>   * igt@kms_cursor_legacy@2x-cursor-vs-flip-legacy:
>     - shard-glk:          PASS -> FAIL +2

(kms_cursor_legacy:2984) CRITICAL: Test assertion failure function two_screens_cursor_vs_flip, file ../tests/kms_cursor_legacy.c:1207:
(kms_cursor_legacy:2984) CRITICAL: Failed assertion: shared[child] > vrefresh[child]*target[child] / 2
(kms_cursor_legacy:2984) CRITICAL: completed 382 cursor updated in a period of 30 flips, we expect to complete approximately 3840 updates, with the threshold set at 1920
Subtest 2x-cursor-vs-flip-legacy failed.

2x-cursor-vs-flip-atomic and 2x-long-cursor-vs-flip-atomic also flipped
to fail but that fact is not reflected here for some reason.

Anyways, this failure doesn't seem directly related to watermarks.

> 
>   
> Known issues
> ------------
> 
>   Here are the changes found in Patchwork_12103_full that come from known issues:
> 
> ### IGT changes ###
> 
> #### Issues hit ####
> 
>   * igt@gem_exec_schedule@pi-ringfull-render:
>     - shard-apl:          NOTRUN -> FAIL [fdo#103158]
> 
>   * igt@gem_ppgtt@blt-vs-render-ctx0:
>     - shard-glk:          PASS -> DMESG-WARN [fdo#105763] / [fdo#106538]
> 
>   * igt@kms_cursor_crc@cursor-64x64-suspend:
>     - shard-glk:          PASS -> INCOMPLETE [fdo#103359] / [k.org#198133]
> 
>   * igt@kms_plane_multiple@atomic-pipe-a-tiling-none:
>     - shard-apl:          NOTRUN -> FAIL [fdo#103166]
> 
>   * igt@kms_plane_multiple@atomic-pipe-a-tiling-x:
>     - shard-apl:          PASS -> FAIL [fdo#103166]
>     - shard-glk:          PASS -> FAIL [fdo#103166]
> 
>   
> #### Possible fixes ####
> 
>   * igt@gem_eio@reset-stress:
>     - shard-hsw:          INCOMPLETE [fdo#103540] / [fdo#109482] -> PASS
> 
>   * igt@gem_workarounds@suspend-resume:
>     - shard-kbl:          INCOMPLETE [fdo#103665] -> PASS
> 
>   * igt@kms_busy@extended-pageflip-modeset-hang-oldfb-render-c:
>     - shard-apl:          DMESG-WARN [fdo#107956] -> PASS
> 
>   * igt@kms_color@pipe-b-ctm-max:
>     - shard-apl:          FAIL [fdo#108147] -> PASS
> 
>   * igt@kms_cursor_crc@cursor-256x256-suspend:
>     - shard-hsw:          INCOMPLETE [fdo#103540] -> PASS
> 
>   * igt@kms_flip@flip-vs-blocking-wf-vblank:
>     - shard-snb:          DMESG-WARN [fdo#107469] -> PASS
> 
>   * igt@kms_flip@flip-vs-panning-interruptible:
>     - shard-hsw:          DMESG-WARN [fdo#102614] -> PASS
> 
>   * igt@kms_plane@plane-position-covered-pipe-c-planes:
>     - shard-apl:          FAIL [fdo#103166] -> PASS +1
> 
>   * igt@kms_plane_multiple@atomic-pipe-a-tiling-yf:
>     - shard-glk:          FAIL [fdo#103166] -> PASS
> 
>   * igt@kms_setmode@basic:
>     - shard-apl:          FAIL [fdo#99912] -> PASS
> 
>   * igt@pm_rc6_residency@rc6-accuracy:
>     - shard-snb:          {SKIP} [fdo#109271] -> PASS
> 
>   * igt@sw_sync@sync_busy_fork:
>     - shard-snb:          INCOMPLETE [fdo#105411] -> PASS +1
> 
>   
> #### Warnings ####
> 
>   * igt@kms_busy@extended-modeset-hang-newfb-with-reset-render-b:
>     - shard-snb:          {SKIP} [fdo#109271] / [fdo#109278] -> DMESG-WARN [fdo#107956]
> 
>   
>   {name}: This element is suppressed. This means it is ignored when computing
>           the status of the difference (SUCCESS, WARNING, or FAILURE).
> 
>   [fdo#102614]: https://bugs.freedesktop.org/show_bug.cgi?id=102614
>   [fdo#103158]: https://bugs.freedesktop.org/show_bug.cgi?id=103158
>   [fdo#103166]: https://bugs.freedesktop.org/show_bug.cgi?id=103166
>   [fdo#103359]: https://bugs.freedesktop.org/show_bug.cgi?id=103359
>   [fdo#103540]: https://bugs.freedesktop.org/show_bug.cgi?id=103540
>   [fdo#103665]: https://bugs.freedesktop.org/show_bug.cgi?id=103665
>   [fdo#105411]: https://bugs.freedesktop.org/show_bug.cgi?id=105411
>   [fdo#105763]: https://bugs.freedesktop.org/show_bug.cgi?id=105763
>   [fdo#106538]: https://bugs.freedesktop.org/show_bug.cgi?id=106538
>   [fdo#107469]: https://bugs.freedesktop.org/show_bug.cgi?id=107469
>   [fdo#107956]: https://bugs.freedesktop.org/show_bug.cgi?id=107956
>   [fdo#108147]: https://bugs.freedesktop.org/show_bug.cgi?id=108147
>   [fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
>   [fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
>   [fdo#109482]: https://bugs.freedesktop.org/show_bug.cgi?id=109482
>   [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 (7 -> 5)
> ------------------------------
> 
>   Missing    (2): shard-skl shard-iclb 
> 
> 
> Build changes
> -------------
> 
>     * Linux: CI_DRM_5518 -> Patchwork_12103
> 
>   CI_DRM_5518: 2369fd28d3a46b865f6d4f1d309a4c6b7b4e6d93 @ git://anongit.freedesktop.org/gfx-ci/linux
>   IGT_4801: 6f6bacf12759fb319ade3ba37861ae711f8a5cd9 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
>   Patchwork_12103: 70785cf59b0d35fc4508bdb6b2e98c71435fedaf @ 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_12103/
Petri Latvala Feb. 5, 2019, 11:39 a.m. UTC | #3 
On Mon, Feb 04, 2019 at 07:38:33PM +0200, Ville Syrjälä wrote:
> On Thu, Jan 31, 2019 at 08:07:35PM -0000, Patchwork wrote:
> > == Series Details ==
> > 
> > Series: series starting with [1/4] drm/i915: Enable transition watermarks for glk
> > URL   : https://patchwork.freedesktop.org/series/56025/
> > State : failure
> > 
> > == Summary ==
> > 
> > CI Bug Log - changes from CI_DRM_5518_full -> Patchwork_12103_full
> > ====================================================
> > 
> > Summary
> > -------
> > 
> >   **FAILURE**
> > 
> >   Serious unknown changes coming with Patchwork_12103_full absolutely need to be
> >   verified manually.
> >   
> >   If you think the reported changes have nothing to do with the changes
> >   introduced in Patchwork_12103_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_12103_full:
> > 
> > ### IGT changes ###
> > 
> > #### Possible regressions ####
> > 
> >   * igt@kms_cursor_legacy@2x-cursor-vs-flip-legacy:
> >     - shard-glk:          PASS -> FAIL +2
> 
> (kms_cursor_legacy:2984) CRITICAL: Test assertion failure function two_screens_cursor_vs_flip, file ../tests/kms_cursor_legacy.c:1207:
> (kms_cursor_legacy:2984) CRITICAL: Failed assertion: shared[child] > vrefresh[child]*target[child] / 2
> (kms_cursor_legacy:2984) CRITICAL: completed 382 cursor updated in a period of 30 flips, we expect to complete approximately 3840 updates, with the threshold set at 1920
> Subtest 2x-cursor-vs-flip-legacy failed.
> 
> 2x-cursor-vs-flip-atomic and 2x-long-cursor-vs-flip-atomic also flipped
> to fail but that fact is not reflected here for some reason.


It is, but obscurely. It's the "+2". Two more of the similar failure.
diff mbox series

Patch

diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index ed9786241307..5ce60faef28c 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -4848,8 +4848,11 @@  static void skl_compute_transition_wm(const struct intel_crtc_state *cstate,
 	const u16 trans_amount = 10; /* This is configurable amount */
 	u16 wm0_sel_res_b, trans_offset_b, res_blocks;
 
-	/* Transition WM are not recommended by HW team for GEN9 */
-	if (INTEL_GEN(dev_priv) <= 9)
+	/*
+	 * WaDisableTWM:skl,kbl,cfl,bxt
+	 * Transition WM are not recommended by HW team for GEN9
+	 */
+	if (IS_GEN9_BC(dev_priv) || IS_BROXTON(dev_priv))
 		return;
 
 	/* Transition WM don't make any sense if ipc is disabled */