diff mbox series

drm/i915/dg1: Apply WA 1409120013 and 14011059788

Message ID 20210113133759.72055-1-jose.souza@intel.com (mailing list archive)
State New, archived
Headers show
Series drm/i915/dg1: Apply WA 1409120013 and 14011059788 | expand

Commit Message

Souza, Jose Jan. 13, 2021, 1:37 p.m. UTC
DG1 is missing those two WA so instead of copy and paste it to the DG1
function, here calling the function that implements it.

While at it also renaming tgl_init_clock_gating to
gen12lp_init_clock_gating as it is also used by DG1, RKL and ADL-S.

Cc: Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
---
 drivers/gpu/drm/i915/intel_pm.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

Comments

Matt Roper Jan. 13, 2021, 6:33 p.m. UTC | #1
On Wed, Jan 13, 2021 at 05:37:59AM -0800, José Roberto de Souza wrote:
> DG1 is missing those two WA so instead of copy and paste it to the DG1
> function, here calling the function that implements it.
> 
> While at it also renaming tgl_init_clock_gating to
> gen12lp_init_clock_gating as it is also used by DG1, RKL and ADL-S.
> 
> Cc: Matt Roper <matthew.d.roper@intel.com>
> Signed-off-by: José Roberto de Souza <jose.souza@intel.com>

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

> ---
>  drivers/gpu/drm/i915/intel_pm.c | 12 +++++++-----
>  1 file changed, 7 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index bbc73df7f753..992fce8b8d13 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -7103,24 +7103,26 @@ static void icl_init_clock_gating(struct drm_i915_private *dev_priv)
>  			 0, CNL_DELAY_PMRSP);
>  }
>  
> -static void tgl_init_clock_gating(struct drm_i915_private *dev_priv)
> +static void gen12lp_init_clock_gating(struct drm_i915_private *dev_priv)
>  {
> -	/* Wa_1409120013:tgl */
> +	/* Wa_1409120013:tgl,rkl,adl_s,dg1 */
>  	intel_uncore_write(&dev_priv->uncore, ILK_DPFC_CHICKEN,
> -		   ILK_DPFC_CHICKEN_COMP_DUMMY_PIXEL);
> +			   ILK_DPFC_CHICKEN_COMP_DUMMY_PIXEL);
>  
>  	/* Wa_1409825376:tgl (pre-prod)*/
>  	if (IS_TGL_DISP_REVID(dev_priv, TGL_REVID_A0, TGL_REVID_B1))
>  		intel_uncore_write(&dev_priv->uncore, GEN9_CLKGATE_DIS_3, intel_uncore_read(&dev_priv->uncore, GEN9_CLKGATE_DIS_3) |
>  			   TGL_VRH_GATING_DIS);
>  
> -	/* Wa_14011059788:tgl */
> +	/* Wa_14011059788:tgl,rkl,adl_s,dg1 */
>  	intel_uncore_rmw(&dev_priv->uncore, GEN10_DFR_RATIO_EN_AND_CHICKEN,
>  			 0, DFR_DISABLE);
>  }
>  
>  static void dg1_init_clock_gating(struct drm_i915_private *dev_priv)
>  {
> +	gen12lp_init_clock_gating(dev_priv);
> +
>  	/* Wa_1409836686:dg1[a0] */
>  	if (IS_DG1_REVID(dev_priv, DG1_REVID_A0, DG1_REVID_A0))
>  		intel_uncore_write(&dev_priv->uncore, GEN9_CLKGATE_DIS_3, intel_uncore_read(&dev_priv->uncore, GEN9_CLKGATE_DIS_3) |
> @@ -7583,7 +7585,7 @@ void intel_init_clock_gating_hooks(struct drm_i915_private *dev_priv)
>  	if (IS_DG1(dev_priv))
>  		dev_priv->display.init_clock_gating = dg1_init_clock_gating;
>  	else if (IS_GEN(dev_priv, 12))
> -		dev_priv->display.init_clock_gating = tgl_init_clock_gating;
> +		dev_priv->display.init_clock_gating = gen12lp_init_clock_gating;
>  	else if (IS_GEN(dev_priv, 11))
>  		dev_priv->display.init_clock_gating = icl_init_clock_gating;
>  	else if (IS_CANNONLAKE(dev_priv))
> -- 
> 2.30.0
>
Souza, Jose Jan. 14, 2021, 4:04 p.m. UTC | #2
On Wed, 2021-01-13 at 20:03 +0000, Patchwork wrote:
Patch Details
Series: drm/i915/dg1: Apply WA 1409120013 and 14011059788
URL:    https://patchwork.freedesktop.org/series/85807/
State:  success
Details:        https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19333/index.html
CI Bug Log - changes from CI_DRM_9602_full -> Patchwork_19333_full
Summary

SUCCESS

No regressions found.

Pushed, thanks for the review Matt Roper.

Known issues

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

IGT changes
Issues hit

  *   igt@gem_exec_whisper@basic-queues-forked-all:

     *   shard-glk: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9602/shard-glk6/igt@gem_exec_whisper@basic-queues-forked-all.html> -> DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19333/shard-glk6/igt@gem_exec_whisper@basic-queues-forked-all.html> (i915#118<https://gitlab.freedesktop.org/drm/intel/issues/118> / i915#95<https://gitlab.freedesktop.org/drm/intel/issues/95>) +1 similar issue
  *   igt@kms_ccs@pipe-c-crc-sprite-planes-basic:

     *   shard-skl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19333/shard-skl8/igt@kms_ccs@pipe-c-crc-sprite-planes-basic.html> (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271> / fdo#111304<https://bugs.freedesktop.org/show_bug.cgi?id=111304>)
  *   igt@kms_color@pipe-c-degamma:

     *   shard-skl: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9602/shard-skl3/igt@kms_color@pipe-c-degamma.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19333/shard-skl5/igt@kms_color@pipe-c-degamma.html> (i915#71<https://gitlab.freedesktop.org/drm/intel/issues/71>)
  *   igt@kms_color_chamelium@pipe-invalid-degamma-lut-sizes:

     *   shard-skl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19333/shard-skl3/igt@kms_color_chamelium@pipe-invalid-degamma-lut-sizes.html> (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271> / fdo#111827<https://bugs.freedesktop.org/show_bug.cgi?id=111827>) +4 similar issues
  *   igt@kms_cursor_crc@pipe-c-cursor-64x21-random:

     *   shard-skl: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9602/shard-skl5/igt@kms_cursor_crc@pipe-c-cursor-64x21-random.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19333/shard-skl7/igt@kms_cursor_crc@pipe-c-cursor-64x21-random.html> (i915#54<https://gitlab.freedesktop.org/drm/intel/issues/54>) +7 similar issues
  *   igt@kms_cursor_legacy@flip-vs-cursor-varying-size:

     *   shard-tglb: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9602/shard-tglb8/igt@kms_cursor_legacy@flip-vs-cursor-varying-size.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19333/shard-tglb2/igt@kms_cursor_legacy@flip-vs-cursor-varying-size.html> (i915#2346<https://gitlab.freedesktop.org/drm/intel/issues/2346>)
  *   igt@kms_flip@flip-vs-expired-vblank@a-edp1:

     *   shard-skl: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9602/shard-skl10/igt@kms_flip@flip-vs-expired-vblank@a-edp1.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19333/shard-skl6/igt@kms_flip@flip-vs-expired-vblank@a-edp1.html> (i915#79<https://gitlab.freedesktop.org/drm/intel/issues/79>) +1 similar issue

     *   shard-tglb: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9602/shard-tglb1/igt@kms_flip@flip-vs-expired-vblank@a-edp1.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19333/shard-tglb1/igt@kms_flip@flip-vs-expired-vblank@a-edp1.html> (i915#2598<https://gitlab.freedesktop.org/drm/intel/issues/2598>)

  *   igt@kms_flip@flip-vs-suspend-interruptible@c-edp1:

     *   shard-skl: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9602/shard-skl1/igt@kms_flip@flip-vs-suspend-interruptible@c-edp1.html> -> INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19333/shard-skl3/igt@kms_flip@flip-vs-suspend-interruptible@c-edp1.html> (i915#2295<https://gitlab.freedesktop.org/drm/intel/issues/2295>)
  *   igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-spr-indfb-draw-pwrite:

     *   shard-skl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19333/shard-skl8/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-spr-indfb-draw-pwrite.html> (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271>) +34 similar issues
  *   igt@kms_frontbuffer_tracking@psr-1p-offscren-pri-indfb-draw-blt:

     *   shard-skl: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9602/shard-skl1/igt@kms_frontbuffer_tracking@psr-1p-offscren-pri-indfb-draw-blt.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19333/shard-skl9/igt@kms_frontbuffer_tracking@psr-1p-offscren-pri-indfb-draw-blt.html> (i915#49<https://gitlab.freedesktop.org/drm/intel/issues/49>)
  *   igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min:

     *   shard-skl: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19333/shard-skl8/igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min.html> (fdo#108145<https://bugs.freedesktop.org/show_bug.cgi?id=108145> / i915#265<https://gitlab.freedesktop.org/drm/intel/issues/265>) +1 similar issue
  *   igt@kms_plane_alpha_blend@pipe-c-coverage-7efc:

     *   shard-skl: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9602/shard-skl3/igt@kms_plane_alpha_blend@pipe-c-coverage-7efc.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19333/shard-skl5/igt@kms_plane_alpha_blend@pipe-c-coverage-7efc.html> (fdo#108145<https://bugs.freedesktop.org/show_bug.cgi?id=108145> / i915#265<https://gitlab.freedesktop.org/drm/intel/issues/265>) +1 similar issue
  *   igt@kms_plane_lowres@pipe-a-tiling-none:

     *   shard-snb: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9602/shard-snb7/igt@kms_plane_lowres@pipe-a-tiling-none.html> -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19333/shard-snb6/igt@kms_plane_lowres@pipe-a-tiling-none.html> (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271>)
  *   igt@kms_psr@psr2_sprite_mmap_cpu:

     *   shard-iclb: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9602/shard-iclb2/igt@kms_psr@psr2_sprite_mmap_cpu.html> -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19333/shard-iclb3/igt@kms_psr@psr2_sprite_mmap_cpu.html> (fdo#109441<https://bugs.freedesktop.org/show_bug.cgi?id=109441>)
  *   igt@kms_vblank@pipe-a-ts-continuation-suspend:

     *   shard-apl: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9602/shard-apl6/igt@kms_vblank@pipe-a-ts-continuation-suspend.html> -> INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19333/shard-apl7/igt@kms_vblank@pipe-a-ts-continuation-suspend.html> (i915#2295<https://gitlab.freedesktop.org/drm/intel/issues/2295>)

Possible fixes

  *   igt@gem_ctx_persistence@close-replace-race:

     *   shard-glk: TIMEOUT<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9602/shard-glk6/igt@gem_ctx_persistence@close-replace-race.html> (i915#2918<https://gitlab.freedesktop.org/drm/intel/issues/2918>) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19333/shard-glk6/igt@gem_ctx_persistence@close-replace-race.html>
  *   {igt@gem_exec_fair@basic-none-rrul@rcs0}:

     *   shard-glk: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9602/shard-glk7/igt@gem_exec_fair@basic-none-rrul@rcs0.html> (i915#2842<https://gitlab.freedesktop.org/drm/intel/issues/2842>) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19333/shard-glk2/igt@gem_exec_fair@basic-none-rrul@rcs0.html> +2 similar issues
  *   {igt@gem_exec_fair@basic-none-share@rcs0}:

     *   shard-apl: SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9602/shard-apl2/igt@gem_exec_fair@basic-none-share@rcs0.html> (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271>) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19333/shard-apl1/igt@gem_exec_fair@basic-none-share@rcs0.html>
  *   {igt@gem_exec_fair@basic-pace-share@rcs0}:

     *   shard-tglb: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9602/shard-tglb8/igt@gem_exec_fair@basic-pace-share@rcs0.html> (i915#2842<https://gitlab.freedesktop.org/drm/intel/issues/2842>) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19333/shard-tglb2/igt@gem_exec_fair@basic-pace-share@rcs0.html>
  *   {igt@gem_exec_fair@basic-pace@vcs0}:

     *   shard-kbl: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9602/shard-kbl2/igt@gem_exec_fair@basic-pace@vcs0.html> (i915#2842<https://gitlab.freedesktop.org/drm/intel/issues/2842>) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19333/shard-kbl1/igt@gem_exec_fair@basic-pace@vcs0.html>
  *   {igt@gem_exec_schedule@u-fairslice@rcs0}:

     *   shard-skl: DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9602/shard-skl2/igt@gem_exec_schedule@u-fairslice@rcs0.html> (i915#1610<https://gitlab.freedesktop.org/drm/intel/issues/1610> / i915#2803<https://gitlab.freedesktop.org/drm/intel/issues/2803>) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19333/shard-skl3/igt@gem_exec_schedule@u-fairslice@rcs0.html>
  *   igt@gem_exec_whisper@basic-queues-forked:

     *   shard-glk: DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9602/shard-glk9/igt@gem_exec_whisper@basic-queues-forked.html> (i915#118<https://gitlab.freedesktop.org/drm/intel/issues/118> / i915#95<https://gitlab.freedesktop.org/drm/intel/issues/95>) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19333/shard-glk2/igt@gem_exec_whisper@basic-queues-forked.html> +1 similar issue
  *   igt@gen9_exec_parse@allowed-all:

     *   shard-skl: DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9602/shard-skl4/igt@gen9_exec_parse@allowed-all.html> (i915#1436<https://gitlab.freedesktop.org/drm/intel/issues/1436> / i915#716<https://gitlab.freedesktop.org/drm/intel/issues/716>) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19333/shard-skl8/igt@gen9_exec_parse@allowed-all.html>
  *   igt@i915_selftest@live@gt_heartbeat:

     *   shard-skl: DMESG-FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9602/shard-skl10/igt@i915_selftest@live@gt_heartbeat.html> (i915#2291<https://gitlab.freedesktop.org/drm/intel/issues/2291> / i915#541<https://gitlab.freedesktop.org/drm/intel/issues/541>) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19333/shard-skl6/igt@i915_selftest@live@gt_heartbeat.html>
  *   igt@kms_async_flips@test-time-stamp:

     *   shard-tglb: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9602/shard-tglb1/igt@kms_async_flips@test-time-stamp.html> (i915#2597<https://gitlab.freedesktop.org/drm/intel/issues/2597>) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19333/shard-tglb1/igt@kms_async_flips@test-time-stamp.html>
  *   igt@kms_cursor_crc@pipe-b-cursor-64x21-sliding:

     *   shard-skl: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9602/shard-skl8/igt@kms_cursor_crc@pipe-b-cursor-64x21-sliding.html> (i915#54<https://gitlab.freedesktop.org/drm/intel/issues/54>) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19333/shard-skl2/igt@kms_cursor_crc@pipe-b-cursor-64x21-sliding.html> +7 similar issues
  *   igt@kms_cursor_legacy@2x-long-flip-vs-cursor-legacy:

     *   shard-glk: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9602/shard-glk9/igt@kms_cursor_legacy@2x-long-flip-vs-cursor-legacy.html> (i915#72<https://gitlab.freedesktop.org/drm/intel/issues/72>) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19333/shard-glk2/igt@kms_cursor_legacy@2x-long-flip-vs-cursor-legacy.html>
  *   igt@kms_cursor_legacy@flip-vs-cursor-busy-crc-atomic:

     *   shard-skl: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9602/shard-skl8/igt@kms_cursor_legacy@flip-vs-cursor-busy-crc-atomic.html> (i915#2346<https://gitlab.freedesktop.org/drm/intel/issues/2346>) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19333/shard-skl2/igt@kms_cursor_legacy@flip-vs-cursor-busy-crc-atomic.html> +1 similar issue
  *   igt@kms_flip@flip-vs-blocking-wf-vblank@c-edp1:

     *   shard-skl: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9602/shard-skl7/igt@kms_flip@flip-vs-blocking-wf-vblank@c-edp1.html> (i915#2122<https://gitlab.freedesktop.org/drm/intel/issues/2122>) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19333/shard-skl1/igt@kms_flip@flip-vs-blocking-wf-vblank@c-edp1.html>
  *   igt@kms_flip@modeset-vs-vblank-race-interruptible@b-edp1:

     *   shard-skl: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9602/shard-skl6/igt@kms_flip@modeset-vs-vblank-race-interruptible@b-edp1.html> (i915#407<https://gitlab.freedesktop.org/drm/intel/issues/407>) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19333/shard-skl7/igt@kms_flip@modeset-vs-vblank-race-interruptible@b-edp1.html>
  *   igt@kms_hdr@bpc-switch:

     *   shard-skl: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9602/shard-skl1/igt@kms_hdr@bpc-switch.html> (i915#1188<https://gitlab.freedesktop.org/drm/intel/issues/1188>) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19333/shard-skl9/igt@kms_hdr@bpc-switch.html>
  *   igt@kms_plane_alpha_blend@pipe-a-coverage-7efc:

     *   shard-skl: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9602/shard-skl2/igt@kms_plane_alpha_blend@pipe-a-coverage-7efc.html> (fdo#108145<https://bugs.freedesktop.org/show_bug.cgi?id=108145> / i915#265<https://gitlab.freedesktop.org/drm/intel/issues/265>) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19333/shard-skl6/igt@kms_plane_alpha_blend@pipe-a-coverage-7efc.html>
  *   igt@kms_psr2_su@page_flip:

     *   shard-iclb: SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9602/shard-iclb4/igt@kms_psr2_su@page_flip.html> (fdo#109642<https://bugs.freedesktop.org/show_bug.cgi?id=109642> / fdo#111068<https://bugs.freedesktop.org/show_bug.cgi?id=111068>) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19333/shard-iclb2/igt@kms_psr2_su@page_flip.html>
  *   igt@kms_psr@psr2_sprite_render:

     *   shard-iclb: SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9602/shard-iclb6/igt@kms_psr@psr2_sprite_render.html> (fdo#109441<https://bugs.freedesktop.org/show_bug.cgi?id=109441>) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19333/shard-iclb2/igt@kms_psr@psr2_sprite_render.html>
  *   igt@perf@polling-parameterized:

     *   shard-tglb: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9602/shard-tglb7/igt@perf@polling-parameterized.html> (i915#1542<https://gitlab.freedesktop.org/drm/intel/issues/1542>) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19333/shard-tglb6/igt@perf@polling-parameterized.html>

Warnings

  *   igt@i915_pm_dc@dc3co-vpb-simulation:

     *   shard-iclb: SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9602/shard-iclb6/igt@i915_pm_dc@dc3co-vpb-simulation.html> -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19333/shard-iclb2/igt@i915_pm_dc@dc3co-vpb-simulation.html> (i915#588<https://gitlab.freedesktop.org/drm/intel/issues/588>)
  *   igt@runner@aborted:

     *   shard-apl: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9602/shard-apl3/igt@runner@aborted.html> (i915#2295<https://gitlab.freedesktop.org/drm/intel/issues/2295>) -> (FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19333/shard-apl4/igt@runner@aborted.html>, FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19333/shard-apl4/igt@runner@aborted.html>) (i915#1610<https://gitlab.freedesktop.org/drm/intel/issues/1610> / i915#2295<https://gitlab.freedesktop.org/drm/intel/issues/2295> / i915#2426<https://gitlab.freedesktop.org/drm/intel/issues/2426>)

     *   shard-skl: (FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9602/shard-skl4/igt@runner@aborted.html>, FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9602/shard-skl9/igt@runner@aborted.html>, FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9602/shard-skl2/igt@runner@aborted.html>) (i915#1436<https://gitlab.freedesktop.org/drm/intel/issues/1436> / i915#2295<https://gitlab.freedesktop.org/drm/intel/issues/2295> / i915#2426<https://gitlab.freedesktop.org/drm/intel/issues/2426>) -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19333/shard-skl7/igt@runner@aborted.html> (i915#2295<https://gitlab.freedesktop.org/drm/intel/issues/2295>)

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

Participating hosts (10 -> 10)

No changes in participating hosts

Build changes

  *   Linux: CI_DRM_9602 -> Patchwork_19333

CI-20190529: 20190529
CI_DRM_9602: 0e9e2e0eb03ba457a9ce479b8276be88761320ca @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5957: 2a2b3418f7458dfa1fac255cc5c71603f617690a @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_19333: eccd17155a798e7fdd7ade16c6b3a13aacd8abf9 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
diff mbox series

Patch

diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index bbc73df7f753..992fce8b8d13 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -7103,24 +7103,26 @@  static void icl_init_clock_gating(struct drm_i915_private *dev_priv)
 			 0, CNL_DELAY_PMRSP);
 }
 
-static void tgl_init_clock_gating(struct drm_i915_private *dev_priv)
+static void gen12lp_init_clock_gating(struct drm_i915_private *dev_priv)
 {
-	/* Wa_1409120013:tgl */
+	/* Wa_1409120013:tgl,rkl,adl_s,dg1 */
 	intel_uncore_write(&dev_priv->uncore, ILK_DPFC_CHICKEN,
-		   ILK_DPFC_CHICKEN_COMP_DUMMY_PIXEL);
+			   ILK_DPFC_CHICKEN_COMP_DUMMY_PIXEL);
 
 	/* Wa_1409825376:tgl (pre-prod)*/
 	if (IS_TGL_DISP_REVID(dev_priv, TGL_REVID_A0, TGL_REVID_B1))
 		intel_uncore_write(&dev_priv->uncore, GEN9_CLKGATE_DIS_3, intel_uncore_read(&dev_priv->uncore, GEN9_CLKGATE_DIS_3) |
 			   TGL_VRH_GATING_DIS);
 
-	/* Wa_14011059788:tgl */
+	/* Wa_14011059788:tgl,rkl,adl_s,dg1 */
 	intel_uncore_rmw(&dev_priv->uncore, GEN10_DFR_RATIO_EN_AND_CHICKEN,
 			 0, DFR_DISABLE);
 }
 
 static void dg1_init_clock_gating(struct drm_i915_private *dev_priv)
 {
+	gen12lp_init_clock_gating(dev_priv);
+
 	/* Wa_1409836686:dg1[a0] */
 	if (IS_DG1_REVID(dev_priv, DG1_REVID_A0, DG1_REVID_A0))
 		intel_uncore_write(&dev_priv->uncore, GEN9_CLKGATE_DIS_3, intel_uncore_read(&dev_priv->uncore, GEN9_CLKGATE_DIS_3) |
@@ -7583,7 +7585,7 @@  void intel_init_clock_gating_hooks(struct drm_i915_private *dev_priv)
 	if (IS_DG1(dev_priv))
 		dev_priv->display.init_clock_gating = dg1_init_clock_gating;
 	else if (IS_GEN(dev_priv, 12))
-		dev_priv->display.init_clock_gating = tgl_init_clock_gating;
+		dev_priv->display.init_clock_gating = gen12lp_init_clock_gating;
 	else if (IS_GEN(dev_priv, 11))
 		dev_priv->display.init_clock_gating = icl_init_clock_gating;
 	else if (IS_CANNONLAKE(dev_priv))