diff mbox series

drm/i915/adlp: Implement workaround 16013190616

Message ID 20211028230449.115832-1-jose.souza@intel.com (mailing list archive)
State New, archived
Headers show
Series drm/i915/adlp: Implement workaround 16013190616 | expand

Commit Message

Souza, Jose Oct. 28, 2021, 11:04 p.m. UTC
New workaround added to specification, requiring bit 15 of
GEN8_CHICKEN_DCPR_1 to be programed before power well 1 is enabled.

BSpec: 54369
Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
---
 drivers/gpu/drm/i915/display/intel_display_power.c | 5 +++++
 drivers/gpu/drm/i915/i915_reg.h                    | 7 ++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

Comments

Imre Deak Oct. 29, 2021, 2:58 p.m. UTC | #1
On Thu, Oct 28, 2021 at 04:04:49PM -0700, José Roberto de Souza wrote:
> New workaround added to specification, requiring bit 15 of
> GEN8_CHICKEN_DCPR_1 to be programed before power well 1 is enabled.
> 
> BSpec: 54369
> Signed-off-by: José Roberto de Souza <jose.souza@intel.com>

Reviewed-by: Imre Deak <imre.deak@intel.com>

The spec doesn't require it, so probably not re-enabling clock gating
after disabling PW#1 won't cause a problem somewhere else. But if so
the wa would be better placed in adlp_init_clock_gating().

> ---
>  drivers/gpu/drm/i915/display/intel_display_power.c | 5 +++++
>  drivers/gpu/drm/i915/i915_reg.h                    | 7 ++++---
>  2 files changed, 9 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_display_power.c b/drivers/gpu/drm/i915/display/intel_display_power.c
> index 6637760d24e0c..344e3d6967020 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_power.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_power.c
> @@ -435,6 +435,11 @@ static void hsw_power_well_enable(struct drm_i915_private *dev_priv,
>  
>  		pg = DISPLAY_VER(dev_priv) >= 11 ? ICL_PW_CTL_IDX_TO_PG(pw_idx) :
>  						 SKL_PW_CTL_IDX_TO_PG(pw_idx);
> +
> +		/* Wa_16013190616:adlp */
> +		if (IS_ALDERLAKE_P(dev_priv) && pg == SKL_PG1)
> +			intel_de_rmw(dev_priv, GEN8_CHICKEN_DCPR_1, 0, DISABLE_FLR_SRC);
> +
>  		/*
>  		 * For PW1 we have to wait both for the PW0/PG0 fuse state
>  		 * before enabling the power well and PW1/PG1's own fuse
> diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> index fd58757e846a6..541c16aee90da 100644
> --- a/drivers/gpu/drm/i915/i915_reg.h
> +++ b/drivers/gpu/drm/i915/i915_reg.h
> @@ -8310,9 +8310,10 @@ enum {
>  #define  RESET_PCH_HANDSHAKE_ENABLE	(1 << 4)
>  
>  #define GEN8_CHICKEN_DCPR_1		_MMIO(0x46430)
> -#define   SKL_SELECT_ALTERNATE_DC_EXIT	(1 << 30)
> -#define   ICL_DELAY_PMRSP		(1 << 22)
> -#define   MASK_WAKEMEM			(1 << 13)
> +#define   SKL_SELECT_ALTERNATE_DC_EXIT	REG_BIT(30)
> +#define   ICL_DELAY_PMRSP		REG_BIT(22)
> +#define   DISABLE_FLR_SRC		REG_BIT(15)
> +#define   MASK_WAKEMEM			REG_BIT(13)
>  
>  #define GEN11_CHICKEN_DCPR_2			_MMIO(0x46434)
>  #define   DCPR_MASK_MAXLATENCY_MEMUP_CLR	REG_BIT(27)
> -- 
> 2.33.1
>
Imre Deak Oct. 29, 2021, 3:08 p.m. UTC | #2
On Fri, Oct 29, 2021 at 05:58:22PM +0300, Imre Deak wrote:
> On Thu, Oct 28, 2021 at 04:04:49PM -0700, José Roberto de Souza wrote:
> > New workaround added to specification, requiring bit 15 of
> > GEN8_CHICKEN_DCPR_1 to be programed before power well 1 is enabled.
> > 
> > BSpec: 54369
> > Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
> 
> Reviewed-by: Imre Deak <imre.deak@intel.com>
> 
> The spec doesn't require it, so probably not re-enabling clock gating
> after disabling PW#1 won't cause a problem somewhere else. But if so
> the wa would be better placed in adlp_init_clock_gating().

Ah, that's called too late for this, so nvm.

> > ---
> >  drivers/gpu/drm/i915/display/intel_display_power.c | 5 +++++
> >  drivers/gpu/drm/i915/i915_reg.h                    | 7 ++++---
> >  2 files changed, 9 insertions(+), 3 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/i915/display/intel_display_power.c b/drivers/gpu/drm/i915/display/intel_display_power.c
> > index 6637760d24e0c..344e3d6967020 100644
> > --- a/drivers/gpu/drm/i915/display/intel_display_power.c
> > +++ b/drivers/gpu/drm/i915/display/intel_display_power.c
> > @@ -435,6 +435,11 @@ static void hsw_power_well_enable(struct drm_i915_private *dev_priv,
> >  
> >  		pg = DISPLAY_VER(dev_priv) >= 11 ? ICL_PW_CTL_IDX_TO_PG(pw_idx) :
> >  						 SKL_PW_CTL_IDX_TO_PG(pw_idx);
> > +
> > +		/* Wa_16013190616:adlp */
> > +		if (IS_ALDERLAKE_P(dev_priv) && pg == SKL_PG1)
> > +			intel_de_rmw(dev_priv, GEN8_CHICKEN_DCPR_1, 0, DISABLE_FLR_SRC);
> > +
> >  		/*
> >  		 * For PW1 we have to wait both for the PW0/PG0 fuse state
> >  		 * before enabling the power well and PW1/PG1's own fuse
> > diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> > index fd58757e846a6..541c16aee90da 100644
> > --- a/drivers/gpu/drm/i915/i915_reg.h
> > +++ b/drivers/gpu/drm/i915/i915_reg.h
> > @@ -8310,9 +8310,10 @@ enum {
> >  #define  RESET_PCH_HANDSHAKE_ENABLE	(1 << 4)
> >  
> >  #define GEN8_CHICKEN_DCPR_1		_MMIO(0x46430)
> > -#define   SKL_SELECT_ALTERNATE_DC_EXIT	(1 << 30)
> > -#define   ICL_DELAY_PMRSP		(1 << 22)
> > -#define   MASK_WAKEMEM			(1 << 13)
> > +#define   SKL_SELECT_ALTERNATE_DC_EXIT	REG_BIT(30)
> > +#define   ICL_DELAY_PMRSP		REG_BIT(22)
> > +#define   DISABLE_FLR_SRC		REG_BIT(15)
> > +#define   MASK_WAKEMEM			REG_BIT(13)
> >  
> >  #define GEN11_CHICKEN_DCPR_2			_MMIO(0x46434)
> >  #define   DCPR_MASK_MAXLATENCY_MEMUP_CLR	REG_BIT(27)
> > -- 
> > 2.33.1
> >
Souza, Jose Oct. 29, 2021, 7:54 p.m. UTC | #3
On Fri, 2021-10-29 at 08:23 +0000, Patchwork wrote:
Patch Details
Series: drm/i915/adlp: Implement workaround 16013190616
URL:    https://patchwork.freedesktop.org/series/96405/
State:  failure
Details:        https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/index.html
CI Bug Log - changes from CI_DRM_10809_full -> Patchwork_21482_full
Summary

FAILURE

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

If you think the reported changes have nothing to do with the changes
introduced in Patchwork_21482_full, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.

Participating hosts (10 -> 9)

Missing (1): pig-kbl-iris

Possible new issues

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

IGT changes
Possible regressions

  *   igt@gem_exec_fence@submit67@vecs0:
     *   shard-tglb: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10809/shard-tglb1/igt@gem_exec_fence@submit67@vecs0.html> -> INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-tglb6/igt@gem_exec_fence@submit67@vecs0.html>

Failure in a platform not affected by this changes.

Pushed, thanks for the review Imre.

Known issues

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

IGT changes
Issues hit

  *   igt@gem_create@create-massive:

     *   shard-skl: NOTRUN -> DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-skl7/igt@gem_create@create-massive.html> ([i915#1982] / [i915#3002])
  *   igt@gem_exec_fair@basic-none@vcs1:

     *   shard-iclb: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-iclb1/igt@gem_exec_fair@basic-none@vcs1.html> ([i915#2842])
  *   igt@gem_exec_fair@basic-none@vecs0:

     *   shard-kbl: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10809/shard-kbl7/igt@gem_exec_fair@basic-none@vecs0.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-kbl7/igt@gem_exec_fair@basic-none@vecs0.html> ([i915#2842])
  *   igt@gem_exec_fair@basic-pace@rcs0:

     *   shard-kbl: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10809/shard-kbl6/igt@gem_exec_fair@basic-pace@rcs0.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-kbl6/igt@gem_exec_fair@basic-pace@rcs0.html> ([i915#2851])
  *   igt@gem_userptr_blits@dmabuf-sync:

     *   shard-skl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-skl8/igt@gem_userptr_blits@dmabuf-sync.html> ([fdo#109271] / [i915#3323])
  *   igt@gem_userptr_blits@input-checking:

     *   shard-skl: NOTRUN -> DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-skl7/igt@gem_userptr_blits@input-checking.html> ([i915#3002])

     *   shard-tglb: NOTRUN -> DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-tglb6/igt@gem_userptr_blits@input-checking.html> ([i915#3002])

  *   igt@gem_userptr_blits@readonly-unsync:

     *   shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-tglb5/igt@gem_userptr_blits@readonly-unsync.html> ([i915#3297])
  *   igt@gem_userptr_blits@vma-merge:

     *   shard-skl: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-skl2/igt@gem_userptr_blits@vma-merge.html> ([i915#3318])
  *   igt@gen7_exec_parse@cmd-crossing-page:

     *   shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-tglb5/igt@gen7_exec_parse@cmd-crossing-page.html> ([fdo#109289])
  *   igt@gen9_exec_parse@basic-rejected-ctx-param:

     *   shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-tglb6/igt@gen9_exec_parse@basic-rejected-ctx-param.html> ([i915#2856])
  *   igt@i915_pm_dc@dc6-psr:

     *   shard-iclb: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10809/shard-iclb2/igt@i915_pm_dc@dc6-psr.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-iclb3/igt@i915_pm_dc@dc6-psr.html> ([i915#454])
  *   igt@i915_pm_rc6_residency@media-rc6-accuracy:

     *   shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-tglb3/igt@i915_pm_rc6_residency@media-rc6-accuracy.html> ([fdo#109289] / [fdo#111719])
  *   igt@i915_pm_rc6_residency@rc6-idle:

     *   shard-tglb: NOTRUN -> WARN<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-tglb1/igt@i915_pm_rc6_residency@rc6-idle.html> ([i915#2681] / [i915#2684])
  *   igt@kms_big_fb@x-tiled-16bpp-rotate-90:

     *   shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-tglb5/igt@kms_big_fb@x-tiled-16bpp-rotate-90.html> ([fdo#111614]) +3 similar issues
  *   igt@kms_big_fb@x-tiled-32bpp-rotate-180:

     *   shard-glk: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10809/shard-glk9/igt@kms_big_fb@x-tiled-32bpp-rotate-180.html> -> DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-glk6/igt@kms_big_fb@x-tiled-32bpp-rotate-180.html> ([i915#118])
  *   igt@kms_big_fb@x-tiled-max-hw-stride-64bpp-rotate-180-hflip:

     *   shard-kbl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-kbl1/igt@kms_big_fb@x-tiled-max-hw-stride-64bpp-rotate-180-hflip.html> ([fdo#109271] / [i915#3777])
  *   igt@kms_big_fb@y-tiled-8bpp-rotate-270:

     *   shard-iclb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-iclb7/igt@kms_big_fb@y-tiled-8bpp-rotate-270.html> ([fdo#110725] / [fdo#111614])
  *   igt@kms_big_fb@y-tiled-max-hw-stride-32bpp-rotate-180-async-flip:

     *   shard-skl: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-skl9/igt@kms_big_fb@y-tiled-max-hw-stride-32bpp-rotate-180-async-flip.html> ([i915#3743])
  *   igt@kms_big_fb@yf-tiled-max-hw-stride-64bpp-rotate-180-hflip:

     *   shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-tglb5/igt@kms_big_fb@yf-tiled-max-hw-stride-64bpp-rotate-180-hflip.html> ([fdo#111615]) +3 similar issues
  *   igt@kms_big_joiner@2x-modeset:

     *   shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-tglb5/igt@kms_big_joiner@2x-modeset.html> ([i915#2705])
  *   igt@kms_busy@extended-pageflip-hang-newfb:

     *   shard-snb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-snb2/igt@kms_busy@extended-pageflip-hang-newfb.html> ([fdo#109271])
  *   igt@kms_ccs@pipe-a-bad-pixel-format-y_tiled_ccs:

     *   shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-tglb5/igt@kms_ccs@pipe-a-bad-pixel-format-y_tiled_ccs.html> ([i915#3689]) +4 similar issues
  *   igt@kms_ccs@pipe-a-bad-pixel-format-y_tiled_gen12_mc_ccs:

     *   shard-apl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-apl8/igt@kms_ccs@pipe-a-bad-pixel-format-y_tiled_gen12_mc_ccs.html> ([fdo#109271] / [i915#3886]) +1 similar issue
  *   igt@kms_ccs@pipe-a-ccs-on-another-bo-y_tiled_gen12_rc_ccs_cc:

     *   shard-skl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-skl2/igt@kms_ccs@pipe-a-ccs-on-another-bo-y_tiled_gen12_rc_ccs_cc.html> ([fdo#109271] / [i915#3886]) +7 similar issues
  *   igt@kms_ccs@pipe-a-missing-ccs-buffer-y_tiled_gen12_mc_ccs:

     *   shard-kbl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-kbl1/igt@kms_ccs@pipe-a-missing-ccs-buffer-y_tiled_gen12_mc_ccs.html> ([fdo#109271] / [i915#3886]) +3 similar issues
  *   igt@kms_ccs@pipe-b-bad-pixel-format-y_tiled_gen12_mc_ccs:

     *   shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-tglb5/igt@kms_ccs@pipe-b-bad-pixel-format-y_tiled_gen12_mc_ccs.html> ([i915#3689] / [i915#3886]) +1 similar issue
  *   igt@kms_chamelium@hdmi-audio-edid:

     *   shard-kbl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-kbl3/igt@kms_chamelium@hdmi-audio-edid.html> ([fdo#109271] / [fdo#111827]) +4 similar issues
  *   igt@kms_color@pipe-a-ctm-green-to-red:

     *   shard-skl: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10809/shard-skl6/igt@kms_color@pipe-a-ctm-green-to-red.html> -> DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-skl6/igt@kms_color@pipe-a-ctm-green-to-red.html> ([i915#1982])
  *   igt@kms_color_chamelium@pipe-a-gamma:

     *   shard-iclb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-iclb5/igt@kms_color_chamelium@pipe-a-gamma.html> ([fdo#109284] / [fdo#111827]) +1 similar issue
  *   igt@kms_color_chamelium@pipe-b-ctm-blue-to-red:

     *   shard-apl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-apl8/igt@kms_color_chamelium@pipe-b-ctm-blue-to-red.html> ([fdo#109271] / [fdo#111827]) +4 similar issues
  *   igt@kms_color_chamelium@pipe-b-ctm-max:

     *   shard-skl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-skl9/igt@kms_color_chamelium@pipe-b-ctm-max.html> ([fdo#109271] / [fdo#111827]) +13 similar issues
  *   igt@kms_color_chamelium@pipe-b-ctm-negative:

     *   shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-tglb5/igt@kms_color_chamelium@pipe-b-ctm-negative.html> ([fdo#109284] / [fdo#111827]) +7 similar issues
  *   igt@kms_content_protection@lic:

     *   shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-tglb1/igt@kms_content_protection@lic.html> ([fdo#111828]) +1 similar issue
  *   igt@kms_cursor_crc@pipe-a-cursor-32x32-random:

     *   shard-iclb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-iclb7/igt@kms_cursor_crc@pipe-a-cursor-32x32-random.html> ([fdo#109278]) +2 similar issues
  *   igt@kms_cursor_crc@pipe-a-cursor-max-size-onscreen:

     *   shard-kbl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-kbl3/igt@kms_cursor_crc@pipe-a-cursor-max-size-onscreen.html> ([fdo#109271]) +75 similar issues
  *   igt@kms_cursor_crc@pipe-a-cursor-suspend:

     *   shard-tglb: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10809/shard-tglb6/igt@kms_cursor_crc@pipe-a-cursor-suspend.html> -> INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-tglb7/igt@kms_cursor_crc@pipe-a-cursor-suspend.html> ([i915#2828] / [i915#456])
  *   igt@kms_cursor_crc@pipe-b-cursor-32x32-sliding:

     *   shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-tglb5/igt@kms_cursor_crc@pipe-b-cursor-32x32-sliding.html> ([i915#3319]) +1 similar issue
  *   igt@kms_cursor_crc@pipe-b-cursor-suspend:

     *   shard-tglb: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10809/shard-tglb5/igt@kms_cursor_crc@pipe-b-cursor-suspend.html> -> INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-tglb7/igt@kms_cursor_crc@pipe-b-cursor-suspend.html> ([i915#456])
  *   igt@kms_cursor_crc@pipe-c-cursor-max-size-random:

     *   shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-tglb6/igt@kms_cursor_crc@pipe-c-cursor-max-size-random.html> ([i915#3359])
  *   igt@kms_cursor_crc@pipe-d-cursor-512x170-onscreen:

     *   shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-tglb6/igt@kms_cursor_crc@pipe-d-cursor-512x170-onscreen.html> ([fdo#109279] / [i915#3359])
  *   igt@kms_cursor_legacy@flip-vs-cursor-varying-size:

     *   shard-iclb: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10809/shard-iclb8/igt@kms_cursor_legacy@flip-vs-cursor-varying-size.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-iclb7/igt@kms_cursor_legacy@flip-vs-cursor-varying-size.html> ([i915#2346])
  *   igt@kms_cursor_legacy@pipe-d-torture-bo:

     *   shard-skl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-skl10/igt@kms_cursor_legacy@pipe-d-torture-bo.html> ([fdo#109271] / [i915#533])
  *   igt@kms_cursor_legacy@short-busy-flip-before-cursor-atomic-transitions-varying-size:

     *   shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-tglb5/igt@kms_cursor_legacy@short-busy-flip-before-cursor-atomic-transitions-varying-size.html> ([i915#4103])
  *   igt@kms_fbcon_fbt@fbc-suspend:

     *   shard-kbl: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10809/shard-kbl3/igt@kms_fbcon_fbt@fbc-suspend.html> -> INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-kbl4/igt@kms_fbcon_fbt@fbc-suspend.html> ([i915#180] / [i915#636])
  *   igt@kms_flip@flip-vs-suspend-interruptible@a-dp1:

     *   shard-kbl: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10809/shard-kbl3/igt@kms_flip@flip-vs-suspend-interruptible@a-dp1.html> -> DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-kbl7/igt@kms_flip@flip-vs-suspend-interruptible@a-dp1.html> ([i915#180]) +3 similar issues
  *   igt@kms_flip@flip-vs-suspend-interruptible@a-edp1:

     *   shard-tglb: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10809/shard-tglb5/igt@kms_flip@flip-vs-suspend-interruptible@a-edp1.html> -> INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-tglb7/igt@kms_flip@flip-vs-suspend-interruptible@a-edp1.html> ([i915#2411] / [i915#456])
  *   igt@kms_flip@flip-vs-suspend-interruptible@c-dp1:

     *   shard-apl: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10809/shard-apl3/igt@kms_flip@flip-vs-suspend-interruptible@c-dp1.html> -> DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-apl8/igt@kms_flip@flip-vs-suspend-interruptible@c-dp1.html> ([i915#180]) +1 similar issue
  *   igt@kms_flip_scaled_crc@flip-32bpp-ytileccs-to-64bpp-ytile:

     *   shard-iclb: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10809/shard-iclb4/igt@kms_flip_scaled_crc@flip-32bpp-ytileccs-to-64bpp-ytile.html> -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-iclb2/igt@kms_flip_scaled_crc@flip-32bpp-ytileccs-to-64bpp-ytile.html> ([i915#3701])
  *   igt@kms_frontbuffer_tracking@fbc-1p-shrfb-fliptrack-mmap-gtt:

     *   shard-skl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-skl2/igt@kms_frontbuffer_tracking@fbc-1p-shrfb-fliptrack-mmap-gtt.html> ([fdo#109271]) +146 similar issues
  *   igt@kms_frontbuffer_tracking@fbcpsr-2p-primscrn-spr-indfb-move:

     *   shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-tglb5/igt@kms_frontbuffer_tracking@fbcpsr-2p-primscrn-spr-indfb-move.html> ([fdo#111825]) +11 similar issues
  *   igt@kms_frontbuffer_tracking@psr-2p-scndscrn-cur-indfb-draw-mmap-cpu:

     *   shard-iclb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-iclb7/igt@kms_frontbuffer_tracking@psr-2p-scndscrn-cur-indfb-draw-mmap-cpu.html> ([fdo#109280]) +1 similar issue
  *   igt@kms_hdr@bpc-switch:

     *   shard-skl: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10809/shard-skl8/igt@kms_hdr@bpc-switch.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-skl10/igt@kms_hdr@bpc-switch.html> ([i915#1188])
  *   igt@kms_pipe_b_c_ivb@disable-pipe-b-enable-pipe-c:

     *   shard-apl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-apl7/igt@kms_pipe_b_c_ivb@disable-pipe-b-enable-pipe-c.html> ([fdo#109271]) +52 similar issues
  *   igt@kms_plane_alpha_blend@pipe-a-alpha-transparent-fb:

     *   shard-skl: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-skl2/igt@kms_plane_alpha_blend@pipe-a-alpha-transparent-fb.html> ([i915#265])
  *   igt@kms_plane_alpha_blend@pipe-b-constant-alpha-max:

     *   shard-apl: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-apl7/igt@kms_plane_alpha_blend@pipe-b-constant-alpha-max.html> ([fdo#108145] / [i915#265])

     *   shard-kbl: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-kbl3/igt@kms_plane_alpha_blend@pipe-b-constant-alpha-max.html> ([fdo#108145] / [i915#265])

  *   igt@kms_plane_alpha_blend@pipe-b-coverage-7efc:

     *   shard-skl: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10809/shard-skl4/igt@kms_plane_alpha_blend@pipe-b-coverage-7efc.html> -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-skl2/igt@kms_plane_alpha_blend@pipe-b-coverage-7efc.html> ([fdo#108145] / [i915#265])
  *   igt@kms_plane_alpha_blend@pipe-c-coverage-7efc:

     *   shard-skl: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-skl10/igt@kms_plane_alpha_blend@pipe-c-coverage-7efc.html> ([fdo#108145] / [i915#265]) +1 similar issue
  *   igt@kms_psr2_sf@overlay-plane-update-sf-dmg-area-4:

     *   shard-apl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-apl7/igt@kms_psr2_sf@overlay-plane-update-sf-dmg-area-4.html> ([fdo#109271] / [i915#658]) +1 similar issue
  *   igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area-3:

     *   shard-kbl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-kbl1/igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area-3.html> ([fdo#109271] / [i915#658]) +1 similar issue
  *   igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-5:

     *   shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-tglb6/igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-5.html> ([i915#2920])
  *   igt@kms_psr2_su@frontbuffer:

     *   shard-skl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-skl10/igt@kms_psr2_su@frontbuffer.html> ([fdo#109271] / [i915#658]) +4 similar issues
  *   igt@kms_psr2_su@page_flip:

     *   shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-tglb1/igt@kms_psr2_su@page_flip.html> ([i915#1911])
  *   igt@kms_psr@psr2_cursor_plane_move:

     *   shard-iclb: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10809/shard-iclb2/igt@kms_psr@psr2_cursor_plane_move.html> -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-iclb3/igt@kms_psr@psr2_cursor_plane_move.html> ([fdo#109441]) +1 similar issue
  *   igt@kms_psr@psr2_sprite_render:

     *   shard-tglb: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-tglb6/igt@kms_psr@psr2_sprite_render.html> ([i915#132] / [i915#3467])
  *   igt@kms_sysfs_edid_timing:

     *   shard-skl: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-skl10/igt@kms_sysfs_edid_timing.html> ([IGT#2])
  *   igt@kms_vrr@flip-suspend:

     *   shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-tglb1/igt@kms_vrr@flip-suspend.html> ([fdo#109502])
  *   igt@nouveau_crc@pipe-c-ctx-flip-detection:

     *   shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-tglb5/igt@nouveau_crc@pipe-c-ctx-flip-detection.html> ([i915#2530])
  *   igt@prime_nv_test@nv_write_i915_cpu_mmap_read:

     *   shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-tglb6/igt@prime_nv_test@nv_write_i915_cpu_mmap_read.html> ([fdo#109291]) +2 similar issues
  *   igt@sysfs_clients@busy:

     *   shard-tglb: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-tglb6/igt@sysfs_clients@busy.html> ([i915#2994])

     *   shard-skl: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-skl7/igt@sysfs_clients@busy.html> ([fdo#109271] / [i915#2994]) +1 similar issue

Possible fixes

  *   igt@gem_exec_fair@basic-none@rcs0:

     *   shard-glk: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10809/shard-glk6/igt@gem_exec_fair@basic-none@rcs0.html> ([i915#2842]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-glk5/igt@gem_exec_fair@basic-none@rcs0.html>
  *   igt@gem_exec_fair@basic-pace@rcs0:

     *   shard-iclb: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10809/shard-iclb7/igt@gem_exec_fair@basic-pace@rcs0.html> ([i915#2842]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-iclb8/igt@gem_exec_fair@basic-pace@rcs0.html> +1 similar issue
  *   igt@gem_exec_fair@basic-pace@vcs0:

     *   shard-kbl: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10809/shard-kbl6/igt@gem_exec_fair@basic-pace@vcs0.html> ([i915#2842]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-kbl6/igt@gem_exec_fair@basic-pace@vcs0.html>
  *   igt@gem_spin_batch@user-each:

     *   shard-skl: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10809/shard-skl7/igt@gem_spin_batch@user-each.html> -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-skl10/igt@gem_spin_batch@user-each.html>
  *   igt@i915_pm_dc@dc6-psr:

     *   shard-skl: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10809/shard-skl7/igt@i915_pm_dc@dc6-psr.html> ([i915#454]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-skl4/igt@i915_pm_dc@dc6-psr.html>
  *   igt@i915_suspend@fence-restore-untiled:

     *   shard-apl: DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10809/shard-apl6/igt@i915_suspend@fence-restore-untiled.html> ([i915#180]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-apl8/igt@i915_suspend@fence-restore-untiled.html> +1 similar issue
  *   igt@i915_suspend@sysfs-reader:

     *   shard-tglb: INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10809/shard-tglb7/igt@i915_suspend@sysfs-reader.html> ([i915#456]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-tglb1/igt@i915_suspend@sysfs-reader.html>
  *   igt@kms_big_fb@linear-32bpp-rotate-180:

     *   shard-glk: DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10809/shard-glk9/igt@kms_big_fb@linear-32bpp-rotate-180.html> ([i915#118]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-glk5/igt@kms_big_fb@linear-32bpp-rotate-180.html> +2 similar issues
  *   igt@kms_color@pipe-a-ctm-0-75:

     *   shard-skl: DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10809/shard-skl8/igt@kms_color@pipe-a-ctm-0-75.html> ([i915#1982]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-skl10/igt@kms_color@pipe-a-ctm-0-75.html> +1 similar issue
  *   igt@kms_cursor_crc@pipe-a-cursor-suspend:

     *   shard-skl: INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10809/shard-skl8/igt@kms_cursor_crc@pipe-a-cursor-suspend.html> ([i915#2828] / [i915#300]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-skl10/igt@kms_cursor_crc@pipe-a-cursor-suspend.html>
  *   igt@kms_cursor_crc@pipe-d-cursor-suspend:

     *   shard-tglb: INCOMPLETE<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10809/shard-tglb7/igt@kms_cursor_crc@pipe-d-cursor-suspend.html> ([i915#2411] / [i915#4211]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-tglb5/igt@kms_cursor_crc@pipe-d-cursor-suspend.html>
  *   igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions:

     *   shard-iclb: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10809/shard-iclb7/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions.html> ([i915#2346]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-iclb8/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions.html>

     *   shard-skl: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10809/shard-skl2/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions.html> ([i915#2346]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-skl8/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions.html>

  *   igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size:

     *   shard-skl: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10809/shard-skl9/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html> ([i915#2346] / [i915#533]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-skl7/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html>
  *   igt@kms_flip@flip-vs-expired-vblank@a-edp1:

     *   shard-skl: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10809/shard-skl2/igt@kms_flip@flip-vs-expired-vblank@a-edp1.html> ([i915#79]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-skl8/igt@kms_flip@flip-vs-expired-vblank@a-edp1.html>
  *   igt@kms_flip@flip-vs-expired-vblank@c-edp1:

     *   shard-skl: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10809/shard-skl2/igt@kms_flip@flip-vs-expired-vblank@c-edp1.html> ([i915#2122]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-skl8/igt@kms_flip@flip-vs-expired-vblank@c-edp1.html>
  *   igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:

     *   shard-kbl: DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10809/shard-kbl1/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a.html> ([i915#180]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-kbl3/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a.html> +1 similar issue
  *   igt@kms_psr@psr2_sprite_mmap_cpu:

     *   shard-iclb: SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10809/shard-iclb4/igt@kms_psr@psr2_sprite_mmap_cpu.html> ([fdo#109441]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-iclb2/igt@kms_psr@psr2_sprite_mmap_cpu.html> +1 similar issue
  *   igt@kms_vblank@pipe-c-ts-continuation-suspend:

     *   shard-iclb: SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10809/shard-iclb5/igt@kms_vblank@pipe-c-ts-continuation-suspend.html> ([fdo#109278]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-iclb1/igt@kms_vblank@pipe-c-ts-continuation-suspend.html>
  *   igt@perf@polling:

     *   shard-skl: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10809/shard-skl2/igt@perf@polling.html> ([i915#1542]) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-skl2/igt@perf@polling.html>

Warnings

  *   igt@gem_exec_fair@basic-none-rrul@rcs0:

     *   shard-iclb: FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10809/shard-iclb2/igt@gem_exec_fair@basic-none-rrul@rcs0.html> ([i915#2842]) -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-iclb7/igt@gem_exec_fair@basic-none-rrul@rcs0.html> ([i915#2852])
  *   igt@i915_pm_dc@dc3co-vpb-simulation:

     *   shard-iclb: SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10809/shard-iclb4/igt@i915_pm_dc@dc3co-vpb-simulation.html> ([i915#658]) -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-iclb2/igt@i915_pm_dc@dc3co-vpb-simulation.html> ([i915#588])
  *   igt@i915_pm_rc6_residency@rc6-idle:

     *   shard-iclb: WARN<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10809/shard-iclb2/igt@i915_pm_rc6_residency@rc6-idle.html> ([i915#2684]) -> WARN<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-iclb7/igt@i915_pm_rc6_residency@rc6-idle.html> ([i915#1804] / [i915#2684])
  *   igt@kms_psr2_sf@plane-move-sf-dmg-area-0:

     *   shard-iclb: SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10809/shard-iclb4/igt@kms_psr2_sf@plane-move-sf-dmg-area-0.html> ([i915#658]) -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21482/shard-iclb2/igt@kms_psr2_sf@plane-move-sf-dmg-area-0.html> ([i915#2920]) +1 similar issue
  *   igt@kms_psr2_sf@plane-move-sf-dmg-area-3:

     *   shard-iclb: [SKIP][139] ([i915#2920]) -> [SKIP][140] ([i915#658]) +1 similar issue
diff mbox series

Patch

diff --git a/drivers/gpu/drm/i915/display/intel_display_power.c b/drivers/gpu/drm/i915/display/intel_display_power.c
index 6637760d24e0c..344e3d6967020 100644
--- a/drivers/gpu/drm/i915/display/intel_display_power.c
+++ b/drivers/gpu/drm/i915/display/intel_display_power.c
@@ -435,6 +435,11 @@  static void hsw_power_well_enable(struct drm_i915_private *dev_priv,
 
 		pg = DISPLAY_VER(dev_priv) >= 11 ? ICL_PW_CTL_IDX_TO_PG(pw_idx) :
 						 SKL_PW_CTL_IDX_TO_PG(pw_idx);
+
+		/* Wa_16013190616:adlp */
+		if (IS_ALDERLAKE_P(dev_priv) && pg == SKL_PG1)
+			intel_de_rmw(dev_priv, GEN8_CHICKEN_DCPR_1, 0, DISABLE_FLR_SRC);
+
 		/*
 		 * For PW1 we have to wait both for the PW0/PG0 fuse state
 		 * before enabling the power well and PW1/PG1's own fuse
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index fd58757e846a6..541c16aee90da 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -8310,9 +8310,10 @@  enum {
 #define  RESET_PCH_HANDSHAKE_ENABLE	(1 << 4)
 
 #define GEN8_CHICKEN_DCPR_1		_MMIO(0x46430)
-#define   SKL_SELECT_ALTERNATE_DC_EXIT	(1 << 30)
-#define   ICL_DELAY_PMRSP		(1 << 22)
-#define   MASK_WAKEMEM			(1 << 13)
+#define   SKL_SELECT_ALTERNATE_DC_EXIT	REG_BIT(30)
+#define   ICL_DELAY_PMRSP		REG_BIT(22)
+#define   DISABLE_FLR_SRC		REG_BIT(15)
+#define   MASK_WAKEMEM			REG_BIT(13)
 
 #define GEN11_CHICKEN_DCPR_2			_MMIO(0x46434)
 #define   DCPR_MASK_MAXLATENCY_MEMUP_CLR	REG_BIT(27)