diff mbox series

drm/i915/display/fbc: Do not apply WA 22014263786 to DG2

Message ID 20220602201730.199418-1-jose.souza@intel.com (mailing list archive)
State New, archived
Headers show
Series drm/i915/display/fbc: Do not apply WA 22014263786 to DG2 | expand

Commit Message

Souza, Jose June 2, 2022, 8:17 p.m. UTC
This workaround brings some regressions to DG2 and if really necessary
for DG2 an alternative workaround will be implemented.

BSpec: 54077
Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
---
 drivers/gpu/drm/i915/display/intel_fbc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Matt Roper June 2, 2022, 10:05 p.m. UTC | #1
On Thu, Jun 02, 2022 at 01:17:30PM -0700, José Roberto de Souza wrote:
> This workaround brings some regressions to DG2 and if really necessary
> for DG2 an alternative workaround will be implemented.
> 
> BSpec: 54077
> Signed-off-by: José Roberto de Souza <jose.souza@intel.com>

Reviewed-by: Matt Roper <matthew.d.roper@intel.com>

> ---
>  drivers/gpu/drm/i915/display/intel_fbc.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_fbc.c b/drivers/gpu/drm/i915/display/intel_fbc.c
> index bbdc34a23d548..8b807284cde1f 100644
> --- a/drivers/gpu/drm/i915/display/intel_fbc.c
> +++ b/drivers/gpu/drm/i915/display/intel_fbc.c
> @@ -813,8 +813,8 @@ static void intel_fbc_program_cfb(struct intel_fbc *fbc)
>  
>  static void intel_fbc_program_workarounds(struct intel_fbc *fbc)
>  {
> -	/* Wa_22014263786:icl,jsl,tgl,dg1,rkl,adls,dg2,adlp */
> -	if (DISPLAY_VER(fbc->i915) >= 11)
> +	/* Wa_22014263786:icl,jsl,tgl,dg1,rkl,adls,adlp */
> +	if (DISPLAY_VER(fbc->i915) >= 11 && !IS_DG2(fbc->i915))
>  		intel_de_rmw(fbc->i915, ILK_DPFC_CHICKEN(fbc->id), 0,
>  			     DPFC_CHICKEN_FORCE_SLB_INVALIDATION);
>  }
> -- 
> 2.36.1
>
Souza, Jose June 3, 2022, 8:19 p.m. UTC | #2
Hi Lakshmi

Can you please help with this failures?
Current code is only doing a small change that would only affect DG2.

On Fri, 2022-06-03 at 20:09 +0000, Patchwork wrote:
Patch Details
Series: drm/i915/display/fbc: Do not apply WA 22014263786 to DG2 (rev2)
URL:    https://patchwork.freedesktop.org/series/104678/
State:  failure
Details:        https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_104678v2/index.html
CI Bug Log - changes from CI_DRM_11726 -> Patchwork_104678v2
Summary

FAILURE

Serious unknown changes coming with Patchwork_104678v2 absolutely need to be
verified manually.

If you think the reported changes have nothing to do with the changes
introduced in Patchwork_104678v2, 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_104678v2/index.html

Participating hosts (43 -> 44)

Additional (2): bat-adln-1 fi-kbl-x1275
Missing (1): fi-rkl-11600

Possible new issues

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

IGT changes
Possible regressions

  *   igt@kms_addfb_basic@unused-pitches:
     *   fi-kbl-soraka: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11726/fi-kbl-soraka/igt@kms_addfb_basic@unused-pitches.html> -> INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_104678v2/fi-kbl-soraka/igt@kms_addfb_basic@unused-pitches.html>

Suppressed

The following results come from untrusted machines, tests, or statuses.
They do not affect the overall result.

  *   igt@i915_selftest@live@hangcheck:

     *   {fi-ehl-2}: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11726/fi-ehl-2/igt@i915_selftest@live@hangcheck.html> -> INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_104678v2/fi-ehl-2/igt@i915_selftest@live@hangcheck.html>
  *   igt@kms_frontbuffer_tracking@basic:

     *   {bat-adln-1}: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_104678v2/bat-adln-1/igt@kms_frontbuffer_tracking@basic.html> +19 similar issues

Known issues

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

IGT changes
Issues hit

  *   igt@gem_huc_copy@huc-copy:

     *   fi-kbl-x1275: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_104678v2/fi-kbl-x1275/igt@gem_huc_copy@huc-copy.html> (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271> / i915#2190<https://gitlab.freedesktop.org/drm/intel/issues/2190>)
  *   igt@gem_lmem_swapping@verify-random:

     *   fi-kbl-x1275: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_104678v2/fi-kbl-x1275/igt@gem_lmem_swapping@verify-random.html> (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271> / i915#4613<https://gitlab.freedesktop.org/drm/intel/issues/4613>) +3 similar issues
  *   igt@i915_selftest@live@hangcheck:

     *   bat-dg1-5: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11726/bat-dg1-5/igt@i915_selftest@live@hangcheck.html> -> DMESG-FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_104678v2/bat-dg1-5/igt@i915_selftest@live@hangcheck.html> (i915#4494<https://gitlab.freedesktop.org/drm/intel/issues/4494> / i915#4957<https://gitlab.freedesktop.org/drm/intel/issues/4957>)

     *   bat-dg1-6: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11726/bat-dg1-6/igt@i915_selftest@live@hangcheck.html> -> DMESG-FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_104678v2/bat-dg1-6/igt@i915_selftest@live@hangcheck.html> (i915#4494<https://gitlab.freedesktop.org/drm/intel/issues/4494> / i915#4957<https://gitlab.freedesktop.org/drm/intel/issues/4957>)

  *   igt@i915_selftest@live@requests:

     *   fi-blb-e6850: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11726/fi-blb-e6850/igt@i915_selftest@live@requests.html> -> DMESG-FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_104678v2/fi-blb-e6850/igt@i915_selftest@live@requests.html> (i915#4528<https://gitlab.freedesktop.org/drm/intel/issues/4528>)
  *   igt@i915_selftest@live@reset:

     *   bat-adlp-4: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11726/bat-adlp-4/igt@i915_selftest@live@reset.html> -> DMESG-FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_104678v2/bat-adlp-4/igt@i915_selftest@live@reset.html> (i915#4983<https://gitlab.freedesktop.org/drm/intel/issues/4983>)
  *   igt@kms_chamelium@dp-hpd-fast:

     *   fi-kbl-x1275: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_104678v2/fi-kbl-x1275/igt@kms_chamelium@dp-hpd-fast.html> (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271> / fdo#111827<https://bugs.freedesktop.org/show_bug.cgi?id=111827>) +8 similar issues
  *   igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-d:

     *   fi-kbl-x1275: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_104678v2/fi-kbl-x1275/igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-d.html> (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271> / i915#533<https://gitlab.freedesktop.org/drm/intel/issues/533>)
  *   igt@prime_vgem@basic-userptr:

     *   fi-kbl-x1275: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_104678v2/fi-kbl-x1275/igt@prime_vgem@basic-userptr.html> (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271>) +12 similar issues
  *   igt@runner@aborted:

     *   bat-adlp-4: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_104678v2/bat-adlp-4/igt@runner@aborted.html> (i915#4312<https://gitlab.freedesktop.org/drm/intel/issues/4312>)

{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).

Build changes

  *   Linux: CI_DRM_11726 -> Patchwork_104678v2

CI-20190529: 20190529
CI_DRM_11726: 74ea63ad8ffc71b8345436147517253dcabd4793 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6505: edb1a467fb622b23b927e28ff603fa43851fea97 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_104678v2: 74ea63ad8ffc71b8345436147517253dcabd4793 @ git://anongit.freedesktop.org/gfx-ci/linux

Linux commits

9113e363235c drm/i915/display/fbc: Do not apply WA 22014263786 to DG2
diff mbox series

Patch

diff --git a/drivers/gpu/drm/i915/display/intel_fbc.c b/drivers/gpu/drm/i915/display/intel_fbc.c
index bbdc34a23d548..8b807284cde1f 100644
--- a/drivers/gpu/drm/i915/display/intel_fbc.c
+++ b/drivers/gpu/drm/i915/display/intel_fbc.c
@@ -813,8 +813,8 @@  static void intel_fbc_program_cfb(struct intel_fbc *fbc)
 
 static void intel_fbc_program_workarounds(struct intel_fbc *fbc)
 {
-	/* Wa_22014263786:icl,jsl,tgl,dg1,rkl,adls,dg2,adlp */
-	if (DISPLAY_VER(fbc->i915) >= 11)
+	/* Wa_22014263786:icl,jsl,tgl,dg1,rkl,adls,adlp */
+	if (DISPLAY_VER(fbc->i915) >= 11 && !IS_DG2(fbc->i915))
 		intel_de_rmw(fbc->i915, ILK_DPFC_CHICKEN(fbc->id), 0,
 			     DPFC_CHICKEN_FORCE_SLB_INVALIDATION);
 }