[PATCH v5 0/3] drm/i915: CTS fixes

[PATCH v5 0/3] drm/i915: CTS fixes

[Lionel Landwerlin]

Hi,

Compile tested /o\

Lionel Landwerlin (3):
  drm/i915: fix whitelist selftests with readonly registers
  drm/i915: whitelist PS_(DEPTH|INVOCATION)_COUNT
  drm/i915/icl: whitelist PS_(DEPTH|INVOCATION)_COUNT

 drivers/gpu/drm/i915/gt/intel_workarounds.c    | 16 +++++++++++++++-
 drivers/gpu/drm/i915/gt/selftest_workarounds.c |  3 +++
 2 files changed, 18 insertions(+), 1 deletion(-)

--
2.21.0.392.gf8f6787159e
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH v5 1/3] drm/i915: fix whitelist selftests with readonly registers

[Lionel Landwerlin]

When a register is readonly there is not much we can tell about its
value (apart from its default value?). This can be covered by tests
exercising the value of the register from userspace.

For PS_INVOCATION_COUNT we've got the following piglit tests :

   KHR-GL45.pipeline_statistics_query_tests_ARB.functional_fragment_shader_invocations

Vulkan CTS tests :

   dEQP-VK.query_pool.statistics_query.fragment_shader_invocations.*

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
---
 drivers/gpu/drm/i915/gt/selftest_workarounds.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/gpu/drm/i915/gt/selftest_workarounds.c b/drivers/gpu/drm/i915/gt/selftest_workarounds.c
index f12cb20fe785..a06f96df1bfd 100644
--- a/drivers/gpu/drm/i915/gt/selftest_workarounds.c
+++ b/drivers/gpu/drm/i915/gt/selftest_workarounds.c
@@ -926,6 +926,9 @@ check_whitelisted_registers(struct intel_engine_cs *engine,
 
 	err = 0;
 	for (i = 0; i < engine->whitelist.count; i++) {
+		if (engine->whitelist.list[i].reg.reg & RING_FORCE_TO_NONPRIV_RD)
+			continue;
+
 		if (!fn(engine, a[i], b[i], engine->whitelist.list[i].reg))
 			err = -EINVAL;
 	}
-- 
2.21.0.392.gf8f6787159e

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH v5 2/3] drm/i915: whitelist PS_(DEPTH|INVOCATION)_COUNT

[Lionel Landwerlin]

CFL:C0+ changed the status of those registers which are now
blacklisted by default.

This is breaking a number of CTS tests on GL & Vulkan :

  KHR-GL45.pipeline_statistics_query_tests_ARB.functional_fragment_shader_invocations (GL)

  dEQP-VK.query_pool.statistics_query.fragment_shader_invocations.* (Vulkan)

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
---
 drivers/gpu/drm/i915/gt/intel_workarounds.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c b/drivers/gpu/drm/i915/gt/intel_workarounds.c
index 993804d09517..da7d48ac4ee7 100644
--- a/drivers/gpu/drm/i915/gt/intel_workarounds.c
+++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c
@@ -1092,10 +1092,18 @@ static void glk_whitelist_build(struct intel_engine_cs *engine)
 
 static void cfl_whitelist_build(struct intel_engine_cs *engine)
 {
+	struct i915_wa_list *w = &engine->whitelist;
+
 	if (engine->class != RENDER_CLASS)
 		return;
 
-	gen9_whitelist_build(&engine->whitelist);
+	gen9_whitelist_build(w);
+
+	/* WaAllowPMDepthAndInvocationCountAccessFromUMD:cfl,whl,cml,aml */
+	whitelist_reg_ext(w, PS_DEPTH_COUNT, RING_FORCE_TO_NONPRIV_RD);
+	whitelist_reg_ext(w, PS_DEPTH_COUNT_UDW, RING_FORCE_TO_NONPRIV_RD);
+	whitelist_reg_ext(w, PS_INVOCATION_COUNT, RING_FORCE_TO_NONPRIV_RD);
+	whitelist_reg_ext(w, PS_INVOCATION_COUNT_UDW, RING_FORCE_TO_NONPRIV_RD);
 }
 
 static void cnl_whitelist_build(struct intel_engine_cs *engine)
-- 
2.21.0.392.gf8f6787159e

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH v5 3/3] drm/i915/icl: whitelist PS_(DEPTH|INVOCATION)_COUNT

[Lionel Landwerlin]

The same tests failing on CFL+ platforms are also failing on ICL.
Documentation doesn't list the
WaAllowPMDepthAndInvocationCountAccessFromUMD workaround for ICL but
applying it fixes the same tests as CFL.

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
---
 drivers/gpu/drm/i915/gt/intel_workarounds.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c b/drivers/gpu/drm/i915/gt/intel_workarounds.c
index da7d48ac4ee7..9a19980cceb5 100644
--- a/drivers/gpu/drm/i915/gt/intel_workarounds.c
+++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c
@@ -1131,6 +1131,12 @@ static void icl_whitelist_build(struct intel_engine_cs *engine)
 
 		/* WaEnableStateCacheRedirectToCS:icl */
 		whitelist_reg(w, GEN9_SLICE_COMMON_ECO_CHICKEN1);
+
+		/* WaAllowPMDepthAndInvocationCountAccessFromUMD:icl */
+		whitelist_reg_ext(w, PS_DEPTH_COUNT, RING_FORCE_TO_NONPRIV_RD);
+		whitelist_reg_ext(w, PS_DEPTH_COUNT_UDW, RING_FORCE_TO_NONPRIV_RD);
+		whitelist_reg_ext(w, PS_INVOCATION_COUNT, RING_FORCE_TO_NONPRIV_RD);
+		whitelist_reg_ext(w, PS_INVOCATION_COUNT_UDW, RING_FORCE_TO_NONPRIV_RD);
 		break;
 
 	case VIDEO_DECODE_CLASS:
-- 
2.21.0.392.gf8f6787159e

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✗ Fi.CI.CHECKPATCH: warning for drm/i915: CTS fixes (rev5)

[Patchwork]

== Series Details ==

Series: drm/i915: CTS fixes (rev5)
URL   : https://patchwork.freedesktop.org/series/62437/
State : warning

== Summary ==

$ dim checkpatch origin/drm-tip
920a6126f035 drm/i915: fix whitelist selftests with readonly registers
-:12: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line)
#12: 
   KHR-GL45.pipeline_statistics_query_tests_ARB.functional_fragment_shader_invocations

total: 0 errors, 1 warnings, 0 checks, 9 lines checked
cc1cd5289857 drm/i915: whitelist PS_(DEPTH|INVOCATION)_COUNT
-:11: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line)
#11: 
  KHR-GL45.pipeline_statistics_query_tests_ARB.functional_fragment_shader_invocations (GL)

total: 0 errors, 1 warnings, 0 checks, 19 lines checked
106a82358824 drm/i915/icl: whitelist PS_(DEPTH|INVOCATION)_COUNT

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✗ Fi.CI.BAT: failure for drm/i915: CTS fixes (rev5)

[Patchwork]

== Series Details ==

Series: drm/i915: CTS fixes (rev5)
URL   : https://patchwork.freedesktop.org/series/62437/
State : failure

== Summary ==

CI Bug Log - changes from CI_DRM_6351 -> Patchwork_13425
====================================================

Summary
-------

  **FAILURE**

  Serious unknown changes coming with Patchwork_13425 absolutely need to be
  verified manually.
  
  If you think the reported changes have nothing to do with the changes
  introduced in Patchwork_13425, please notify your bug team to allow them
  to document this new failure mode, which will reduce false positives in CI.

  External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13425/

Possible new issues
-------------------

  Here are the unknown changes that may have been introduced in Patchwork_13425:

### IGT changes ###

#### Possible regressions ####

  * igt@i915_selftest@live_workarounds:
    - fi-icl-dsi:         [PASS][1] -> [DMESG-FAIL][2]
   [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6351/fi-icl-dsi/igt@i915_selftest@live_workarounds.html
   [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13425/fi-icl-dsi/igt@i915_selftest@live_workarounds.html

  
Known issues
------------

  Here are the changes found in Patchwork_13425 that come from known issues:

### IGT changes ###

#### Possible fixes ####

  * igt@debugfs_test@read_all_entries:
    - fi-ilk-650:         [DMESG-WARN][3] ([fdo#106387]) -> [PASS][4]
   [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6351/fi-ilk-650/igt@debugfs_test@read_all_entries.html
   [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13425/fi-ilk-650/igt@debugfs_test@read_all_entries.html

  * igt@gem_ctx_create@basic-files:
    - fi-icl-u3:          [INCOMPLETE][5] ([fdo#107713] / [fdo#109100]) -> [PASS][6]
   [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6351/fi-icl-u3/igt@gem_ctx_create@basic-files.html
   [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13425/fi-icl-u3/igt@gem_ctx_create@basic-files.html

  * igt@gem_ctx_switch@basic-default:
    - fi-icl-guc:         [INCOMPLETE][7] ([fdo#107713] / [fdo#108569]) -> [PASS][8]
   [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6351/fi-icl-guc/igt@gem_ctx_switch@basic-default.html
   [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13425/fi-icl-guc/igt@gem_ctx_switch@basic-default.html

  * igt@kms_chamelium@hdmi-hpd-fast:
    - fi-kbl-7500u:       [FAIL][9] ([fdo#109485]) -> [PASS][10]
   [9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6351/fi-kbl-7500u/igt@kms_chamelium@hdmi-hpd-fast.html
   [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13425/fi-kbl-7500u/igt@kms_chamelium@hdmi-hpd-fast.html

  
#### Warnings ####

  * igt@kms_chamelium@dp-crc-fast:
    - fi-kbl-7567u:       [TIMEOUT][11] -> [FAIL][12] ([fdo#109635 ])
   [11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6351/fi-kbl-7567u/igt@kms_chamelium@dp-crc-fast.html
   [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13425/fi-kbl-7567u/igt@kms_chamelium@dp-crc-fast.html

  
  [fdo#106387]: https://bugs.freedesktop.org/show_bug.cgi?id=106387
  [fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
  [fdo#108569]: https://bugs.freedesktop.org/show_bug.cgi?id=108569
  [fdo#109100]: https://bugs.freedesktop.org/show_bug.cgi?id=109100
  [fdo#109485]: https://bugs.freedesktop.org/show_bug.cgi?id=109485
  [fdo#109635 ]: https://bugs.freedesktop.org/show_bug.cgi?id=109635 


Participating hosts (51 -> 45)
------------------------------

  Additional (2): fi-gdg-551 fi-bwr-2160 
  Missing    (8): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-pnv-d510 fi-icl-y fi-byt-clapper fi-bdw-samus 


Build changes
-------------

  * Linux: CI_DRM_6351 -> Patchwork_13425

  CI_DRM_6351: 841a5e9b5d0b617cea39d2de4492cf3474d3f555 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_5068: 15ad664534413628f06c0f172aac11598bfdb895 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
  Patchwork_13425: 106a823588249eb8e62bad8d7707609aa8ae107a @ git://anongit.freedesktop.org/gfx-ci/linux


== Linux commits ==

106a82358824 drm/i915/icl: whitelist PS_(DEPTH|INVOCATION)_COUNT
cc1cd5289857 drm/i915: whitelist PS_(DEPTH|INVOCATION)_COUNT
920a6126f035 drm/i915: fix whitelist selftests with readonly registers

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13425/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: ✗ Fi.CI.BAT: failure for drm/i915: CTS fixes (rev5)

[Lionel Landwerlin]

On 26/06/2019 04:45, Patchwork wrote:
> == Series Details ==
>
> Series: drm/i915: CTS fixes (rev5)
> URL   : https://patchwork.freedesktop.org/series/62437/
> State : failure
>
> == Summary ==
>
> CI Bug Log - changes from CI_DRM_6351 -> Patchwork_13425
> ====================================================
>
> Summary
> -------
>
>    **FAILURE**
>
>    Serious unknown changes coming with Patchwork_13425 absolutely need to be
>    verified manually.
>    
>    If you think the reported changes have nothing to do with the changes
>    introduced in Patchwork_13425, please notify your bug team to allow them
>    to document this new failure mode, which will reduce false positives in CI.
>
>    External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13425/
>
> Possible new issues
> -------------------
>
>    Here are the unknown changes that may have been introduced in Patchwork_13425:
>
> ### IGT changes ###
>
> #### Possible regressions ####
>
>    * igt@i915_selftest@live_workarounds:
>      - fi-icl-dsi:         [PASS][1] -> [DMESG-FAIL][2]
>     [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6351/fi-icl-dsi/igt@i915_selftest@live_workarounds.html
>     [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13425/fi-icl-dsi/igt@i915_selftest@live_workarounds.html


Did we loose the ability to whitelist readonly on ICL? :)


>
>    
> Known issues
> ------------
>
>    Here are the changes found in Patchwork_13425 that come from known issues:
>
> ### IGT changes ###
>
> #### Possible fixes ####
>
>    * igt@debugfs_test@read_all_entries:
>      - fi-ilk-650:         [DMESG-WARN][3] ([fdo#106387]) -> [PASS][4]
>     [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6351/fi-ilk-650/igt@debugfs_test@read_all_entries.html
>     [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13425/fi-ilk-650/igt@debugfs_test@read_all_entries.html
>
>    * igt@gem_ctx_create@basic-files:
>      - fi-icl-u3:          [INCOMPLETE][5] ([fdo#107713] / [fdo#109100]) -> [PASS][6]
>     [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6351/fi-icl-u3/igt@gem_ctx_create@basic-files.html
>     [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13425/fi-icl-u3/igt@gem_ctx_create@basic-files.html
>
>    * igt@gem_ctx_switch@basic-default:
>      - fi-icl-guc:         [INCOMPLETE][7] ([fdo#107713] / [fdo#108569]) -> [PASS][8]
>     [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6351/fi-icl-guc/igt@gem_ctx_switch@basic-default.html
>     [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13425/fi-icl-guc/igt@gem_ctx_switch@basic-default.html
>
>    * igt@kms_chamelium@hdmi-hpd-fast:
>      - fi-kbl-7500u:       [FAIL][9] ([fdo#109485]) -> [PASS][10]
>     [9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6351/fi-kbl-7500u/igt@kms_chamelium@hdmi-hpd-fast.html
>     [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13425/fi-kbl-7500u/igt@kms_chamelium@hdmi-hpd-fast.html
>
>    
> #### Warnings ####
>
>    * igt@kms_chamelium@dp-crc-fast:
>      - fi-kbl-7567u:       [TIMEOUT][11] -> [FAIL][12] ([fdo#109635 ])
>     [11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6351/fi-kbl-7567u/igt@kms_chamelium@dp-crc-fast.html
>     [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13425/fi-kbl-7567u/igt@kms_chamelium@dp-crc-fast.html
>
>    
>    [fdo#106387]: https://bugs.freedesktop.org/show_bug.cgi?id=106387
>    [fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
>    [fdo#108569]: https://bugs.freedesktop.org/show_bug.cgi?id=108569
>    [fdo#109100]: https://bugs.freedesktop.org/show_bug.cgi?id=109100
>    [fdo#109485]: https://bugs.freedesktop.org/show_bug.cgi?id=109485
>    [fdo#109635 ]: https://bugs.freedesktop.org/show_bug.cgi?id=109635
>
>
> Participating hosts (51 -> 45)
> ------------------------------
>
>    Additional (2): fi-gdg-551 fi-bwr-2160
>    Missing    (8): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-pnv-d510 fi-icl-y fi-byt-clapper fi-bdw-samus
>
>
> Build changes
> -------------
>
>    * Linux: CI_DRM_6351 -> Patchwork_13425
>
>    CI_DRM_6351: 841a5e9b5d0b617cea39d2de4492cf3474d3f555 @ git://anongit.freedesktop.org/gfx-ci/linux
>    IGT_5068: 15ad664534413628f06c0f172aac11598bfdb895 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
>    Patchwork_13425: 106a823588249eb8e62bad8d7707609aa8ae107a @ git://anongit.freedesktop.org/gfx-ci/linux
>
>
> == Linux commits ==
>
> 106a82358824 drm/i915/icl: whitelist PS_(DEPTH|INVOCATION)_COUNT
> cc1cd5289857 drm/i915: whitelist PS_(DEPTH|INVOCATION)_COUNT
> 920a6126f035 drm/i915: fix whitelist selftests with readonly registers
>
> == Logs ==
>
> For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13425/
>

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx