drm/i915/cnl: Implement WaProgramMgsrForCorrectSliceSpecificMmioReads
Subsystems (2)
PATCH 1/3 drm/i915/cnl: Implement WaProgramMgsrForCorrectSliceSpecificMmioReads
WaProgramMgsrForCorrectSliceSpecificMmioReads dictate that before any MMIO read into Slice/Subslice specific registers, MCR packet control register(0xFDC) needs to be programmed to point to any enabled slice/subslice pair. Otherwise, incorrect value will be returned.
However, that means each subsequent MMIO read will be forwarded to a specific slice/subslice combination as read is unicast. This is OK since slice/subslice specific register values are consistent in almost all cases across slice/subslice. There are rare occasions such as INSTDONE that this value will be dependent on slice/subslice combo, in such cases, we need to program 0xFDC and recover this after. This is already covered by read_subslice_reg.
Also, 0xFDC will lose its information after TDR/engine reset/power state change.
References: HSD#1405586840, BSID#0575
v2:
- use fls() instead of find_last_bit() (Chris)
- added INTEL_SSEU to extract sseu from device info. (Chris)
v3:
- rebase on latest tip
v5:
- Added references (Mika)
- Change the ordered of passing arguments and etc. (Ursulin)
v7:
- Moved WA explanation Comments(Oscar)
- Rebased.
--- drivers/gpu/drm/i915/i915_drv.h | 2 ++ drivers/gpu/drm/i915/intel_engine_cs.c | 36 +++++++++++++++++++++++++++++--- drivers/gpu/drm/i915/intel_workarounds.c | 12 +++++++++++ 3 files changed, 47 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +2 -0
@@ -2743,6 +2743,8 @@ int vlv_force_gfx_clock(struct drm_i915_private *dev_priv, bool on);int intel_engines_init_mmio (struct drm_i915_private *dev_priv);int intel_engines_init (struct drm_i915_private *dev_priv); +u32 intel_sanitize_mcr (struct drm_i915_private *dev_priv,u32 mcr); +/* intel_hotplug.c */ void intel_hpd_irq_handler (struct drm_i915_private *dev_priv,u32 pin_mask,u32 long_mask);
drivers/gpu/drm/i915/intel_engine_cs.c +33 -3
@@ -780,6 +780,29 @@ const char *i915_cache_level_str(struct drm_i915_private *i915, int type) } } +u32 intel_sanitize_mcr (struct drm_i915_private *dev_priv,u32 mcr) +{ +const struct sseu_dev_info *sseu = &(INTEL_INFO (dev_priv)->sseu); +u32 slice =fls (sseu->slice_mask); +u32 subslice =fls (sseu->subslice_mask[slice]); + +/* +* WaProgramMgsrForCorrectSliceSpecificMmioReads:cnl +* Before any MMIO read into slice/subslice specific registers, MCR +* packet control register needs to be programmed to point to any +* enabled s/ss pair. Otherwise, incorrect values will be returned. +* This means each subsequent MMIO read will be forwarded to an +* specific s/ss combination, but this is OK since these registers +* are consistent across s/ss in almost all cases. In the rare +* occasions, such as INSTDONE, where this value is dependent +* on s/ss combo, the read should be done with read_subslice_reg. +*/ + mcr &= ~(GEN8_MCR_SLICE_MASK |GEN8_MCR_SUBSLICE_MASK ); + mcr |=GEN8_MCR_SLICE (slice) |GEN8_MCR_SUBSLICE (subslice); + +return mcr; +} +static inline uint32_t read_subslice_reg (struct drm_i915_private *dev_priv,int slice,int subslice,i915_reg_t reg)
@@ -812,18 +835,25 @@ read_subslice_reg(struct drm_i915_private *dev_priv, int slice,intel_uncore_forcewake_get__locked (dev_priv, fw_domains); mcr =I915_READ_FW (GEN8_MCR_SELECTOR ); +/* * The HW expects the slice and sublice selectors to be reset to 0 -* after reading out the registers. +* before GEN10 or to a enabled s/ss post GEN10 after reading out the +* registers. */ -WARN_ON_ONCE (mcr & mcr_slice_subslice_mask); +WARN_ON_ONCE (INTEL_GEN (dev_priv) <10 && + (mcr & mcr_slice_subslice_mask)); mcr &= ~mcr_slice_subslice_mask; mcr |= mcr_slice_subslice_select;I915_WRITE_FW (GEN8_MCR_SELECTOR , mcr); ret =I915_READ_FW (reg); - mcr &= ~mcr_slice_subslice_mask; +if (INTEL_GEN (dev_priv) <10 ) + mcr &= ~mcr_slice_subslice_mask; +else + mcr =intel_sanitize_mcr (dev_priv, mcr); +I915_WRITE_FW (GEN8_MCR_SELECTOR , mcr);intel_uncore_forcewake_put__locked (dev_priv, fw_domains);
drivers/gpu/drm/i915/intel_workarounds.c +12 -0
@@ -672,8 +672,20 @@ static void cfl_gt_workarounds_apply(struct drm_i915_private *dev_priv) GAMT_ECO_ENABLE_IN_PLACE_DECOMPRESS); } +static void wa_init_mcr (struct drm_i915_private *dev_priv) +{ +u32 mcr; + + mcr =I915_READ (GEN8_MCR_SELECTOR ); + mcr =intel_sanitize_mcr (dev_priv, mcr); +I915_WRITE (GEN8_MCR_SELECTOR , mcr); +} +static void cnl_gt_workarounds_apply (struct drm_i915_private *dev_priv) { +/* WaProgramMgsrForCorrectSliceSpecificMmioReads: cnl */ +wa_init_mcr (dev_priv); +/* WaDisableI2mCycleOnWRPort:cnl (pre-prod) */ if (IS_CNL_REVID (dev_priv,CNL_REVID_B0 ,CNL_REVID_B0 )) I915_WRITE(GAMT_CHKN_BIT_REG,
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/3 drm/i915/icl: Enable WaProgramMgsrForCorrectSliceSpecificMmioReads
WaProgramMgsrForCorrectSliceSpecificMmioReads applies for Icelake as well.
References: HSD#1405586840, BSID#0575
--- drivers/gpu/drm/i915/intel_engine_cs.c | 2 +- drivers/gpu/drm/i915/intel_workarounds.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_engine_cs.c +1 -1
@@ -787,7 +787,7 @@ u32 intel_sanitize_mcr(struct drm_i915_private *dev_priv, u32 mcr)u32 subslice =fls (sseu->subslice_mask[slice]);/* -* WaProgramMgsrForCorrectSliceSpecificMmioReads:cnl +* WaProgramMgsrForCorrectSliceSpecificMmioReads:cnl, icl * Before any MMIO read into slice/subslice specific registers, MCR * packet control register needs to be programmed to point to any * enabled s/ss pair. Otherwise, incorrect values will be returned.
drivers/gpu/drm/i915/intel_workarounds.c +3 -0
@@ -704,6 +704,9 @@ static void cnl_gt_workarounds_apply(struct drm_i915_private *dev_priv)static void icl_gt_workarounds_apply (struct drm_i915_private *dev_priv) { +/* WaProgramMgsrForCorrectSliceSpecificMmioReads: icl */ +wa_init_mcr (dev_priv); +/* This is not an Wa. Enable for better image quality */ I915_WRITE (_3D_CHICKEN3,_MASKED_BIT_ENABLE (_3D_CHICKEN3_AA_LINE_QUALITY_FIX_ENABLE));
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 2/3 drm/i915/icl: Enable WaProgramMgsrForCorrectSliceSpecificMmioReads
WaProgramMgsrForCorrectSliceSpecificMmioReads applies for Icelake as well.
References: HSD#1405586840, BSID#0575
--- drivers/gpu/drm/i915/intel_engine_cs.c | 2 +- drivers/gpu/drm/i915/intel_workarounds.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_engine_cs.c +1 -1
@@ -829,7 +829,7 @@ u32 intel_calculate_s_ss_select(struct drm_i915_private *dev_priv) mcr_s_ss_mask =GEN8_MCR_SLICE_MASK |GEN8_MCR_SUBSLICE_MASK ; -if (INTEL_GEN (dev_priv) ==10 ) +if (INTEL_GEN (dev_priv) >=10 ) mcr_s_ss_select =GEN8_MCR_SLICE (slice) |GEN8_MCR_SUBSLICE (subslice);else
drivers/gpu/drm/i915/intel_workarounds.c +4 -1
@@ -686,7 +686,7 @@ static void wa_init_mcr(struct drm_i915_private *dev_priv) mcr_slice_subslice_mask =GEN8_MCR_SLICE_MASK |GEN8_MCR_SUBSLICE_MASK ;/* -* WaProgramMgsrForCorrectSliceSpecificMmioReads:cnl +* WaProgramMgsrForCorrectSliceSpecificMmioReads:cnl,icl * Before any MMIO read into slice/subslice specific registers, MCR * packet control register needs to be programmed to point to any * enabled s/ss pair. Otherwise, incorrect values will be returned.
@@ -724,6 +724,9 @@ static void cnl_gt_workarounds_apply(struct drm_i915_private *dev_priv)static void icl_gt_workarounds_apply (struct drm_i915_private *dev_priv) { +/* WaProgramMgsrForCorrectSliceSpecificMmioReads: icl */ +wa_init_mcr (dev_priv); +/* This is not an Wa. Enable for better image quality */ I915_WRITE (_3D_CHICKEN3,_MASKED_BIT_ENABLE (_3D_CHICKEN3_AA_LINE_QUALITY_FIX_ENABLE));
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 2/3] drm/i915/icl: Enable WaProgramMgsrForCorrectSliceSpecificMmioReads
Quoted 22 lines · Yunwei Zhang
WaProgramMgsrForCorrectSliceSpecificMmioReads applies for Icelake as well.
References: HSD#1405586840, BSID#0575
Cc Oscar Mateo <[email protected]>Cc Michel Thierry <[email protected]>Cc Joonas Lahtinen <[email protected]>Cc Chris Wilson <[email protected]>Cc Mika Kuoppala <[email protected]>Cc Tvrtko Ursulin <[email protected]>Signed-off-by Yunwei Zhang <[email protected]>--- drivers/gpu/drm/i915/intel_engine_cs.c | 2 +- drivers/gpu/drm/i915/intel_workarounds.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/intel_engine_cs.c +0
-0
drivers/gpu/drm/i915/intel_engine_cs.c u32 intel_calculate_s_ss_select(struct drm_i915_private *dev_priv) · line 834
Quoted 7 lines
drivers/gpu/drm/i915/intel_engine_cs.c +1
-1@@ -829,7 +829,7 @@ u32 intel_calculate_s_ss_select(struct drm_i915_private *dev_priv) mcr_s_ss_mask =GEN8_MCR_SLICE_MASK |GEN8_MCR_SUBSLICE_MASK ; -if (INTEL_GEN (dev_priv) ==10 ) +if (INTEL_GEN (dev_priv) >=10 ) mcr_s_ss_select =GEN8_MCR_SLICE (slice) |GEN8_MCR_SUBSLICE (subslice);
Wait, shouldn't these be GEN11_MCR_SLICE() and GEN11_MCR_SUBSLICE() in the case of ICL?
Quoted 15 lines
drivers/gpu/drm/i915/intel_engine_cs.c +0
-0else drivers/gpu/drm/i915/intel_workarounds.c +1
-1@@ -686,7 +686,7 @@ static void wa_init_mcr(struct drm_i915_private *dev_priv) mcr_slice_subslice_mask =GEN8_MCR_SLICE_MASK |GEN8_MCR_SUBSLICE_MASK ;/* -* WaProgramMgsrForCorrectSliceSpecificMmioReads:cnl +* WaProgramMgsrForCorrectSliceSpecificMmioReads:cnl,icl * Before any MMIO read into slice/subslice specific registers, MCR * packet control register needs to be programmed to point to any * enabled s/ss pair. Otherwise, incorrect values will be returned.
drivers/gpu/drm/i915/intel_workarounds.c static void cnl_gt_workarounds_apply(struct drm_i915_private *dev_priv) · line 732
Quoted 9 lines
drivers/gpu/drm/i915/intel_workarounds.c +3
-0@@ -724,6 +724,9 @@ static void cnl_gt_workarounds_apply(struct drm_i915_private *dev_priv)static void icl_gt_workarounds_apply (struct drm_i915_private *dev_priv) { +/* WaProgramMgsrForCorrectSliceSpecificMmioReads: icl */ +wa_init_mcr (dev_priv); +/* This is not an Wa. Enable for better image quality */ I915_WRITE (_3D_CHICKEN3,_MASKED_BIT_ENABLE (_3D_CHICKEN3_AA_LINE_QUALITY_FIX_ENABLE));
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 2/3 drm/i915/icl: Enable WaProgramMgsrForCorrectSliceSpecificMmioReads
In reply to Yunwei ZhangWaProgramMgsrForCorrectSliceSpecificMmioReads applies for Icelake as well.
References: HSD#1405586840, BSID#0575
v2:
- GEN11 mask is different from its predecessors. (Oscar)
--- drivers/gpu/drm/i915/intel_engine_cs.c | 3 +++ drivers/gpu/drm/i915/intel_workarounds.c | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_engine_cs.c +3 -0
@@ -829,6 +829,9 @@ u32 intel_calculate_mcr_s_ss_select(struct drm_i915_private *dev_priv)if (INTEL_GEN (dev_priv) ==10 ) mcr_s_ss_select =GEN8_MCR_SLICE (slice) |GEN8_MCR_SUBSLICE (subslice); +else if (INTEL_GEN (dev_priv) >=11 ) + mcr_s_ss_select =GEN11_MCR_SLICE (slice) | +GEN11_MCR_SUBSLICE (subslice);else mcr_s_ss_select =0 ;
drivers/gpu/drm/i915/intel_workarounds.c +3 -1
@@ -686,7 +686,7 @@ static void wa_init_mcr(struct drm_i915_private *dev_priv) mcr_slice_subslice_mask =GEN8_MCR_SLICE_MASK |GEN8_MCR_SUBSLICE_MASK ;/* -* WaProgramMgsrForCorrectSliceSpecificMmioReads:cnl +* WaProgramMgsrForCorrectSliceSpecificMmioReads:cnl,icl * Before any MMIO read into slice/subslice specific registers, MCR * packet control register needs to be programmed to point to any * enabled s/ss pair. Otherwise, incorrect values will be returned.
@@ -723,6 +723,8 @@ static void cnl_gt_workarounds_apply(struct drm_i915_private *dev_priv)static void icl_gt_workarounds_apply (struct drm_i915_private *dev_priv) { +wa_init_mcr (dev_priv); +/* This is not an Wa. Enable for better image quality */ I915_WRITE (_3D_CHICKEN3,_MASKED_BIT_ENABLE (_3D_CHICKEN3_AA_LINE_QUALITY_FIX_ENABLE));
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 2/3 drm/i915/icl: Enable WaProgramMgsrForCorrectSliceSpecificMmioReads
WaProgramMgsrForCorrectSliceSpecificMmioReads applies for Icelake as well.
References: HSD#1405586840, BSID#0575
v2:
- GEN11 mask is different from its predecessors. (Oscar)
- Better separate GEN10 and GEN11. (Oscar)
--- drivers/gpu/drm/i915/intel_engine_cs.c | 3 +++ drivers/gpu/drm/i915/intel_workarounds.c | 12 +++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_engine_cs.c +3 -0
@@ -829,6 +829,9 @@ u32 intel_calculate_mcr_s_ss_select(struct drm_i915_private *dev_priv)if (INTEL_GEN (dev_priv) ==10 ) mcr_s_ss_select =GEN8_MCR_SLICE (slice) |GEN8_MCR_SUBSLICE (subslice); +else if (INTEL_GEN (dev_priv) >=11 ) + mcr_s_ss_select =GEN11_MCR_SLICE (slice) | +GEN11_MCR_SUBSLICE (subslice);else mcr_s_ss_select =0 ;
drivers/gpu/drm/i915/intel_workarounds.c +9 -3
@@ -679,10 +679,14 @@ static void wa_init_mcr(struct drm_i915_private *dev_priv) mcr =I915_READ (GEN8_MCR_SELECTOR ); - mcr_slice_subslice_mask =GEN8_MCR_SLICE_MASK | -GEN8_MCR_SUBSLICE_MASK ; +if (INTEL_GEN (dev_priv) >=11 ) + mcr_slice_subslice_mask =GEN11_MCR_SLICE_MASK | +GEN11_MCR_SUBSLICE_MASK ; +else + mcr_slice_subslice_mask =GEN8_MCR_SLICE_MASK | +GEN8_MCR_SUBSLICE_MASK ;/* -* WaProgramMgsrForCorrectSliceSpecificMmioReads:cnl +* WaProgramMgsrForCorrectSliceSpecificMmioReads:cnl,icl * Before any MMIO read into slice/subslice specific registers, MCR * packet control register needs to be programmed to point to any * enabled s/ss pair. Otherwise, incorrect values will be returned.
@@ -719,6 +723,8 @@ static void cnl_gt_workarounds_apply(struct drm_i915_private *dev_priv)static void icl_gt_workarounds_apply (struct drm_i915_private *dev_priv) { +wa_init_mcr (dev_priv); +/* This is not an Wa. Enable for better image quality */ I915_WRITE (_3D_CHICKEN3,_MASKED_BIT_ENABLE (_3D_CHICKEN3_AA_LINE_QUALITY_FIX_ENABLE));
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v4 2/3] drm/i915/icl: Enable WaProgramMgsrForCorrectSliceSpecificMmioReads
Quoted 9 lines · Yunwei Zhang
WaProgramMgsrForCorrectSliceSpecificMmioReads applies for Icelake as well.
References: HSD#1405586840, BSID#0575
v2:
- GEN11 mask is different from its predecessors. (Oscar)
- Better separate GEN10 and GEN11. (Oscar)
Quoted 7 lines
Cc Oscar Mateo <[email protected]>Cc Michel Thierry <[email protected]>Cc Joonas Lahtinen <[email protected]>Cc Chris Wilson <[email protected]>Cc Mika Kuoppala <[email protected]>Cc Tvrtko Ursulin <[email protected]>Signed-off-by Yunwei Zhang <[email protected]>
Quoted 42 lines
--- drivers/gpu/drm/i915/intel_engine_cs.c | 3 +++ drivers/gpu/drm/i915/intel_workarounds.c | 12 +++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-)drivers/gpu/drm/i915/intel_engine_cs.c +3
-0@@ -829,6 +829,9 @@ u32 intel_calculate_mcr_s_ss_select(struct drm_i915_private *dev_priv)if (INTEL_GEN (dev_priv) ==10 ) mcr_s_ss_select =GEN8_MCR_SLICE (slice) |GEN8_MCR_SUBSLICE (subslice); +else if (INTEL_GEN (dev_priv) >=11 ) + mcr_s_ss_select =GEN11_MCR_SLICE (slice) | +GEN11_MCR_SUBSLICE (subslice);else mcr_s_ss_select =0 ;drivers/gpu/drm/i915/intel_workarounds.c +7
-3@@ -679,10 +679,14 @@ static void wa_init_mcr(struct drm_i915_private *dev_priv) mcr =I915_READ (GEN8_MCR_SELECTOR ); - mcr_slice_subslice_mask =GEN8_MCR_SLICE_MASK | -GEN8_MCR_SUBSLICE_MASK ; +if (INTEL_GEN (dev_priv) >=11 ) + mcr_slice_subslice_mask =GEN11_MCR_SLICE_MASK | +GEN11_MCR_SUBSLICE_MASK ; +else + mcr_slice_subslice_mask =GEN8_MCR_SLICE_MASK | +GEN8_MCR_SUBSLICE_MASK ;/* -* WaProgramMgsrForCorrectSliceSpecificMmioReads:cnl +* WaProgramMgsrForCorrectSliceSpecificMmioReads:cnl,icl * Before any MMIO read into slice/subslice specific registers, MCR * packet control register needs to be programmed to point to any * enabled s/ss pair. Otherwise, incorrect values will be returned.
drivers/gpu/drm/i915/intel_workarounds.c static void cnl_gt_workarounds_apply(struct drm_i915_private *dev_priv) · line 730
Quoted 8 lines
drivers/gpu/drm/i915/intel_workarounds.c +2
-0@@ -719,6 +723,8 @@ static void cnl_gt_workarounds_apply(struct drm_i915_private *dev_priv)static void icl_gt_workarounds_apply (struct drm_i915_private *dev_priv) { +wa_init_mcr (dev_priv); +/* This is not an Wa. Enable for better image quality */ I915_WRITE (_3D_CHICKEN3,_MASKED_BIT_ENABLE (_3D_CHICKEN3_AA_LINE_QUALITY_FIX_ENABLE));
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/3 drm/i915: Implement WaProgramMgsrForL3BankSpecificMmioReads
In reply to Yunwei ZhangL3Bank could be fused off in hardware for debug purpose, and it is possible that subslice is enabled while its corresponding L3Bank pairs are disabled. In such case, if MCR packet control register(0xFDC) is programed to point to a disabled bank pair, a MMIO read into L3Bank range will return 0 instead of correct values.
However, this is not going to be the case in any production silicon. Therefore, we only check at initialization and issue a warning should this really happen.
References: HSDES#1405586840
v2:
- use fls instead of find_last_bit (Chris)
- use is_power_of_2() instead of counting bit set (Chris)
v3:
- rebase on latest tip
v5:
- Added references (Mika)
- Move local variable into scope where they are used (Ursulin)
- use a new local variable to reduce long line of code (Ursulin)
v6:
- Some coding style and use more local variables for clearer logic (Ursulin)
--- drivers/gpu/drm/i915/i915_reg.h | 4 ++++ drivers/gpu/drm/i915/intel_workarounds.c | 36 ++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +4 -0
@@ -2709,6 +2709,10 @@ enum i915_power_well_id {#define GEN10_F2_SS_DIS_SHIFT 18#define GEN10_F2_SS_DIS_MASK (0xf << GEN10_F2_SS_DIS_SHIFT) +#define GEN10_MIRROR_FUSE3 _MMIO(0x9118) +#define GEN10_L3BANK_PAIR_COUNT 4 +#define GEN10_L3BANK_MASK 0x0F +#define GEN8_EU_DISABLE0 _MMIO(0x9134)#define GEN8_EU_DIS0_S0_MASK 0xffffff#define GEN8_EU_DIS0_S1_SHIFT 24
drivers/gpu/drm/i915/intel_workarounds.c +36 -0
@@ -674,8 +674,44 @@ static void cfl_gt_workarounds_apply(struct drm_i915_private *dev_priv)static void wa_init_mcr (struct drm_i915_private *dev_priv) { +const struct sseu_dev_info *sseu = &(INTEL_INFO (dev_priv)->sseu);u32 mcr; +/* +* WaProgramMgsrForL3BankSpecificMmioReads: cnl,icl +* L3Banks could be fused off in single slice scenario. If that is +* the case, we might need to program MCR select to a valid L3Bank +* by default, to make sure we correctly read certain registers +* later on (in the range 0xB100 - 0xB3FF). +* This might be incompatible with +* WaProgramMgsrForCorrectSliceSpecificMmioReads. +* Fortunately, this should not happen in production hardware, so +* we only assert that this is the case (instead of implementing +* something more complex that requires checking the range of every +* MMIO read). +*/ +if (INTEL_GEN (dev_priv) >=10 && +is_power_of_2 (sseu->slice_mask)) { +/* +* read FUSE3 for enabled L3 Bank IDs, if L3 Bank matches +* enabled subslice, no need to redirect MCR packet +*/ +u32 slice =fls (sseu->slice_mask); +u32 fuse3 =I915_READ (GEN10_MIRROR_FUSE3 ); +u8 ss_mask = sseu->subslice_mask[slice]; + +u8 enabled_mask = (ss_mask | ss_mask >> +GEN10_L3BANK_PAIR_COUNT ) & +GEN10_L3BANK_MASK ; +u8 disabled_mask = fuse3 &GEN10_L3BANK_MASK ; + +/* +* Production silicon should have matched L3Bank and +* subslice enabled +*/ +WARN_ON ((enabled_mask & disabled_mask) != enabled_mask); + } + mcr =I915_READ (GEN8_MCR_SELECTOR ); mcr =intel_sanitize_mcr (dev_priv, mcr);I915_WRITE (GEN8_MCR_SELECTOR , mcr);
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 3/3 drm/i915: Implement WaProgramMgsrForL3BankSpecificMmioReads
L3Bank could be fused off in hardware for debug purpose, and it is possible that subslice is enabled while its corresponding L3Bank pairs are disabled. In such case, if MCR packet control register(0xFDC) is programed to point to a disabled bank pair, a MMIO read into L3Bank range will return 0 instead of correct values.
However, this is not going to be the case in any production silicon. Therefore, we only check at initialization and issue a warning should this really happen.
References: HSDES#1405586840
v2:
- use fls instead of find_last_bit (Chris)
- use is_power_of_2() instead of counting bit set (Chris)
v3:
- rebase on latest tip
v5:
- Added references (Mika)
- Move local variable into scope where they are used (Ursulin)
- use a new local variable to reduce long line of code (Ursulin)
v6:
- Some coding style and use more local variables for clearer logic (Ursulin)
--- drivers/gpu/drm/i915/i915_reg.h | 4 ++++ drivers/gpu/drm/i915/intel_workarounds.c | 36 ++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +4 -0
@@ -2709,6 +2709,10 @@ enum i915_power_well_id {#define GEN10_F2_SS_DIS_SHIFT 18#define GEN10_F2_SS_DIS_MASK (0xf << GEN10_F2_SS_DIS_SHIFT) +#define GEN10_MIRROR_FUSE3 _MMIO(0x9118) +#define GEN10_L3BANK_PAIR_COUNT 4 +#define GEN10_L3BANK_MASK 0x0F +#define GEN8_EU_DISABLE0 _MMIO(0x9134)#define GEN8_EU_DIS0_S0_MASK 0xffffff#define GEN8_EU_DIS0_S1_SHIFT 24
drivers/gpu/drm/i915/intel_workarounds.c +36 -0
@@ -674,9 +674,45 @@ static void cfl_gt_workarounds_apply(struct drm_i915_private *dev_priv)static void wa_init_mcr (struct drm_i915_private *dev_priv) { +const struct sseu_dev_info *sseu = &(INTEL_INFO (dev_priv)->sseu);u32 mcr;u32 mcr_slice_subslice_mask; +/* +* WaProgramMgsrForL3BankSpecificMmioReads: cnl,icl +* L3Banks could be fused off in single slice scenario. If that is +* the case, we might need to program MCR select to a valid L3Bank +* by default, to make sure we correctly read certain registers +* later on (in the range 0xB100 - 0xB3FF). +* This might be incompatible with +* WaProgramMgsrForCorrectSliceSpecificMmioReads. +* Fortunately, this should not happen in production hardware, so +* we only assert that this is the case (instead of implementing +* something more complex that requires checking the range of every +* MMIO read). +*/ +if (INTEL_GEN (dev_priv) >=10 && +is_power_of_2 (sseu->slice_mask)) { +/* +* read FUSE3 for enabled L3 Bank IDs, if L3 Bank matches +* enabled subslice, no need to redirect MCR packet +*/ +u32 slice =fls (sseu->slice_mask); +u32 fuse3 =I915_READ (GEN10_MIRROR_FUSE3 ); +u8 ss_mask = sseu->subslice_mask[slice]; + +u8 enabled_mask = (ss_mask | ss_mask >> +GEN10_L3BANK_PAIR_COUNT ) & +GEN10_L3BANK_MASK ; +u8 disabled_mask = fuse3 &GEN10_L3BANK_MASK ; + +/* +* Production silicon should have matched L3Bank and +* subslice enabled +*/ +WARN_ON ((enabled_mask & disabled_mask) != enabled_mask); + } + mcr =I915_READ (GEN8_MCR_SELECTOR );if (INTEL_GEN (dev_priv) >=11 )
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 3/3 drm/i915: Implement WaProgramMgsrForL3BankSpecificMmioReads
L3Bank could be fused off in hardware for debug purpose, and it is possible that subslice is enabled while its corresponding L3Bank pairs are disabled. In such case, if MCR packet control register(0xFDC) is programed to point to a disabled bank pair, a MMIO read into L3Bank range will return 0 instead of correct values.
However, this is not going to be the case in any production silicon. Therefore, we only check at initialization and issue a warning should this really happen.
References: HSDES#1405586840
v2:
- use fls instead of find_last_bit (Chris)
- use is_power_of_2() instead of counting bit set (Chris)
v3:
- rebase on latest tip
v5:
- Added references (Mika)
- Move local variable into scope where they are used (Ursulin)
- use a new local variable to reduce long line of code (Ursulin)
v6:
- Some coding style and use more local variables for clearer logic (Ursulin)
--- drivers/gpu/drm/i915/i915_reg.h | 4 ++++ drivers/gpu/drm/i915/intel_workarounds.c | 35 ++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +4 -0
@@ -2709,6 +2709,10 @@ enum i915_power_well_id {#define GEN10_F2_SS_DIS_SHIFT 18#define GEN10_F2_SS_DIS_MASK (0xf << GEN10_F2_SS_DIS_SHIFT) +#define GEN10_MIRROR_FUSE3 _MMIO(0x9118) +#define GEN10_L3BANK_PAIR_COUNT 4 +#define GEN10_L3BANK_MASK 0x0F +#define GEN8_EU_DISABLE0 _MMIO(0x9134)#define GEN8_EU_DIS0_S0_MASK 0xffffff#define GEN8_EU_DIS0_S1_SHIFT 24
drivers/gpu/drm/i915/intel_workarounds.c +35 -0
@@ -674,9 +674,44 @@ static void cfl_gt_workarounds_apply(struct drm_i915_private *dev_priv)static void wa_init_mcr (struct drm_i915_private *dev_priv) { +const struct sseu_dev_info *sseu = &(INTEL_INFO (dev_priv)->sseu);u32 mcr;u32 mcr_slice_subslice_mask; +/* +* WaProgramMgsrForL3BankSpecificMmioReads: cnl,icl +* L3Banks could be fused off in single slice scenario. If that is +* the case, we might need to program MCR select to a valid L3Bank +* by default, to make sure we correctly read certain registers +* later on (in the range 0xB100 - 0xB3FF). +* This might be incompatible with +* WaProgramMgsrForCorrectSliceSpecificMmioReads. +* Fortunately, this should not happen in production hardware, so +* we only assert that this is the case (instead of implementing +* something more complex that requires checking the range of every +* MMIO read). +*/ +if (INTEL_GEN (dev_priv) >=10 && +is_power_of_2 (sseu->slice_mask)) { +/* +* read FUSE3 for enabled L3 Bank IDs, if L3 Bank matches +* enabled subslice, no need to redirect MCR packet +*/ +u32 slice =fls (sseu->slice_mask); +u32 fuse3 =I915_READ (GEN10_MIRROR_FUSE3 ); +u8 ss_mask = sseu->subslice_mask[slice]; + +u8 enabled_mask = (ss_mask | ss_mask >> +GEN10_L3BANK_PAIR_COUNT ) &GEN10_L3BANK_MASK ; +u8 disabled_mask = fuse3 &GEN10_L3BANK_MASK ; + +/* +* Production silicon should have matched L3Bank and +* subslice enabled +*/ +WARN_ON ((enabled_mask & disabled_mask) != enabled_mask); + } + mcr =I915_READ (GEN8_MCR_SELECTOR );if (INTEL_GEN (dev_priv) >=11 )
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 3/3] drm/i915: Implement WaProgramMgsrForL3BankSpecificMmioReads
Quoted 25 lines · Yunwei Zhang
L3Bank could be fused off in hardware for debug purpose, and it is possible that subslice is enabled while its corresponding L3Bank pairs are disabled. In such case, if MCR packet control register(0xFDC) is programed to point to a disabled bank pair, a MMIO read into L3Bank range will return 0 instead of correct values.
However, this is not going to be the case in any production silicon. Therefore, we only check at initialization and issue a warning should this really happen.
References: HSDES#1405586840
v2:
- use fls instead offind_last_bit(Chris)
- useis_power_of_2()instead of counting bit set (Chris)
v3:
- rebase on latest tip
v5:
- Added references (Mika)
- Move local variable into scope where they are used (Ursulin)
- use a new local variable to reduce long line of code (Ursulin)
v6:
- Some coding style and use more local variables for clearer logic (Ursulin)
Quoted 7 lines
Cc Oscar Mateo <[email protected]>Cc Michel Thierry <[email protected]>Cc Joonas Lahtinen <[email protected]>Cc Chris Wilson <[email protected]>Cc Mika Kuoppala <[email protected]>Cc Tvrtko Ursulin <[email protected]>Signed-off-by Yunwei Zhang <[email protected]>
Quoted 59 lines
--- drivers/gpu/drm/i915/i915_reg.h | 4 ++++ drivers/gpu/drm/i915/intel_workarounds.c | 35 ++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+)drivers/gpu/drm/i915/i915_reg.h +4
-0@@ -2709,6 +2709,10 @@ enum i915_power_well_id {#define GEN10_F2_SS_DIS_SHIFT 18#define GEN10_F2_SS_DIS_MASK (0xf << GEN10_F2_SS_DIS_SHIFT) +#define GEN10_MIRROR_FUSE3 _MMIO(0x9118) +#define GEN10_L3BANK_PAIR_COUNT 4 +#define GEN10_L3BANK_MASK 0x0F +#define GEN8_EU_DISABLE0 _MMIO(0x9134)#define GEN8_EU_DIS0_S0_MASK 0xffffff#define GEN8_EU_DIS0_S1_SHIFT 24drivers/gpu/drm/i915/intel_workarounds.c +28
-0@@ -674,9 +674,44 @@ static void cfl_gt_workarounds_apply(struct drm_i915_private *dev_priv)static void wa_init_mcr (struct drm_i915_private *dev_priv) { +const struct sseu_dev_info *sseu = &(INTEL_INFO (dev_priv)->sseu);u32 mcr;u32 mcr_slice_subslice_mask; +/* +* WaProgramMgsrForL3BankSpecificMmioReads: cnl,icl +* L3Banks could be fused off in single slice scenario. If that is +* the case, we might need to program MCR select to a valid L3Bank +* by default, to make sure we correctly read certain registers +* later on (in the range 0xB100 - 0xB3FF). +* This might be incompatible with +* WaProgramMgsrForCorrectSliceSpecificMmioReads. +* Fortunately, this should not happen in production hardware, so +* we only assert that this is the case (instead of implementing +* something more complex that requires checking the range of every +* MMIO read). +*/ +if (INTEL_GEN (dev_priv) >=10 && +is_power_of_2 (sseu->slice_mask)) { +/* +* read FUSE3 for enabled L3 Bank IDs, if L3 Bank matches +* enabled subslice, no need to redirect MCR packet +*/ +u32 slice =fls (sseu->slice_mask); +u32 fuse3 =I915_READ (GEN10_MIRROR_FUSE3 ); +u8 ss_mask = sseu->subslice_mask[slice]; + +u8 enabled_mask = (ss_mask | ss_mask >> +GEN10_L3BANK_PAIR_COUNT ) &GEN10_L3BANK_MASK ; +u8 disabled_mask = fuse3 &GEN10_L3BANK_MASK ; +
drivers/gpu/drm/i915/intel_workarounds.c static void cfl_gt_workarounds_apply(struct drm_i915_private *dev_priv) · line 717
Quoted 10 lines
drivers/gpu/drm/i915/intel_workarounds.c +7
-0+/* +* Production silicon should have matched L3Bank and +* subslice enabled +*/ +WARN_ON ((enabled_mask & disabled_mask) != enabled_mask); + } + mcr =I915_READ (GEN8_MCR_SELECTOR );if (INTEL_GEN (dev_priv) >=11 )
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 3/3] drm/i915: Implement WaProgramMgsrForL3BankSpecificMmioReads
Quoted 34 lines · Oscar Mateo Lozano
Quoted 25 lines · Yunwei Zhang
L3Bank could be fused off in hardware for debug purpose, and it is possible that subslice is enabled while its corresponding L3Bank pairs are disabled. In such case, if MCR packet control register(0xFDC) is programed to point to a disabled bank pair, a MMIO read into L3Bank range will return 0 instead of correct values.
However, this is not going to be the case in any production silicon. Therefore, we only check at initialization and issue a warning should this really happen.
References: HSDES#1405586840
v2:
- use fls instead offind_last_bit(Chris)
- useis_power_of_2()instead of counting bit set (Chris)
v3:
- rebase on latest tip
v5:
- Added references (Mika)
- Move local variable into scope where they are used (Ursulin)
- use a new local variable to reduce long line of code (Ursulin)
v6:
- Some coding style and use more local variables for clearer logic (Ursulin)Quoted 7 lines
Cc Oscar Mateo <[email protected]>Cc Michel Thierry <[email protected]>Cc Joonas Lahtinen <[email protected]>Cc Chris Wilson <[email protected]>Cc Mika Kuoppala <[email protected]>Cc Tvrtko Ursulin <[email protected]>Signed-off-by Yunwei Zhang <[email protected]>
Quoted 1 line
Reviewed-by Oscar Mateo <[email protected]>
1-3 Pushed.
Thanks for patches and review.
-Mika
Quoted 69 lines
Quoted 69 lines
--- drivers/gpu/drm/i915/i915_reg.h | 4 ++++ drivers/gpu/drm/i915/intel_workarounds.c | 35 ++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+)drivers/gpu/drm/i915/i915_reg.h +4
-0@@ -2709,6 +2709,10 @@ enum i915_power_well_id {#define GEN10_F2_SS_DIS_SHIFT 18#define GEN10_F2_SS_DIS_MASK (0xf << GEN10_F2_SS_DIS_SHIFT) +#define GEN10_MIRROR_FUSE3 _MMIO(0x9118) +#define GEN10_L3BANK_PAIR_COUNT 4 +#define GEN10_L3BANK_MASK 0x0F +#define GEN8_EU_DISABLE0 _MMIO(0x9134)#define GEN8_EU_DIS0_S0_MASK 0xffffff#define GEN8_EU_DIS0_S1_SHIFT 24drivers/gpu/drm/i915/intel_workarounds.c +35
-0@@ -674,9 +674,44 @@ static void cfl_gt_workarounds_apply(struct drm_i915_private *dev_priv)static void wa_init_mcr (struct drm_i915_private *dev_priv) { +const struct sseu_dev_info *sseu = &(INTEL_INFO (dev_priv)->sseu);u32 mcr;u32 mcr_slice_subslice_mask; +/* +* WaProgramMgsrForL3BankSpecificMmioReads: cnl,icl +* L3Banks could be fused off in single slice scenario. If that is +* the case, we might need to program MCR select to a valid L3Bank +* by default, to make sure we correctly read certain registers +* later on (in the range 0xB100 - 0xB3FF). +* This might be incompatible with +* WaProgramMgsrForCorrectSliceSpecificMmioReads. +* Fortunately, this should not happen in production hardware, so +* we only assert that this is the case (instead of implementing +* something more complex that requires checking the range of every +* MMIO read). +*/ +if (INTEL_GEN (dev_priv) >=10 && +is_power_of_2 (sseu->slice_mask)) { +/* +* read FUSE3 for enabled L3 Bank IDs, if L3 Bank matches +* enabled subslice, no need to redirect MCR packet +*/ +u32 slice =fls (sseu->slice_mask); +u32 fuse3 =I915_READ (GEN10_MIRROR_FUSE3 ); +u8 ss_mask = sseu->subslice_mask[slice]; + +u8 enabled_mask = (ss_mask | ss_mask >> +GEN10_L3BANK_PAIR_COUNT ) &GEN10_L3BANK_MASK ; +u8 disabled_mask = fuse3 &GEN10_L3BANK_MASK ; + +/* +* Production silicon should have matched L3Bank and +* subslice enabled +*/ +WARN_ON ((enabled_mask & disabled_mask) != enabled_mask); + } + mcr =I915_READ (GEN8_MCR_SELECTOR );
Quoted 1 line
drivers/gpu/drm/i915/intel_workarounds.c static void cfl_gt_workarounds_apply(struct drm_i915_private *dev_priv) · line 717
Quoted 1 line
drivers/gpu/drm/i915/intel_workarounds.c +0
-0if (INTEL_GEN (dev_priv) >=11 )
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.SPARSE: warning for series starting with [1/3] drm/i915/cnl: Implement WaProgramMgsrForCorrectSliceSpecificMmioReads
In reply to Yunwei Zhang== Series Details ==
== Series Details ==
Series: series starting with [1/3] drm/i915/cnl: Implement WaProgramMgsrForCorrectSliceSpecificMmioReads
URL : https://patchwork.freedesktop.org/series/43159/
State : warning
== Summary ==
$ dim sparse origin/drm-tip Commit: drm/i915/cnl: Implement WaProgramMgsrForCorrectSliceSpecificMmioReads -drivers/gpu/drm/i915/selftests/../i915_drv.h:3663:16: warning: expression using sizeof(void) +drivers/gpu/drm/i915/selftests/../i915_drv.h:3665:16: warning: expression using sizeof(void)
Commit: drm/i915/icl: Enable WaProgramMgsrForCorrectSliceSpecificMmioReads Okay!
Commit: drm/i915: Implement WaProgramMgsrForL3BankSpecificMmioReads Okay!
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for series starting with [1/3] drm/i915/cnl: Implement WaProgramMgsrForCorrectSliceSpecificMmioReads
In reply to Yunwei Zhang== Series Details ==
== Series Details ==
Series: series starting with [1/3] drm/i915/cnl: Implement WaProgramMgsrForCorrectSliceSpecificMmioReads
URL : https://patchwork.freedesktop.org/series/43159/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4179 -> Patchwork_9001 =
== Summary - SUCCESS ==
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/43159/revisions/1/mbox/
== Known issues ==
Here are the changes found in Patchwork_9001 that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b:
fi-snb-2520m: NOTRUN -> INCOMPLETE (fdo#103713)
fi-cnl-y3: PASS -> DMESG-FAIL (fdo#103191, fdo#104724)
==== Possible fixes ====
igt@debugfs_test@read_all_entries:
fi-snb-2520m: INCOMPLETE (fdo#103713) -> PASS
igt@gem_exec_suspend@basic-s4-devices:
fi-kbl-7500u: DMESG-WARN (fdo#105128) -> PASS
igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b:
fi-snb-2600: DMESG-WARN (fdo#102365) -> PASS
igt@kms_pipe_crc_basic@suspend-read-crc-pipe-c:
fi-bxt-dsi: INCOMPLETE (fdo#103927) -> PASS fdo#102365 https://bugs.freedesktop.org/show_bug.cgi?id=102365
fdo#103191 https://bugs.freedesktop.org/show_bug.cgi?id=103191
fdo#103713 https://bugs.freedesktop.org/show_bug.cgi?id=103713
fdo#103927 https://bugs.freedesktop.org/show_bug.cgi?id=103927
fdo#104724 https://bugs.freedesktop.org/show_bug.cgi?id=104724
fdo#105128 https://bugs.freedesktop.org/show_bug.cgi?id=105128
== Participating hosts (41 -> 37) ==
Additional (1): fi-byt-j1900
Missing (5): fi-ctg-p8600 fi-ilk-m540 fi-byt-squawks fi-bsw-cyan fi-skl-6700hq
== Build changes ==
* Linux: CI_DRM_4179 -> Patchwork_9001
CI_DRM_4179: be6d36ea8d6130f54ab5ec816555f1a46bd95f7b @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4479: 89ae332745e31a075747a63ac5acc5baccf75769 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9001: 36c0725cccb5bba56b2711ff3ea0aed7db923ea7 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4479: 3ba0657bff4216d1ec7179935590261855f1651e @ git://anongit.freedesktop.org/piglit
== Linux commits ==
36c0725cccb5 drm/i915: Implement WaProgramMgsrForL3BankSpecificMmioReads b8b5429666ee drm/i915/icl: Enable WaProgramMgsrForCorrectSliceSpecificMmioReads 835ba67a64e6 drm/i915/cnl: Implement WaProgramMgsrForCorrectSliceSpecificMmioReads
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9001/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.IGT: failure for series starting with [1/3] drm/i915/cnl: Implement WaProgramMgsrForCorrectSliceSpecificMmioReads
In reply to Yunwei Zhang== Series Details ==
== Series Details ==
Series: series starting with [1/3] drm/i915/cnl: Implement WaProgramMgsrForCorrectSliceSpecificMmioReads
URL : https://patchwork.freedesktop.org/series/43159/
State : failure
== Summary ==
= CI Bug Log - changes from CI_DRM_4179_full -> Patchwork_9001_full =
== Summary - FAILURE ==
Serious unknown changes coming with Patchwork_9001_full absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_9001_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://patchwork.freedesktop.org/api/1.0/series/43159/revisions/1/mbox/
== Possible new issues ==
Here are the unknown changes that may have been introduced in Patchwork_9001_full:
=== IGT changes ===
==== Possible regressions ====
igt@gem_eio@in-flight-1us:
shard-apl: PASS -> DMESG-WARN +1
igt@gem_eio@unwedge-stress:
shard-glk: PASS -> DMESG-WARN +2
shard-snb: PASS -> DMESG-WARN
shard-hsw: PASS -> DMESG-WARN
igt@pm_rpm@gem-execbuf-stress-extra-wait:
shard-glk: PASS -> FAIL +2
igt@pm_rpm@modeset-lpsp:
shard-glk: SKIP -> FAIL
==== Warnings ====
igt@gem_mocs_settings@mocs-rc6-dirty-render:
shard-kbl: SKIP -> PASS +1
igt@gem_mocs_settings@mocs-rc6-vebox:
shard-kbl: PASS -> SKIP +3
igt@perf_pmu@rc6-runtime-pm:
shard-glk: PASS -> SKIP== Known issues ==
Here are the changes found in Patchwork_9001_full that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@gem_ppgtt@blt-vs-render-ctxn:
shard-kbl: PASS -> INCOMPLETE (fdo#106023, fdo#103665)
igt@kms_cursor_legacy@2x-long-cursor-vs-flip-legacy:
shard-hsw: PASS -> FAIL (fdo#105767)
igt@kms_flip@2x-wf_vblank-ts-check:
shard-hsw: PASS -> FAIL (fdo#100368)
igt@kms_flip@flip-vs-absolute-wf_vblank-interruptible:
shard-hsw: PASS -> FAIL (fdo#103928)
igt@kms_flip@plain-flip-fb-recreate-interruptible:
shard-glk: PASS -> FAIL (fdo#100368)
igt@kms_flip_tiling@flip-to-x-tiled:
shard-glk: PASS -> FAIL (fdo#103822, fdo#104724)
igt@kms_flip_tiling@flip-to-y-tiled:
shard-glk: PASS -> FAIL (fdo#104724)
igt@kms_setmode@basic:
shard-kbl: PASS -> FAIL (fdo#99912)
igt@pm_rpm@universal-planes:
shard-kbl: PASS -> DMESG-WARN (fdo#105602, fdo#103558)
==== Possible fixes ====
igt@gem_eio@execbuf:
shard-glk: DMESG-WARN -> PASS +2
igt@gem_eio@in-flight-immediate:
shard-snb: DMESG-WARN -> PASS
shard-hsw: DMESG-WARN -> PASS +1
igt@gem_eio@wait-wedge-10ms:
shard-apl: DMESG-WARN -> PASS +2
igt@kms_cursor_legacy@flip-vs-cursor-legacy:
shard-hsw: FAIL (fdo#102670) -> PASS
igt@kms_flip@2x-flip-vs-expired-vblank:
shard-glk: FAIL (fdo#105363) -> PASS
igt@kms_plane_multiple@atomic-pipe-a-tiling-x:
shard-snb: FAIL (fdo#103166, fdo#104724) -> PASS
igt@kms_rotation_crc@primary-rotation-180:
shard-snb: FAIL (fdo#103925, fdo#104724) -> PASS
igt@perf@polling:
shard-hsw: FAIL (fdo#102252) -> PASS
igt@pm_rpm@dpms-mode-unset-non-lpsp:
shard-glk: FAIL -> PASS +2 fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#102252 https://bugs.freedesktop.org/show_bug.cgi?id=102252
fdo#102670 https://bugs.freedesktop.org/show_bug.cgi?id=102670
fdo#103166 https://bugs.freedesktop.org/show_bug.cgi?id=103166
fdo#103558 https://bugs.freedesktop.org/show_bug.cgi?id=103558
fdo#103665 https://bugs.freedesktop.org/show_bug.cgi?id=103665
fdo#103822 https://bugs.freedesktop.org/show_bug.cgi?id=103822
fdo#103925 https://bugs.freedesktop.org/show_bug.cgi?id=103925
fdo#103928 https://bugs.freedesktop.org/show_bug.cgi?id=103928
fdo#104724 https://bugs.freedesktop.org/show_bug.cgi?id=104724
fdo#105363 https://bugs.freedesktop.org/show_bug.cgi?id=105363
fdo#105602 https://bugs.freedesktop.org/show_bug.cgi?id=105602
fdo#105767 https://bugs.freedesktop.org/show_bug.cgi?id=105767
fdo#106023 https://bugs.freedesktop.org/show_bug.cgi?id=106023
fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912
== Participating hosts (5 -> 5) ==
No changes in participating hosts
== Build changes ==
* Linux: CI_DRM_4179 -> Patchwork_9001
CI_DRM_4179: be6d36ea8d6130f54ab5ec816555f1a46bd95f7b @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4479: 89ae332745e31a075747a63ac5acc5baccf75769 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9001: 36c0725cccb5bba56b2711ff3ea0aed7db923ea7 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4479: 3ba0657bff4216d1ec7179935590261855f1651e @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9001/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 1/3 drm/i915/cnl: Implement WaProgramMgsrForCorrectSliceSpecificMmioReads
In reply to Yunwei ZhangWaProgramMgsrForCorrectSliceSpecificMmioReads dictate that before any MMIO read into Slice/Subslice specific registers, MCR packet control register(0xFDC) needs to be programmed to point to any enabled slice/subslice pair. Otherwise, incorrect value will be returned.
However, that means each subsequent MMIO read will be forwarded to a specific slice/subslice combination as read is unicast. This is OK since slice/subslice specific register values are consistent in almost all cases across slice/subslice. There are rare occasions such as INSTDONE that this value will be dependent on slice/subslice combo, in such cases, we need to program 0xFDC and recover this after. This is already covered by read_subslice_reg.
Also, 0xFDC will lose its information after TDR/engine reset/power state change.
References: HSD#1405586840, BSID#0575
v2:
- use fls() instead of find_last_bit() (Chris)
- added INTEL_SSEU to extract sseu from device info. (Chris)
v3:
- rebase on latest tip
v5:
- Added references (Mika)
- Change the ordered of passing arguments and etc. (Ursulin)
v7:
- Moved WA explanation Comments(Oscar)
- Rebased.
v8:
- Renamed sanitize_mcr to calculate_s_ss_select. (Oscar)
- calculate s/ss selector instead of whole mcr. (Oscar)
--- drivers/gpu/drm/i915/i915_drv.h | 2 ++ drivers/gpu/drm/i915/intel_engine_cs.c | 33 +++++++++++++++++++++++++++----- drivers/gpu/drm/i915/intel_workarounds.c | 32 +++++++++++++++++++++++++++++++ 3 files changed, 62 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +2 -0
@@ -2744,6 +2744,8 @@ int vlv_force_gfx_clock(struct drm_i915_private *dev_priv, bool on);int intel_engines_init_mmio (struct drm_i915_private *dev_priv);int intel_engines_init (struct drm_i915_private *dev_priv); +u32 intel_calculate_s_ss_select (struct drm_i915_private *dev_priv); +/* intel_hotplug.c */ void intel_hpd_irq_handler (struct drm_i915_private *dev_priv,u32 pin_mask,u32 long_mask);
drivers/gpu/drm/i915/intel_engine_cs.c +28 -5
@@ -819,12 +819,32 @@ const char *i915_cache_level_str(struct drm_i915_private *i915, int type) } } +u32 intel_calculate_s_ss_select (struct drm_i915_private *dev_priv) +{ +const struct sseu_dev_info *sseu = &(INTEL_INFO (dev_priv)->sseu); +u32 mcr_s_ss_mask; +u32 mcr_s_ss_select; +u32 slice =fls (sseu->slice_mask); +u32 subslice =fls (sseu->subslice_mask[slice]); + + mcr_s_ss_mask =GEN8_MCR_SLICE_MASK |GEN8_MCR_SUBSLICE_MASK ; + +if (INTEL_GEN (dev_priv) ==10 ) + mcr_s_ss_select =GEN8_MCR_SLICE (slice) | +GEN8_MCR_SUBSLICE (subslice); +else + mcr_s_ss_select =0 ; + +return mcr_s_ss_select; +} +static inline uint32_t read_subslice_reg (struct drm_i915_private *dev_priv,int slice,int subslice,i915_reg_t reg) {uint32_t mcr_slice_subslice_mask;uint32_t mcr_slice_subslice_select; +uint32_t default_mcr_s_ss_select;uint32_t mcr;uint32_t ret;enum forcewake_domains fw_domains;
@@ -841,6 +861,8 @@ read_subslice_reg(struct drm_i915_private *dev_priv, int slice,GEN8_MCR_SUBSLICE (subslice); } + default_mcr_s_ss_select =intel_calculate_s_ss_select (dev_priv); + fw_domains =intel_uncore_forcewake_for_reg (dev_priv, reg,FW_REG_READ ); fw_domains |= intel_uncore_forcewake_for_reg(dev_priv,
@@ -851,11 +873,10 @@ read_subslice_reg(struct drm_i915_private *dev_priv, int slice,intel_uncore_forcewake_get__locked (dev_priv, fw_domains); mcr =I915_READ_FW (GEN8_MCR_SELECTOR ); -/* -* The HW expects the slice and sublice selectors to be reset to 0 -* after reading out the registers. -*/ -WARN_ON_ONCE (mcr & mcr_slice_subslice_mask); + +WARN_ON_ONCE ((mcr & mcr_slice_subslice_mask) != + default_mcr_s_ss_select); + mcr &= ~mcr_slice_subslice_mask; mcr |= mcr_slice_subslice_select;I915_WRITE_FW (GEN8_MCR_SELECTOR , mcr);
@@ -863,6 +884,8 @@ read_subslice_reg(struct drm_i915_private *dev_priv, int slice, ret =I915_READ_FW (reg); mcr &= ~mcr_slice_subslice_mask; + mcr |= default_mcr_s_ss_select; +I915_WRITE_FW (GEN8_MCR_SELECTOR , mcr);intel_uncore_forcewake_put__locked (dev_priv, fw_domains);
drivers/gpu/drm/i915/intel_workarounds.c +32 -0
@@ -672,8 +672,40 @@ static void cfl_gt_workarounds_apply(struct drm_i915_private *dev_priv) GAMT_ECO_ENABLE_IN_PLACE_DECOMPRESS); } +static void wa_init_mcr (struct drm_i915_private *dev_priv) +{ +u32 mcr; +u32 mcr_slice_subslice_mask; + + mcr =I915_READ (GEN8_MCR_SELECTOR ); + +if (INTEL_GEN (dev_priv) >=11 ) + mcr_slice_subslice_mask =GEN11_MCR_SLICE_MASK | +GEN11_MCR_SUBSLICE_MASK ; +else + mcr_slice_subslice_mask =GEN8_MCR_SLICE_MASK | +GEN8_MCR_SUBSLICE_MASK ; +/* +* WaProgramMgsrForCorrectSliceSpecificMmioReads:cnl +* Before any MMIO read into slice/subslice specific registers, MCR +* packet control register needs to be programmed to point to any +* enabled s/ss pair. Otherwise, incorrect values will be returned. +* This means each subsequent MMIO read will be forwarded to an +* specific s/ss combination, but this is OK since these registers +* are consistent across s/ss in almost all cases. In the rare +* occasions, such as INSTDONE, where this value is dependent +* on s/ss combo, the read should be done with read_subslice_reg. +*/ + mcr &= ~mcr_slice_subslice_mask; + mcr |=intel_calculate_s_ss_select (dev_priv); +I915_WRITE (GEN8_MCR_SELECTOR , mcr); +} +static void cnl_gt_workarounds_apply (struct drm_i915_private *dev_priv) { +/* WaProgramMgsrForCorrectSliceSpecificMmioReads: cnl */ +wa_init_mcr (dev_priv); +/* WaDisableI2mCycleOnWRPort:cnl (pre-prod) */ if (IS_CNL_REVID (dev_priv,CNL_REVID_B0 ,CNL_REVID_B0 )) I915_WRITE(GAMT_CHKN_BIT_REG,
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 51 lines · Yunwei Zhang
WaProgramMgsrForCorrectSliceSpecificMmioReads dictate that before any MMIO read into Slice/Subslice specific registers, MCR packet control register(0xFDC) needs to be programmed to point to any enabled slice/subslice pair. Otherwise, incorrect value will be returned.
However, that means each subsequent MMIO read will be forwarded to a specific slice/subslice combination as read is unicast. This is OK since slice/subslice specific register values are consistent in almost all cases across slice/subslice. There are rare occasions such as INSTDONE that this value will be dependent on slice/subslice combo, in such cases, we need to program
0xFDCand recover this after. This is already covered byread_subslice_reg.Also,
0xFDCwill lose its information after TDR/engine reset/power state change.References: HSD#1405586840, BSID#0575
v2:
- usefls()instead offind_last_bit()(Chris)
- addedINTEL_SSEUto extract sseu from device info. (Chris)
v3:
- rebase on latest tip
v5:
- Added references (Mika)
- Change the ordered of passing arguments and etc. (Ursulin)
v7:
- Moved WA explanation Comments(Oscar)
- Rebased.
v8:
- Renamedsanitize_mcrtocalculate_s_ss_select. (Oscar)
- calculate s/ss selector instead of whole mcr. (Oscar)Cc Oscar Mateo <[email protected]>Cc Michel Thierry <[email protected]>Cc Joonas Lahtinen <[email protected]>Cc Chris Wilson <[email protected]>Cc Mika Kuoppala <[email protected]>Cc Tvrtko Ursulin <[email protected]>Signed-off-by Yunwei Zhang <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 2 ++ drivers/gpu/drm/i915/intel_engine_cs.c | 33 +++++++++++++++++++++++++++----- drivers/gpu/drm/i915/intel_workarounds.c | 32 +++++++++++++++++++++++++++++++ 3 files changed, 62 insertions(+), 5 deletions(-)drivers/gpu/drm/i915/i915_drv.h +0
-0
drivers/gpu/drm/i915/i915_drv.h int vlv_force_gfx_clock(struct drm_i915_private *dev_priv, bool on); · line 2748
Quoted 5 lines
drivers/gpu/drm/i915/i915_drv.h +2
-0@@ -2744,6 +2744,8 @@ int vlv_force_gfx_clock(struct drm_i915_private *dev_priv, bool on);int intel_engines_init_mmio (struct drm_i915_private *dev_priv);int intel_engines_init (struct drm_i915_private *dev_priv); +u32 intel_calculate_s_ss_select (struct drm_i915_private *dev_priv); +
Maybe intel_calculate_mcr_s_ss_select is beter?
Quoted 10 lines
drivers/gpu/drm/i915/i915_drv.h +0
-0/* intel_hotplug.c */ void intel_hpd_irq_handler (struct drm_i915_private *dev_priv,u32 pin_mask,u32 long_mask);drivers/gpu/drm/i915/intel_engine_cs.c +0
-0@@ -819,12 +819,32 @@ const char *i915_cache_level_str(struct drm_i915_private *i915, int type) } }
drivers/gpu/drm/i915/intel_engine_cs.c const char *i915_cache_level_str(struct drm_i915_private *i915, int type) · line 830
Quoted 10 lines
drivers/gpu/drm/i915/intel_engine_cs.c +9
-0+u32 intel_calculate_s_ss_select (struct drm_i915_private *dev_priv) +{ +const struct sseu_dev_info *sseu = &(INTEL_INFO (dev_priv)->sseu); +u32 mcr_s_ss_mask; +u32 mcr_s_ss_select; +u32 slice =fls (sseu->slice_mask); +u32 subslice =fls (sseu->subslice_mask[slice]); + + mcr_s_ss_mask =GEN8_MCR_SLICE_MASK |GEN8_MCR_SUBSLICE_MASK ;
Do we need this for anything?
Quoted 84 lines
drivers/gpu/drm/i915/intel_engine_cs.c +19
-5+ +if (INTEL_GEN (dev_priv) ==10 ) + mcr_s_ss_select =GEN8_MCR_SLICE (slice) | +GEN8_MCR_SUBSLICE (subslice); +else + mcr_s_ss_select =0 ; + +return mcr_s_ss_select; +} +static inline uint32_t read_subslice_reg (struct drm_i915_private *dev_priv,int slice,int subslice,i915_reg_t reg) {uint32_t mcr_slice_subslice_mask;uint32_t mcr_slice_subslice_select; +uint32_t default_mcr_s_ss_select;uint32_t mcr;uint32_t ret;enum forcewake_domains fw_domains;@@ -841,6 +861,8 @@ read_subslice_reg(struct drm_i915_private *dev_priv, int slice,GEN8_MCR_SUBSLICE (subslice); } + default_mcr_s_ss_select =intel_calculate_s_ss_select (dev_priv); + fw_domains =intel_uncore_forcewake_for_reg (dev_priv, reg,FW_REG_READ ); fw_domains |= intel_uncore_forcewake_for_reg(dev_priv,@@ -851,11 +873,10 @@ read_subslice_reg(struct drm_i915_private *dev_priv, int slice,intel_uncore_forcewake_get__locked (dev_priv, fw_domains); mcr =I915_READ_FW (GEN8_MCR_SELECTOR ); -/* -* The HW expects the slice and sublice selectors to be reset to 0 -* after reading out the registers. -*/ -WARN_ON_ONCE (mcr & mcr_slice_subslice_mask); + +WARN_ON_ONCE ((mcr & mcr_slice_subslice_mask) != + default_mcr_s_ss_select); + mcr &= ~mcr_slice_subslice_mask; mcr |= mcr_slice_subslice_select;I915_WRITE_FW (GEN8_MCR_SELECTOR , mcr);@@ -863,6 +884,8 @@ read_subslice_reg(struct drm_i915_private *dev_priv, int slice, ret =I915_READ_FW (reg); mcr &= ~mcr_slice_subslice_mask; + mcr |= default_mcr_s_ss_select; +I915_WRITE_FW (GEN8_MCR_SELECTOR , mcr);intel_uncore_forcewake_put__locked (dev_priv, fw_domains);drivers/gpu/drm/i915/intel_workarounds.c +22
-0@@ -672,8 +672,40 @@ static void cfl_gt_workarounds_apply(struct drm_i915_private *dev_priv) GAMT_ECO_ENABLE_IN_PLACE_DECOMPRESS); } +static void wa_init_mcr (struct drm_i915_private *dev_priv) +{ +u32 mcr; +u32 mcr_slice_subslice_mask; + + mcr =I915_READ (GEN8_MCR_SELECTOR ); + +if (INTEL_GEN (dev_priv) >=11 ) + mcr_slice_subslice_mask =GEN11_MCR_SLICE_MASK | +GEN11_MCR_SUBSLICE_MASK ; +else + mcr_slice_subslice_mask =GEN8_MCR_SLICE_MASK | +GEN8_MCR_SUBSLICE_MASK ; +/* +* WaProgramMgsrForCorrectSliceSpecificMmioReads:cnl +* Before any MMIO read into slice/subslice specific registers, MCR +* packet control register needs to be programmed to point to any +* enabled s/ss pair. Otherwise, incorrect values will be returned. +* This means each subsequent MMIO read will be forwarded to an +* specific s/ss combination, but this is OK since these registers +* are consistent across s/ss in almost all cases. In the rare +* occasions, such as INSTDONE, where this value is dependent
drivers/gpu/drm/i915/intel_workarounds.c static void cfl_gt_workarounds_apply(struct drm_i915_private *dev_priv) · line 706
Quoted 10 lines
drivers/gpu/drm/i915/intel_workarounds.c +8
-0+* on s/ss combo, the read should be done with read_subslice_reg. +*/ + mcr &= ~mcr_slice_subslice_mask; + mcr |=intel_calculate_s_ss_select (dev_priv); +I915_WRITE (GEN8_MCR_SELECTOR , mcr); +} +static void cnl_gt_workarounds_apply (struct drm_i915_private *dev_priv) { +/* WaProgramMgsrForCorrectSliceSpecificMmioReads: cnl */
I don't like duplicating the WA name. It's probably better to choose one place and stick with it (same thing for the L3Bank WA)
drivers/gpu/drm/i915/intel_workarounds.c static void cfl_gt_workarounds_apply(struct drm_i915_private *dev_priv) · line 711
Quoted 5 lines
drivers/gpu/drm/i915/intel_workarounds.c +2
-0+wa_init_mcr (dev_priv); +/* WaDisableI2mCycleOnWRPort:cnl (pre-prod) */ if (IS_CNL_REVID (dev_priv,CNL_REVID_B0 ,CNL_REVID_B0 )) I915_WRITE(GAMT_CHKN_BIT_REG,
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 1/3 drm/i915/cnl: Implement WaProgramMgsrForCorrectSliceSpecificMmioReads
In reply to Yunwei ZhangWaProgramMgsrForCorrectSliceSpecificMmioReads dictate that before any MMIO read into Slice/Subslice specific registers, MCR packet control register(0xFDC) needs to be programmed to point to any enabled slice/subslice pair. Otherwise, incorrect value will be returned.
However, that means each subsequent MMIO read will be forwarded to a specific slice/subslice combination as read is unicast. This is OK since slice/subslice specific register values are consistent in almost all cases across slice/subslice. There are rare occasions such as INSTDONE that this value will be dependent on slice/subslice combo, in such cases, we need to program 0xFDC and recover this after. This is already covered by read_subslice_reg.
Also, 0xFDC will lose its information after TDR/engine reset/power state change.
References: HSD#1405586840, BSID#0575
v2:
- use fls() instead of find_last_bit() (Chris)
- added INTEL_SSEU to extract sseu from device info. (Chris)
v3:
- rebase on latest tip
v5:
- Added references (Mika)
- Change the ordered of passing arguments and etc. (Ursulin)
v7:
- Moved WA explanation Comments(Oscar)
- Rebased.
v8:
- Renamed sanitize_mcr to calculate_s_ss_select. (Oscar)
- calculate s/ss selector instead of whole mcr. (Oscar)
v9:
- Updated function name (Oscar)
- Remove redundant variables (Oscar)
--- drivers/gpu/drm/i915/i915_drv.h | 2 ++ drivers/gpu/drm/i915/intel_engine_cs.c | 30 +++++++++++++++++++++++++----- drivers/gpu/drm/i915/intel_workarounds.c | 31 +++++++++++++++++++++++++++++++ 3 files changed, 58 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +2 -0
@@ -2744,6 +2744,8 @@ int vlv_force_gfx_clock(struct drm_i915_private *dev_priv, bool on);int intel_engines_init_mmio (struct drm_i915_private *dev_priv);int intel_engines_init (struct drm_i915_private *dev_priv); +u32 intel_calculate_mcr_s_ss_select (struct drm_i915_private *dev_priv); +/* intel_hotplug.c */ void intel_hpd_irq_handler (struct drm_i915_private *dev_priv,u32 pin_mask,u32 long_mask);
drivers/gpu/drm/i915/intel_engine_cs.c +25 -5
@@ -819,12 +819,29 @@ const char *i915_cache_level_str(struct drm_i915_private *i915, int type) } } +u32 intel_calculate_mcr_s_ss_select (struct drm_i915_private *dev_priv) +{ +const struct sseu_dev_info *sseu = &(INTEL_INFO (dev_priv)->sseu); +u32 mcr_s_ss_select; +u32 slice =fls (sseu->slice_mask); +u32 subslice =fls (sseu->subslice_mask[slice]); + +if (INTEL_GEN (dev_priv) ==10 ) + mcr_s_ss_select =GEN8_MCR_SLICE (slice) | +GEN8_MCR_SUBSLICE (subslice); +else + mcr_s_ss_select =0 ; + +return mcr_s_ss_select; +} +static inline uint32_t read_subslice_reg (struct drm_i915_private *dev_priv,int slice,int subslice,i915_reg_t reg) {uint32_t mcr_slice_subslice_mask;uint32_t mcr_slice_subslice_select; +uint32_t default_mcr_s_ss_select;uint32_t mcr;uint32_t ret;enum forcewake_domains fw_domains;
@@ -841,6 +858,8 @@ read_subslice_reg(struct drm_i915_private *dev_priv, int slice,GEN8_MCR_SUBSLICE (subslice); } + default_mcr_s_ss_select =intel_calculate_mcr_s_ss_select (dev_priv); + fw_domains =intel_uncore_forcewake_for_reg (dev_priv, reg,FW_REG_READ ); fw_domains |= intel_uncore_forcewake_for_reg(dev_priv,
@@ -851,11 +870,10 @@ read_subslice_reg(struct drm_i915_private *dev_priv, int slice,intel_uncore_forcewake_get__locked (dev_priv, fw_domains); mcr =I915_READ_FW (GEN8_MCR_SELECTOR ); -/* -* The HW expects the slice and sublice selectors to be reset to 0 -* after reading out the registers. -*/ -WARN_ON_ONCE (mcr & mcr_slice_subslice_mask); + +WARN_ON_ONCE ((mcr & mcr_slice_subslice_mask) != + default_mcr_s_ss_select); + mcr &= ~mcr_slice_subslice_mask; mcr |= mcr_slice_subslice_select;I915_WRITE_FW (GEN8_MCR_SELECTOR , mcr);
@@ -863,6 +881,8 @@ read_subslice_reg(struct drm_i915_private *dev_priv, int slice, ret =I915_READ_FW (reg); mcr &= ~mcr_slice_subslice_mask; + mcr |= default_mcr_s_ss_select; +I915_WRITE_FW (GEN8_MCR_SELECTOR , mcr);intel_uncore_forcewake_put__locked (dev_priv, fw_domains);
drivers/gpu/drm/i915/intel_workarounds.c +31 -0
@@ -672,8 +672,39 @@ static void cfl_gt_workarounds_apply(struct drm_i915_private *dev_priv) GAMT_ECO_ENABLE_IN_PLACE_DECOMPRESS); } +static void wa_init_mcr (struct drm_i915_private *dev_priv) +{ +u32 mcr; +u32 mcr_slice_subslice_mask; + + mcr =I915_READ (GEN8_MCR_SELECTOR ); + +if (INTEL_GEN (dev_priv) >=11 ) + mcr_slice_subslice_mask =GEN11_MCR_SLICE_MASK | +GEN11_MCR_SUBSLICE_MASK ; +else + mcr_slice_subslice_mask =GEN8_MCR_SLICE_MASK | +GEN8_MCR_SUBSLICE_MASK ; +/* +* WaProgramMgsrForCorrectSliceSpecificMmioReads:cnl +* Before any MMIO read into slice/subslice specific registers, MCR +* packet control register needs to be programmed to point to any +* enabled s/ss pair. Otherwise, incorrect values will be returned. +* This means each subsequent MMIO read will be forwarded to an +* specific s/ss combination, but this is OK since these registers +* are consistent across s/ss in almost all cases. In the rare +* occasions, such as INSTDONE, where this value is dependent +* on s/ss combo, the read should be done with read_subslice_reg. +*/ + mcr &= ~mcr_slice_subslice_mask; + mcr |=intel_calculate_mcr_s_ss_select (dev_priv); +I915_WRITE (GEN8_MCR_SELECTOR , mcr); +} +static void cnl_gt_workarounds_apply (struct drm_i915_private *dev_priv) { +wa_init_mcr (dev_priv); +/* WaDisableI2mCycleOnWRPort:cnl (pre-prod) */ if (IS_CNL_REVID (dev_priv,CNL_REVID_B0 ,CNL_REVID_B0 )) I915_WRITE(GAMT_CHKN_BIT_REG,
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 1/3 drm/i915/cnl: Implement WaProgramMgsrForCorrectSliceSpecificMmioReads
WaProgramMgsrForCorrectSliceSpecificMmioReads dictate that before any MMIO read into Slice/Subslice specific registers, MCR packet control register(0xFDC) needs to be programmed to point to any enabled slice/subslice pair. Otherwise, incorrect value will be returned.
However, that means each subsequent MMIO read will be forwarded to a specific slice/subslice combination as read is unicast. This is OK since slice/subslice specific register values are consistent in almost all cases across slice/subslice. There are rare occasions such as INSTDONE that this value will be dependent on slice/subslice combo, in such cases, we need to program 0xFDC and recover this after. This is already covered by read_subslice_reg.
Also, 0xFDC will lose its information after TDR/engine reset/power state change.
References: HSD#1405586840, BSID#0575
v2:
- use fls() instead of find_last_bit() (Chris)
- added INTEL_SSEU to extract sseu from device info. (Chris)
v3:
- rebase on latest tip
v5:
- Added references (Mika)
- Change the ordered of passing arguments and etc. (Ursulin)
v7:
- Moved WA explanation Comments(Oscar)
- Rebased.
v8:
- Renamed sanitize_mcr to calculate_s_ss_select. (Oscar)
- calculate s/ss selector instead of whole mcr. (Oscar)
v9:
- Updated function name (Oscar)
- Remove redundant variables (Oscar)
v10:
- Separate pre-GEN10 and GEN11 mask. (Oscar)
--- drivers/gpu/drm/i915/i915_drv.h | 2 ++ drivers/gpu/drm/i915/intel_engine_cs.c | 30 +++++++++++++++++++++++++----- drivers/gpu/drm/i915/intel_workarounds.c | 27 +++++++++++++++++++++++++++ 3 files changed, 54 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +2 -0
@@ -2744,6 +2744,8 @@ int vlv_force_gfx_clock(struct drm_i915_private *dev_priv, bool on);int intel_engines_init_mmio (struct drm_i915_private *dev_priv);int intel_engines_init (struct drm_i915_private *dev_priv); +u32 intel_calculate_mcr_s_ss_select (struct drm_i915_private *dev_priv); +/* intel_hotplug.c */ void intel_hpd_irq_handler (struct drm_i915_private *dev_priv,u32 pin_mask,u32 long_mask);
drivers/gpu/drm/i915/intel_engine_cs.c +25 -5
@@ -819,12 +819,29 @@ const char *i915_cache_level_str(struct drm_i915_private *i915, int type) } } +u32 intel_calculate_mcr_s_ss_select (struct drm_i915_private *dev_priv) +{ +const struct sseu_dev_info *sseu = &(INTEL_INFO (dev_priv)->sseu); +u32 mcr_s_ss_select; +u32 slice =fls (sseu->slice_mask); +u32 subslice =fls (sseu->subslice_mask[slice]); + +if (INTEL_GEN (dev_priv) ==10 ) + mcr_s_ss_select =GEN8_MCR_SLICE (slice) | +GEN8_MCR_SUBSLICE (subslice); +else + mcr_s_ss_select =0 ; + +return mcr_s_ss_select; +} +static inline uint32_t read_subslice_reg (struct drm_i915_private *dev_priv,int slice,int subslice,i915_reg_t reg) {uint32_t mcr_slice_subslice_mask;uint32_t mcr_slice_subslice_select; +uint32_t default_mcr_s_ss_select;uint32_t mcr;uint32_t ret;enum forcewake_domains fw_domains;
@@ -841,6 +858,8 @@ read_subslice_reg(struct drm_i915_private *dev_priv, int slice,GEN8_MCR_SUBSLICE (subslice); } + default_mcr_s_ss_select =intel_calculate_mcr_s_ss_select (dev_priv); + fw_domains =intel_uncore_forcewake_for_reg (dev_priv, reg,FW_REG_READ ); fw_domains |= intel_uncore_forcewake_for_reg(dev_priv,
@@ -851,11 +870,10 @@ read_subslice_reg(struct drm_i915_private *dev_priv, int slice,intel_uncore_forcewake_get__locked (dev_priv, fw_domains); mcr =I915_READ_FW (GEN8_MCR_SELECTOR ); -/* -* The HW expects the slice and sublice selectors to be reset to 0 -* after reading out the registers. -*/ -WARN_ON_ONCE (mcr & mcr_slice_subslice_mask); + +WARN_ON_ONCE ((mcr & mcr_slice_subslice_mask) != + default_mcr_s_ss_select); + mcr &= ~mcr_slice_subslice_mask; mcr |= mcr_slice_subslice_select;I915_WRITE_FW (GEN8_MCR_SELECTOR , mcr);
@@ -863,6 +881,8 @@ read_subslice_reg(struct drm_i915_private *dev_priv, int slice, ret =I915_READ_FW (reg); mcr &= ~mcr_slice_subslice_mask; + mcr |= default_mcr_s_ss_select; +I915_WRITE_FW (GEN8_MCR_SELECTOR , mcr);intel_uncore_forcewake_put__locked (dev_priv, fw_domains);
drivers/gpu/drm/i915/intel_workarounds.c +27 -0
@@ -672,8 +672,35 @@ static void cfl_gt_workarounds_apply(struct drm_i915_private *dev_priv) GAMT_ECO_ENABLE_IN_PLACE_DECOMPRESS); } +static void wa_init_mcr (struct drm_i915_private *dev_priv) +{ +u32 mcr; +u32 mcr_slice_subslice_mask; + + mcr =I915_READ (GEN8_MCR_SELECTOR ); + + mcr_slice_subslice_mask =GEN8_MCR_SLICE_MASK | +GEN8_MCR_SUBSLICE_MASK ; +/* +* WaProgramMgsrForCorrectSliceSpecificMmioReads:cnl +* Before any MMIO read into slice/subslice specific registers, MCR +* packet control register needs to be programmed to point to any +* enabled s/ss pair. Otherwise, incorrect values will be returned. +* This means each subsequent MMIO read will be forwarded to an +* specific s/ss combination, but this is OK since these registers +* are consistent across s/ss in almost all cases. In the rare +* occasions, such as INSTDONE, where this value is dependent +* on s/ss combo, the read should be done with read_subslice_reg. +*/ + mcr &= ~mcr_slice_subslice_mask; + mcr |=intel_calculate_mcr_s_ss_select (dev_priv); +I915_WRITE (GEN8_MCR_SELECTOR , mcr); +} +static void cnl_gt_workarounds_apply (struct drm_i915_private *dev_priv) { +wa_init_mcr (dev_priv); +/* WaDisableI2mCycleOnWRPort:cnl (pre-prod) */ if (IS_CNL_REVID (dev_priv,CNL_REVID_B0 ,CNL_REVID_B0 )) I915_WRITE(GAMT_CHKN_BIT_REG,
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 38 lines · Yunwei Zhang
WaProgramMgsrForCorrectSliceSpecificMmioReads dictate that before any MMIO read into Slice/Subslice specific registers, MCR packet control register(0xFDC) needs to be programmed to point to any enabled slice/subslice pair. Otherwise, incorrect value will be returned.
However, that means each subsequent MMIO read will be forwarded to a specific slice/subslice combination as read is unicast. This is OK since slice/subslice specific register values are consistent in almost all cases across slice/subslice. There are rare occasions such as INSTDONE that this value will be dependent on slice/subslice combo, in such cases, we need to program
0xFDCand recover this after. This is already covered byread_subslice_reg.Also,
0xFDCwill lose its information after TDR/engine reset/power state change.References: HSD#1405586840, BSID#0575
v2:
- usefls()instead offind_last_bit()(Chris)
- addedINTEL_SSEUto extract sseu from device info. (Chris)
v3:
- rebase on latest tip
v5:
- Added references (Mika)
- Change the ordered of passing arguments and etc. (Ursulin)
v7:
- Moved WA explanation Comments(Oscar)
- Rebased.
v8:
- Renamedsanitize_mcrtocalculate_s_ss_select. (Oscar)
- calculate s/ss selector instead of whole mcr. (Oscar)
v9:
- Updated function name (Oscar)
- Remove redundant variables (Oscar)
v10:
- Separate pre-GEN10 and GEN11 mask. (Oscar)
Quoted 7 lines
Cc Oscar Mateo <[email protected]>Cc Michel Thierry <[email protected]>Cc Joonas Lahtinen <[email protected]>Cc Chris Wilson <[email protected]>Cc Mika Kuoppala <[email protected]>Cc Tvrtko Ursulin <[email protected]>Signed-off-by Yunwei Zhang <[email protected]>
Quoted 117 lines
--- drivers/gpu/drm/i915/i915_drv.h | 2 ++ drivers/gpu/drm/i915/intel_engine_cs.c | 30 +++++++++++++++++++++++++----- drivers/gpu/drm/i915/intel_workarounds.c | 27 +++++++++++++++++++++++++++ 3 files changed, 54 insertions(+), 5 deletions(-)drivers/gpu/drm/i915/i915_drv.h +2
-0@@ -2744,6 +2744,8 @@ int vlv_force_gfx_clock(struct drm_i915_private *dev_priv, bool on);int intel_engines_init_mmio (struct drm_i915_private *dev_priv);int intel_engines_init (struct drm_i915_private *dev_priv); +u32 intel_calculate_mcr_s_ss_select (struct drm_i915_private *dev_priv); +/* intel_hotplug.c */ void intel_hpd_irq_handler (struct drm_i915_private *dev_priv,u32 pin_mask,u32 long_mask);drivers/gpu/drm/i915/intel_engine_cs.c +25
-5@@ -819,12 +819,29 @@ const char *i915_cache_level_str(struct drm_i915_private *i915, int type) } } +u32 intel_calculate_mcr_s_ss_select (struct drm_i915_private *dev_priv) +{ +const struct sseu_dev_info *sseu = &(INTEL_INFO (dev_priv)->sseu); +u32 mcr_s_ss_select; +u32 slice =fls (sseu->slice_mask); +u32 subslice =fls (sseu->subslice_mask[slice]); + +if (INTEL_GEN (dev_priv) ==10 ) + mcr_s_ss_select =GEN8_MCR_SLICE (slice) | +GEN8_MCR_SUBSLICE (subslice); +else + mcr_s_ss_select =0 ; + +return mcr_s_ss_select; +} +static inline uint32_t read_subslice_reg (struct drm_i915_private *dev_priv,int slice,int subslice,i915_reg_t reg) {uint32_t mcr_slice_subslice_mask;uint32_t mcr_slice_subslice_select; +uint32_t default_mcr_s_ss_select;uint32_t mcr;uint32_t ret;enum forcewake_domains fw_domains;@@ -841,6 +858,8 @@ read_subslice_reg(struct drm_i915_private *dev_priv, int slice,GEN8_MCR_SUBSLICE (subslice); } + default_mcr_s_ss_select =intel_calculate_mcr_s_ss_select (dev_priv); + fw_domains =intel_uncore_forcewake_for_reg (dev_priv, reg,FW_REG_READ ); fw_domains |= intel_uncore_forcewake_for_reg(dev_priv,@@ -851,11 +870,10 @@ read_subslice_reg(struct drm_i915_private *dev_priv, int slice,intel_uncore_forcewake_get__locked (dev_priv, fw_domains); mcr =I915_READ_FW (GEN8_MCR_SELECTOR ); -/* -* The HW expects the slice and sublice selectors to be reset to 0 -* after reading out the registers. -*/ -WARN_ON_ONCE (mcr & mcr_slice_subslice_mask); + +WARN_ON_ONCE ((mcr & mcr_slice_subslice_mask) != + default_mcr_s_ss_select); + mcr &= ~mcr_slice_subslice_mask; mcr |= mcr_slice_subslice_select;I915_WRITE_FW (GEN8_MCR_SELECTOR , mcr);@@ -863,6 +881,8 @@ read_subslice_reg(struct drm_i915_private *dev_priv, int slice, ret =I915_READ_FW (reg); mcr &= ~mcr_slice_subslice_mask; + mcr |= default_mcr_s_ss_select; +I915_WRITE_FW (GEN8_MCR_SELECTOR , mcr);intel_uncore_forcewake_put__locked (dev_priv, fw_domains);drivers/gpu/drm/i915/intel_workarounds.c +22
-0@@ -672,8 +672,35 @@ static void cfl_gt_workarounds_apply(struct drm_i915_private *dev_priv) GAMT_ECO_ENABLE_IN_PLACE_DECOMPRESS); } +static void wa_init_mcr (struct drm_i915_private *dev_priv) +{ +u32 mcr; +u32 mcr_slice_subslice_mask; + + mcr =I915_READ (GEN8_MCR_SELECTOR ); + + mcr_slice_subslice_mask =GEN8_MCR_SLICE_MASK | +GEN8_MCR_SUBSLICE_MASK ; +/* +* WaProgramMgsrForCorrectSliceSpecificMmioReads:cnl +* Before any MMIO read into slice/subslice specific registers, MCR +* packet control register needs to be programmed to point to any +* enabled s/ss pair. Otherwise, incorrect values will be returned. +* This means each subsequent MMIO read will be forwarded to an +* specific s/ss combination, but this is OK since these registers +* are consistent across s/ss in almost all cases. In the rare +* occasions, such as INSTDONE, where this value is dependent +* on s/ss combo, the read should be done with read_subslice_reg. +*/ + mcr &= ~mcr_slice_subslice_mask; + mcr |=intel_calculate_mcr_s_ss_select (dev_priv);
drivers/gpu/drm/i915/intel_workarounds.c static void cfl_gt_workarounds_apply(struct drm_i915_private *dev_priv) · line 706
Quoted 10 lines
drivers/gpu/drm/i915/intel_workarounds.c +5
-0+I915_WRITE (GEN8_MCR_SELECTOR , mcr); +} +static void cnl_gt_workarounds_apply (struct drm_i915_private *dev_priv) { +wa_init_mcr (dev_priv); +/* WaDisableI2mCycleOnWRPort:cnl (pre-prod) */ if (IS_CNL_REVID (dev_priv,CNL_REVID_B0 ,CNL_REVID_B0 )) I915_WRITE(GAMT_CHKN_BIT_REG,
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.SPARSE: warning for series starting with [v2,1/3] drm/i915/cnl: Implement WaProgramMgsrForCorrectSliceSpecificMmioReads (rev4)
In reply to Yunwei Zhang== Series Details ==
== Series Details ==
Series: series starting with [v2,1/3] drm/i915/cnl: Implement WaProgramMgsrForCorrectSliceSpecificMmioReads (rev4)
URL : https://patchwork.freedesktop.org/series/43159/
State : warning
== Summary ==
$ dim sparse origin/drm-tip Commit: drm/i915/cnl: Implement WaProgramMgsrForCorrectSliceSpecificMmioReads -drivers/gpu/drm/i915/selftests/../i915_drv.h:3664:16: warning: expression using sizeof(void) +drivers/gpu/drm/i915/selftests/../i915_drv.h:3666:16: warning: expression using sizeof(void)
Commit: drm/i915/icl: Enable WaProgramMgsrForCorrectSliceSpecificMmioReads Okay!
Commit: drm/i915: Implement WaProgramMgsrForL3BankSpecificMmioReads Okay!
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for series starting with [v2,1/3] drm/i915/cnl: Implement WaProgramMgsrForCorrectSliceSpecificMmioReads (rev4)
In reply to Yunwei Zhang== Series Details ==
== Series Details ==
Series: series starting with [v2,1/3] drm/i915/cnl: Implement WaProgramMgsrForCorrectSliceSpecificMmioReads (rev4)
URL : https://patchwork.freedesktop.org/series/43159/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4209 -> Patchwork_9058 =
== Summary - WARNING ==
Minor unknown changes coming with Patchwork_9058 need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_9058, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://patchwork.freedesktop.org/api/1.0/series/43159/revisions/4/mbox/
== Possible new issues ==
Here are the unknown changes that may have been introduced in Patchwork_9058:
=== IGT changes ===
==== Warnings ====
igt@gem_exec_gttfill@basic:
fi-pnv-d510: PASS -> SKIP== Known issues ==
Here are the changes found in Patchwork_9058 that come from known issues:
=== IGT changes ===
==== Possible fixes ====
igt@kms_pipe_crc_basic@read-crc-pipe-b-frame-sequence:
fi-hsw-4200u: FAIL (fdo#103481) -> PASSfdo#103481 https://bugs.freedesktop.org/show_bug.cgi?id=103481
== Participating hosts (43 -> 39) ==
Missing (4): fi-ilk-m540 fi-byt-squawks fi-bsw-cyan fi-skl-6700hq
== Build changes ==
* Linux: CI_DRM_4209 -> Patchwork_9058
CI_DRM_4209: eecb2c1e793ed98c39876c92fc64cd18a7fe6412 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4487: eccae1360d6d01e73c6af2bd97122cef708207ef @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9058: 2811e895a0ebc2fec71e21b87f69678f12a6a6c9 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4487: 6ab75f7eb5e1dccbb773e1739beeb2d7cbd6ad0d @ git://anongit.freedesktop.org/piglit
== Linux commits ==
2811e895a0eb drm/i915: Implement WaProgramMgsrForL3BankSpecificMmioReads 995075005b39 drm/i915/icl: Enable WaProgramMgsrForCorrectSliceSpecificMmioReads c9aea7c25621 drm/i915/cnl: Implement WaProgramMgsrForCorrectSliceSpecificMmioReads
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9058/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.SPARSE: warning for series starting with [v3,1/3] drm/i915/cnl: Implement WaProgramMgsrForCorrectSliceSpecificMmioReads (rev6)
In reply to Yunwei Zhang== Series Details ==
== Series Details ==
Series: series starting with [v3,1/3] drm/i915/cnl: Implement WaProgramMgsrForCorrectSliceSpecificMmioReads (rev6)
URL : https://patchwork.freedesktop.org/series/43159/
State : warning
== Summary ==
$ dim sparse origin/drm-tip Commit: drm/i915/cnl: Implement WaProgramMgsrForCorrectSliceSpecificMmioReads -drivers/gpu/drm/i915/selftests/../i915_drv.h:3664:16: warning: expression using sizeof(void) +drivers/gpu/drm/i915/selftests/../i915_drv.h:3666:16: warning: expression using sizeof(void)
Commit: drm/i915/icl: Enable WaProgramMgsrForCorrectSliceSpecificMmioReads Okay!
Commit: drm/i915: Implement WaProgramMgsrForL3BankSpecificMmioReads Okay!
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for series starting with [v3,1/3] drm/i915/cnl: Implement WaProgramMgsrForCorrectSliceSpecificMmioReads (rev6)
In reply to Yunwei Zhang== Series Details ==
== Series Details ==
Series: series starting with [v3,1/3] drm/i915/cnl: Implement WaProgramMgsrForCorrectSliceSpecificMmioReads (rev6)
URL : https://patchwork.freedesktop.org/series/43159/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4209 -> Patchwork_9060 =
== Summary - SUCCESS ==
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/43159/revisions/6/mbox/
== Known issues ==
Here are the changes found in Patchwork_9060 that come from known issues:
=== IGT changes ===
==== Possible fixes ====
igt@kms_pipe_crc_basic@read-crc-pipe-b-frame-sequence:
fi-hsw-4200u: FAIL (fdo#103481) -> PASSfdo#103481 https://bugs.freedesktop.org/show_bug.cgi?id=103481
== Participating hosts (43 -> 39) ==
Missing (4): fi-ilk-m540 fi-byt-squawks fi-bsw-cyan fi-skl-6700hq
== Build changes ==
* Linux: CI_DRM_4209 -> Patchwork_9060
CI_DRM_4209: eecb2c1e793ed98c39876c92fc64cd18a7fe6412 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4487: eccae1360d6d01e73c6af2bd97122cef708207ef @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9060: a0f92bf788e8312aaebae13200e05f9a66498245 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4487: 6ab75f7eb5e1dccbb773e1739beeb2d7cbd6ad0d @ git://anongit.freedesktop.org/piglit
== Linux commits ==
a0f92bf788e8 drm/i915: Implement WaProgramMgsrForL3BankSpecificMmioReads ab9049254cab drm/i915/icl: Enable WaProgramMgsrForCorrectSliceSpecificMmioReads f769430c6913 drm/i915/cnl: Implement WaProgramMgsrForCorrectSliceSpecificMmioReads
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9060/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.SPARSE: warning for series starting with [v4,1/3] drm/i915/cnl: Implement WaProgramMgsrForCorrectSliceSpecificMmioReads (rev9)
In reply to Yunwei Zhang== Series Details ==
== Series Details ==
Series: series starting with [v4,1/3] drm/i915/cnl: Implement WaProgramMgsrForCorrectSliceSpecificMmioReads (rev9)
URL : https://patchwork.freedesktop.org/series/43159/
State : warning
== Summary ==
$ dim sparse origin/drm-tip Commit: drm/i915/cnl: Implement WaProgramMgsrForCorrectSliceSpecificMmioReads -drivers/gpu/drm/i915/selftests/../i915_drv.h:3664:16: warning: expression using sizeof(void) +drivers/gpu/drm/i915/selftests/../i915_drv.h:3666:16: warning: expression using sizeof(void)
Commit: drm/i915/icl: Enable WaProgramMgsrForCorrectSliceSpecificMmioReads Okay!
Commit: drm/i915: Implement WaProgramMgsrForL3BankSpecificMmioReads Okay!
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for series starting with [v4,1/3] drm/i915/cnl: Implement WaProgramMgsrForCorrectSliceSpecificMmioReads (rev9)
In reply to Yunwei Zhang== Series Details ==
== Series Details ==
Series: series starting with [v4,1/3] drm/i915/cnl: Implement WaProgramMgsrForCorrectSliceSpecificMmioReads (rev9)
URL : https://patchwork.freedesktop.org/series/43159/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4209 -> Patchwork_9061 =
== Summary - WARNING ==
Minor unknown changes coming with Patchwork_9061 need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_9061, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://patchwork.freedesktop.org/api/1.0/series/43159/revisions/9/mbox/
== Possible new issues ==
Here are the unknown changes that may have been introduced in Patchwork_9061:
=== IGT changes ===
==== Warnings ====
igt@gem_exec_gttfill@basic:
fi-pnv-d510: PASS -> SKIP== Known issues ==
Here are the changes found in Patchwork_9061 that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
fi-cnl-y3: PASS -> DMESG-WARN (fdo#104951)
==== Possible fixes ====
igt@gem_mmap_gtt@basic-small-bo-tiledx:
fi-gdg-551: FAIL (fdo#102575) -> PASS
igt@kms_pipe_crc_basic@read-crc-pipe-b-frame-sequence:
fi-hsw-4200u: FAIL (fdo#103481) -> PASS fdo#102575 https://bugs.freedesktop.org/show_bug.cgi?id=102575
fdo#103481 https://bugs.freedesktop.org/show_bug.cgi?id=103481
fdo#104951 https://bugs.freedesktop.org/show_bug.cgi?id=104951
== Participating hosts (43 -> 39) ==
Missing (4): fi-ilk-m540 fi-byt-squawks fi-bsw-cyan fi-skl-6700hq
== Build changes ==
* Linux: CI_DRM_4209 -> Patchwork_9061
CI_DRM_4209: eecb2c1e793ed98c39876c92fc64cd18a7fe6412 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4487: eccae1360d6d01e73c6af2bd97122cef708207ef @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9061: 52c71e7d2a6f52078c64719c4b60e48860c88150 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4487: 6ab75f7eb5e1dccbb773e1739beeb2d7cbd6ad0d @ git://anongit.freedesktop.org/piglit
== Linux commits ==
52c71e7d2a6f drm/i915: Implement WaProgramMgsrForL3BankSpecificMmioReads 35534a66d130 drm/i915/icl: Enable WaProgramMgsrForCorrectSliceSpecificMmioReads 19a4692bcfc6 drm/i915/cnl: Implement WaProgramMgsrForCorrectSliceSpecificMmioReads
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9061/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for series starting with [v4,1/3] drm/i915/cnl: Implement WaProgramMgsrForCorrectSliceSpecificMmioReads (rev9)
In reply to Yunwei Zhang== Series Details ==
== Series Details ==
Series: series starting with [v4,1/3] drm/i915/cnl: Implement WaProgramMgsrForCorrectSliceSpecificMmioReads (rev9)
URL : https://patchwork.freedesktop.org/series/43159/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4209_full -> Patchwork_9061_full =
== Summary - WARNING ==
Minor unknown changes coming with Patchwork_9061_full need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_9061_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://patchwork.freedesktop.org/api/1.0/series/43159/revisions/9/mbox/
== Possible new issues ==
Here are the unknown changes that may have been introduced in Patchwork_9061_full:
=== IGT changes ===
==== Warnings ====
igt@gem_exec_schedule@deep-bsd2:
shard-kbl: SKIP -> PASS +2
igt@kms_chv_cursor_fail@pipe-a-128x128-top-edge:
shard-snb: PASS -> SKIP +3
igt@kms_plane_lowres@pipe-c-tiling-x:
shard-apl: SKIP -> PASS== Known issues ==
Here are the changes found in Patchwork_9061_full that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@kms_flip@2x-flip-vs-expired-vblank-interruptible:
shard-glk: PASS -> FAIL (fdo#102887)
igt@kms_flip@flip-vs-expired-vblank-interruptible:
shard-apl: PASS -> FAIL (fdo#102887, fdo#105363)
igt@kms_flip@plain-flip-fb-recreate-interruptible:
shard-glk: PASS -> FAIL (fdo#100368) +1
igt@kms_flip_tiling@flip-x-tiled:
shard-glk: PASS -> FAIL (fdo#104724)
igt@kms_vblank@pipe-a-accuracy-idle:
shard-hsw: PASS -> FAIL (fdo#102583)
==== Possible fixes ====
igt@drv_selftest@live_hangcheck:
shard-kbl: DMESG-FAIL (fdo#106560) -> PASS
igt@kms_flip@2x-plain-flip-fb-recreate-interruptible:
shard-glk: FAIL (fdo#100368) -> PASS
igt@kms_flip_tiling@flip-to-y-tiled:
shard-glk: FAIL (fdo#104724) -> PASS +1
igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-shrfb-draw-mmap-gtt:
shard-apl: DMESG-FAIL (fdo#105602, fdo#103558) -> PASS
igt@kms_frontbuffer_tracking@fbc-2p-primscrn-shrfb-plflip-blt:
shard-glk: FAIL (fdo#104724, fdo#103167) -> PASS +1
igt@kms_pipe_crc_basic@hang-read-crc-pipe-c:
shard-apl: DMESG-WARN (fdo#105602, fdo#103558) -> PASS +9
igt@kms_setmode@basic:
shard-apl: FAIL (fdo#99912) -> PASS
shard-kbl: FAIL (fdo#99912) -> PASS fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#102583 https://bugs.freedesktop.org/show_bug.cgi?id=102583
fdo#102887 https://bugs.freedesktop.org/show_bug.cgi?id=102887
fdo#103167 https://bugs.freedesktop.org/show_bug.cgi?id=103167
fdo#103558 https://bugs.freedesktop.org/show_bug.cgi?id=103558
fdo#104724 https://bugs.freedesktop.org/show_bug.cgi?id=104724
fdo#105363 https://bugs.freedesktop.org/show_bug.cgi?id=105363
fdo#105602 https://bugs.freedesktop.org/show_bug.cgi?id=105602
fdo#106560 https://bugs.freedesktop.org/show_bug.cgi?id=106560
fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912
== Participating hosts (9 -> 9) ==
No changes in participating hosts
== Build changes ==
* Linux: CI_DRM_4209 -> Patchwork_9061
CI_DRM_4209: eecb2c1e793ed98c39876c92fc64cd18a7fe6412 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4487: eccae1360d6d01e73c6af2bd97122cef708207ef @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9061: 52c71e7d2a6f52078c64719c4b60e48860c88150 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4487: 6ab75f7eb5e1dccbb773e1739beeb2d7cbd6ad0d @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9061/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx