Replace acronym with full platform name in defines.
Subsystems (3)
v4 cover Replace acronym with full platform name in defines.
Replacing the acronym used in platform/sub platform defines. This series covers Haswell, Broadwell, Skylake, Kabylake, Coffeelake, Cometlake, Rocketlake, Jasperlake, Elkhartlake, Tigerlake, Alderlake, platform define.This way there is a consistent pattern
to how platforms are referred.splitting to per paltform for easier cherrypicks, if needed.
v2:
- Reordered patches by incrementing platform generations.(Anusha)
- Changeed the commit subject with lowercase platform names.
v3:
- The IS_PLATFORM_(DISPLAY/MEDIA/GRAPHICS)_STEPS replace with Unrolled format. i.e. IS_PLATFORM_FULL_NAME () && IS_DISPLAY_STEPS()
v4:
- Removed the MTL platform from the renaming series (Mat Ropper)
- Removed the unused display steps macro.
- Resolved conflicts.
Anusha Srivatsa (1):
drm/i915/adln: s/ADLP/ALDERLAKE_P in ADLN defines
Dnyaneshwar Bhadane (13):
drm/i915/hsw: s/HSW/HASWELL for platform/subplatform defines drm/i915/bdw: s/BDW/BROADWELL for platform/subplatform defines drm/i915/skl: s/SKL/SKYLAKE for platform/subplatform defines Follow consistent naming convention. Replace KBL with KABYLAKE.Replace
IS_KBL_GRAPHICS_STEP with IS_KABYLAKE () && IS_GRAPHICS_STEP().
drm/i915/cfl: s/CFL/COFFEELAKE for platform/subplatform defines drm/i915/cml: s/CML/COMETLAKE for platform/subplatform defines drm/i915/rkl: s/RKL/ROCKETLAKE for platform/subplatform defines drm/i915/jsl: s/JSL/JASPERLAKE for platform/subplatform defines drm/i915/tgl: s/TGL/TIGERLAKE for platform/subplatform defines drm/i915/adlp: s/ADLP/ALDERLAKE_P for display and graphics step drm/i915/rplp: s/ADLP_RPLP/RAPTORLAKE_P for RPLP defines drm/i915/rplu: s/ADLP_RPLU/RAPTORLAKE_U in RPLU defines drm/i915/adls: s/ADLS_RPLS/RAPTORLAKE_S in platform and subplatform
defines
drivers/gpu/drm/i915/display/icl_dsi.c | 5 +- drivers/gpu/drm/i915/display/intel_cdclk.c | 14 +-- .../gpu/drm/i915/display/intel_combo_phy.c | 7 +- drivers/gpu/drm/i915/display/intel_ddi.c | 7 +- .../drm/i915/display/intel_ddi_buf_trans.c | 10 +- drivers/gpu/drm/i915/display/intel_display.c | 7 +- .../drm/i915/display/intel_display_device.c | 2 +- .../drm/i915/display/intel_display_device.h | 2 +- .../drm/i915/display/intel_display_power.c | 2 +- drivers/gpu/drm/i915/display/intel_dp.c | 4 +- drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 33 ++++--- drivers/gpu/drm/i915/display/intel_hdmi.c | 3 +- .../gpu/drm/i915/display/intel_pch_refclk.c | 2 +- drivers/gpu/drm/i915/display/intel_psr.c | 10 +- .../drm/i915/display/skl_universal_plane.c | 6 +- drivers/gpu/drm/i915/gem/i915_gem_object.c | 2 +- drivers/gpu/drm/i915/gt/gen8_engine_cs.c | 2 +- drivers/gpu/drm/i915/gt/intel_gt.c | 2 +- drivers/gpu/drm/i915/gt/intel_sseu.c | 2 +- drivers/gpu/drm/i915/gt/intel_workarounds.c | 13 +-- .../gpu/drm/i915/gt/uc/intel_guc_hwconfig.c | 2 +- drivers/gpu/drm/i915/gt/uc/intel_uc.c | 2 +- drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 2 +- drivers/gpu/drm/i915/i915_driver.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 94 +++++++------------ drivers/gpu/drm/i915/intel_clock_gating.c | 4 +- drivers/gpu/drm/i915/intel_step.c | 10 +- drivers/gpu/drm/i915/soc/intel_pch.c | 18 ++-- 28 files changed, 127 insertions(+), 142 deletions(-)
Signature · 1 line
2.34.1
PATCH 1/14 drm/i915/hsw: s/HSW/HASWELL for platform/subplatform defines
Follow consistent naming convention. Replace HSW with HASWELL.
--- drivers/gpu/drm/i915/display/intel_cdclk.c | 2 +- drivers/gpu/drm/i915/display/intel_display.c | 2 +- drivers/gpu/drm/i915/display/intel_display_device.h | 2 +- drivers/gpu/drm/i915/display/intel_dp.c | 2 +- drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 2 +- drivers/gpu/drm/i915/display/intel_pch_refclk.c | 2 +- drivers/gpu/drm/i915/gt/intel_gt.c | 2 +- drivers/gpu/drm/i915/i915_driver.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 12 ++++++------ drivers/gpu/drm/i915/soc/intel_pch.c | 10 +++++----- 10 files changed, 19 insertions(+), 19 deletions(-)
drivers/gpu/drm/i915/display/intel_cdclk.c +1 -1
@@ -470,7 +470,7 @@ static void hsw_get_cdclk(struct drm_i915_private *dev_priv, cdclk_config->cdclk =450000 ; else if (freq == LCPLL_CLK_FREQ_450) cdclk_config->cdclk = 450000; - else if (IS_HSW_ULT(dev_priv)) + else if (IS_HASWELL_ULT(dev_priv)) cdclk_config->cdclk = 337500; else cdclk_config->cdclk = 540000;
drivers/gpu/drm/i915/display/intel_display.c +1 -1
@@ -7377,7 +7377,7 @@ static bool intel_ddi_crt_present(struct drm_i915_private *dev_priv)if (DISPLAY_VER (dev_priv) >=9 )return false; -if (IS_HSW_ULT (dev_priv) ||IS_BDW_ULT (dev_priv)) +if (IS_HASWELL_ULT (dev_priv) ||IS_BDW_ULT (dev_priv))return false; if (HAS_PCH_LPT_H(dev_priv) &&
drivers/gpu/drm/i915/display/intel_display_device.h +1 -1
@@ -54,7 +54,7 @@ struct drm_printer;#define HAS_GMCH (i915) (DISPLAY_INFO(i915)->has_gmch)#define HAS_HW_SAGV_WM (i915) (DISPLAY_VER(i915) >= 13 && !IS_DGFX(i915))#define HAS_IPC (i915) (DISPLAY_INFO(i915)->has_ipc) -#define HAS_IPS (i915) (IS_HSW_ULT(i915) || IS_BROADWELL(i915)) +#define HAS_IPS (i915) (IS_HASWELL_ULT(i915) || IS_BROADWELL(i915))#define HAS_LSPCON (i915) (IS_DISPLAY_VER(i915, 9, 10))#define HAS_MBUS_JOINING (i915) (IS_ALDERLAKE_P(i915) || DISPLAY_VER(i915) >= 14)#define HAS_MSO (i915) (DISPLAY_VER(i915) >= 12)
drivers/gpu/drm/i915/display/intel_dp.c +1 -1
@@ -510,7 +510,7 @@ intel_dp_set_source_rates(struct intel_dp *intel_dp) }else if (DISPLAY_VER (dev_priv) ==9 ) { source_rates = skl_rates; size =ARRAY_SIZE (skl_rates); - }else if ((IS_HASWELL (dev_priv) && !IS_HSW_ULX (dev_priv)) || + }else if ((IS_HASWELL (dev_priv) && !IS_HASWELL_ULX (dev_priv)) ||IS_BROADWELL (dev_priv)) { source_rates = hsw_rates; size =ARRAY_SIZE (hsw_rates);
drivers/gpu/drm/i915/display/intel_dpll_mgr.c +1 -1
@@ -927,7 +927,7 @@ static int hsw_ddi_wrpll_get_freq(struct drm_i915_private *dev_priv,switch (wrpll &WRPLL_REF_MASK ) {case WRPLL_REF_SPECIAL_HSW :/* Muxed-SSC for BDW, non-SSC for non-ULT HSW. */ -if (IS_HASWELL (dev_priv) && !IS_HSW_ULT (dev_priv)) { +if (IS_HASWELL (dev_priv) && !IS_HASWELL_ULT (dev_priv)) { refclk = dev_priv->display.dpll.ref_clks.nssc;break ; }
drivers/gpu/drm/i915/display/intel_pch_refclk.c +1 -1
@@ -423,7 +423,7 @@ static bool wrpll_uses_pch_ssc(struct drm_i915_private *dev_priv,if ((ctl &WRPLL_REF_MASK ) ==WRPLL_REF_PCH_SSC )return true; -if ((IS_BROADWELL (dev_priv) ||IS_HSW_ULT (dev_priv)) && +if ((IS_BROADWELL (dev_priv) ||IS_HASWELL_ULT (dev_priv)) && (ctl &WRPLL_REF_MASK ) ==WRPLL_REF_MUXED_SSC_BDW && (fuse_strap &HSW_CPU_SSC_ENABLE ) ==0 )return true;
drivers/gpu/drm/i915/gt/intel_gt.c +1 -1
@@ -179,7 +179,7 @@ int intel_gt_init_hw(struct intel_gt *gt)if (IS_HASWELL (i915))intel_uncore_write (uncore,HSW_MI_PREDICATE_RESULT_2 , -IS_HSW_GT3 (i915) ? +IS_HASWELL_GT3 (i915) ?LOWER_SLICE_ENABLED :LOWER_SLICE_DISABLED );/* Apply the GT workarounds... */
drivers/gpu/drm/i915/i915_driver.c +1 -1
@@ -175,7 +175,7 @@ static void intel_detect_preproduction_hw(struct drm_i915_private *dev_priv) {bool pre = false; - pre |=IS_HSW_EARLY_SDV (dev_priv); + pre |=IS_HASWELL_EARLY_SDV (dev_priv); pre |=IS_SKYLAKE (dev_priv) &&INTEL_REVID (dev_priv) <0x6 ; pre |=IS_BROXTON (dev_priv) &&INTEL_REVID (dev_priv) <0xA ; pre |=IS_KABYLAKE (dev_priv) &&INTEL_REVID (dev_priv) <0x1 ;
drivers/gpu/drm/i915/i915_drv.h +6 -6
@@ -592,7 +592,7 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, IS_SUBPLATFORM(i915, INTEL_ALDERLAKE_P, INTEL_SUBPLATFORM_RPL)#define IS_ADLP_RPLU (i915) \ IS_SUBPLATFORM(i915, INTEL_ALDERLAKE_P, INTEL_SUBPLATFORM_RPLU) -#define IS_HSW_EARLY_SDV (i915) (IS_HASWELL(i915) && \ +#define IS_HASWELL_EARLY_SDV (i915) (IS_HASWELL(i915) && \ (INTEL_DEVID(i915) & 0xFF00) == 0x0C00)#define IS_BDW_ULT (i915) \ IS_SUBPLATFORM(i915, INTEL_BROADWELL, INTEL_SUBPLATFORM_ULT)
@@ -600,14 +600,14 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, IS_SUBPLATFORM(i915, INTEL_BROADWELL, INTEL_SUBPLATFORM_ULX)#define IS_BDW_GT3 (i915) (IS_BROADWELL(i915) && \ INTEL_INFO(i915)->gt == 3) -#define IS_HSW_ULT (i915) \ +#define IS_HASWELL_ULT (i915) \ IS_SUBPLATFORM(i915, INTEL_HASWELL, INTEL_SUBPLATFORM_ULT) -#define IS_HSW_GT3 (i915) (IS_HASWELL(i915) && \ +#define IS_HASWELL_GT3 (i915) (IS_HASWELL(i915) && \ INTEL_INFO(i915)->gt == 3) -#define IS_HSW_GT1 (i915) (IS_HASWELL(i915) && \ +#define IS_HASWELL_GT1 (i915) (IS_HASWELL(i915) && \ INTEL_INFO(i915)->gt == 1)/* ULX machines are also considered ULT. */ -#define IS_HSW_ULX (i915) \ +#define IS_HASWELL_ULX (i915) \ IS_SUBPLATFORM(i915, INTEL_HASWELL, INTEL_SUBPLATFORM_ULX)#define IS_SKL_ULT (i915) \ IS_SUBPLATFORM(i915, INTEL_SKYLAKE, INTEL_SUBPLATFORM_ULT)
@@ -861,7 +861,7 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,/* DPF == dynamic parity feature */ #define HAS_L3_DPF (i915) (INTEL_INFO(i915)->has_l3_dpf) -#define NUM_L3_SLICES (i915) (IS_HSW_GT3(i915) ? \ +#define NUM_L3_SLICES (i915) (IS_HASWELL_GT3(i915) ? \ 2 : HAS_L3_DPF(i915))/* Only valid when HAS_DISPLAY() is true */
drivers/gpu/drm/i915/soc/intel_pch.c +5 -5
@@ -32,21 +32,21 @@ intel_pch_type(const struct drm_i915_private *dev_priv, unsigned short id)drm_WARN_ON (&dev_priv->drm, !IS_HASWELL (dev_priv) && !IS_BROADWELL (dev_priv));drm_WARN_ON (&dev_priv->drm, -IS_HSW_ULT (dev_priv) ||IS_BDW_ULT (dev_priv)); +IS_HASWELL_ULT (dev_priv) ||IS_BDW_ULT (dev_priv));return PCH_LPT ;case INTEL_PCH_LPT_LP_DEVICE_ID_TYPE :drm_dbg_kms (&dev_priv->drm,"Found LynxPoint LP PCH\n" );drm_WARN_ON (&dev_priv->drm, !IS_HASWELL (dev_priv) && !IS_BROADWELL (dev_priv));drm_WARN_ON (&dev_priv->drm, - !IS_HSW_ULT (dev_priv) && !IS_BDW_ULT (dev_priv)); + !IS_HASWELL_ULT (dev_priv) && !IS_BDW_ULT (dev_priv));return PCH_LPT ;case INTEL_PCH_WPT_DEVICE_ID_TYPE :drm_dbg_kms (&dev_priv->drm,"Found WildcatPoint PCH\n" );drm_WARN_ON (&dev_priv->drm, !IS_HASWELL (dev_priv) && !IS_BROADWELL (dev_priv));drm_WARN_ON (&dev_priv->drm, -IS_HSW_ULT (dev_priv) ||IS_BDW_ULT (dev_priv)); +IS_HASWELL_ULT (dev_priv) ||IS_BDW_ULT (dev_priv));/* WPT is LPT compatible */ return PCH_LPT ;case INTEL_PCH_WPT_LP_DEVICE_ID_TYPE :
@@ -54,7 +54,7 @@ intel_pch_type(const struct drm_i915_private *dev_priv, unsigned short id)drm_WARN_ON (&dev_priv->drm, !IS_HASWELL (dev_priv) && !IS_BROADWELL (dev_priv));drm_WARN_ON (&dev_priv->drm, - !IS_HSW_ULT (dev_priv) && !IS_BDW_ULT (dev_priv)); + !IS_HASWELL_ULT (dev_priv) && !IS_BDW_ULT (dev_priv));/* WPT is LPT compatible */ return PCH_LPT ;case INTEL_PCH_SPT_DEVICE_ID_TYPE :
@@ -186,7 +186,7 @@ intel_virt_detect_pch(const struct drm_i915_private *dev_priv, id =INTEL_PCH_CNP_DEVICE_ID_TYPE ; else if (IS_KABYLAKE(dev_priv) || IS_SKYLAKE(dev_priv)) id =INTEL_PCH_SPT_DEVICE_ID_TYPE ; - else if (IS_HSW_ULT(dev_priv) || IS_BDW_ULT(dev_priv)) + else if (IS_HASWELL_ULT(dev_priv) || IS_BDW_ULT(dev_priv)) id =INTEL_PCH_LPT_LP_DEVICE_ID_TYPE ; else if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv)) id =INTEL_PCH_LPT_DEVICE_ID_TYPE ;
Signature · 1 line
2.34.1
Re: [Intel-gfx] [PATCH v1 01/14] drm/i915/hsw: s/HSW/HASWELL for platform/subplatform defines
Quoted 14 lines
-----Original Message-----
From: Bhadane, Dnyaneshwar <[email protected]>
Sent: Wednesday, July 26, 2023 1:07 PM
To: [email protected]
Cc: Ursulin, Tvrtko <[email protected]>; [email protected]; Srivatsa, Anusha <[email protected]>; Atwood, Matthew S <[email protected]>; Roper, Matthew D <[email protected]>; Bhadane, Dnyaneshwar <[email protected]>
Subject: [PATCH v1 01/14] drm/i915/hsw: s/HSW/HASWELL for platform/subplatform defines
Quoted 3 lines
Follow consistent naming convention. Replace HSW with HASWELL.
Signed-off-by Dnyaneshwar Bhadane <[email protected]>
Quoted 238 lines
--- drivers/gpu/drm/i915/display/intel_cdclk.c | 2 +- drivers/gpu/drm/i915/display/intel_display.c | 2 +- drivers/gpu/drm/i915/display/intel_display_device.h | 2 +- drivers/gpu/drm/i915/display/intel_dp.c | 2 +- drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 2 +- drivers/gpu/drm/i915/display/intel_pch_refclk.c | 2 +- drivers/gpu/drm/i915/gt/intel_gt.c | 2 +- drivers/gpu/drm/i915/i915_driver.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 12 ++++++------ drivers/gpu/drm/i915/soc/intel_pch.c | 10 +++++----- 10 files changed, 19 insertions(+), 19 deletions(-)drivers/gpu/drm/i915/display/intel_cdclk.c +1
-1@@ -470,7 +470,7 @@ static void hsw_get_cdclk(struct drm_i915_private *dev_priv, cdclk_config->cdclk =450000 ; else if (freq == LCPLL_CLK_FREQ_450) cdclk_config->cdclk = 450000; - else if (IS_HSW_ULT(dev_priv)) + else if (IS_HASWELL_ULT(dev_priv)) cdclk_config->cdclk = 337500; elsedrivers/gpu/drm/i915/display/intel_cdclk.c +0
-0cdclk_config->cdclk =540000 ;drivers/gpu/drm/i915/display/intel_display.c +1
-1@@ -7377,7 +7377,7 @@ static bool intel_ddi_crt_present(struct drm_i915_private *dev_priv)if (DISPLAY_VER (dev_priv) >=9 )return false; -if (IS_HSW_ULT (dev_priv) ||IS_BDW_ULT (dev_priv)) +if (IS_HASWELL_ULT (dev_priv) ||IS_BDW_ULT (dev_priv))return false;drivers/gpu/drm/i915/display/intel_display.c +0
-0if (HAS_PCH_LPT_H(dev_priv) &&drivers/gpu/drm/i915/display/intel_display_device.h +1
-1@@ -54,7 +54,7 @@ struct drm_printer;#define HAS_GMCH (i915) (DISPLAY_INFO(i915)- >has_gmch)#define HAS_HW_SAGV_WM (i915) (DISPLAY_VER(i915) >= 13 && !IS_DGFX(i915))#define HAS_IPC (i915) (DISPLAY_INFO(i915)->has_ipc) -#define HAS_IPS (i915) (IS_HSW_ULT(i915) || IS_BROADWELL(i915)) +#define HAS_IPS (i915) (IS_HASWELL_ULT(i915) ||
IS_BROADWELL(i915))
#defineHAS_LSPCON(i915)(IS_DISPLAY_VER(i915, 9, 10))
#defineHAS_MBUS_JOINING(i915)(IS_ALDERLAKE_P(i915)||DISPLAY_VER(i915)>= 14)
#defineHAS_MSO(i915)(DISPLAY_VER(i915)>= 12)drivers/gpu/drm/i915/display/intel_dp.c +1
-1@@ -510,7 +510,7 @@ intel_dp_set_source_rates(struct intel_dp *intel_dp) }else if (DISPLAY_VER (dev_priv) ==9 ) { source_rates = skl_rates; size =ARRAY_SIZE (skl_rates); - }else if ((IS_HASWELL (dev_priv) && !IS_HSW_ULX (dev_priv)) || + }else if ((IS_HASWELL (dev_priv) && !IS_HASWELL_ULX (dev_priv)) ||IS_BROADWELL (dev_priv)) { source_rates = hsw_rates; size =ARRAY_SIZE (hsw_rates);drivers/gpu/drm/i915/display/intel_dpll_mgr.c +1
-1@@ -927,7 +927,7 @@ static int hsw_ddi_wrpll_get_freq(struct drm_i915_private *dev_priv, switch (wrpll & WRPLL_REF_MASK) {case WRPLL_REF_SPECIAL_HSW :/* Muxed-SSC for BDW, non-SSC for non-ULT HSW. */ -if (IS_HASWELL (dev_priv) && !IS_HSW_ULT (dev_priv)) { +if (IS_HASWELL (dev_priv) && !IS_HASWELL_ULT (dev_priv)) { refclk = dev_priv->display.dpll.ref_clks.nssc;break ;drivers/gpu/drm/i915/display/intel_dpll_mgr.c +0
-0}drivers/gpu/drm/i915/display/intel_pch_refclk.c +1
-1@@ -423,7 +423,7 @@ static bool wrpll_uses_pch_ssc(struct drm_i915_private *dev_priv, if ((ctl & WRPLL_REF_MASK) == WRPLL_REF_PCH_SSC)return true; -if ((IS_BROADWELL (dev_priv) ||IS_HSW_ULT (dev_priv)) && +if ((IS_BROADWELL (dev_priv) ||IS_HASWELL_ULT (dev_priv)) && (ctl &WRPLL_REF_MASK ) ==WRPLL_REF_MUXED_SSC_BDW && (fuse_strap &HSW_CPU_SSC_ENABLE ) ==0 )drivers/gpu/drm/i915/display/intel_pch_refclk.c +0
-0return true;drivers/gpu/drm/i915/gt/intel_gt.c +1
-1@@ -179,7 +179,7 @@ int intel_gt_init_hw(struct intel_gt *gt)if (IS_HASWELL (i915))intel_uncore_write (uncore,HSW_MI_PREDICATE_RESULT_2 , -IS_HSW_GT3 (i915) ? +IS_HASWELL_GT3 (i915) ?LOWER_SLICE_ENABLED :LOWER_SLICE_DISABLED );drivers/gpu/drm/i915/gt/intel_gt.c +0
-0/* Apply the GT workarounds... */ drivers/gpu/drm/i915/i915_driver.c +1
-1@@ -175,7 +175,7 @@ static void intel_detect_preproduction_hw(struct drm_i915_private *dev_priv) {bool pre = false; - pre |=IS_HSW_EARLY_SDV (dev_priv); + pre |=IS_HASWELL_EARLY_SDV (dev_priv); pre |=IS_SKYLAKE (dev_priv) &&INTEL_REVID (dev_priv) <0x6 ; pre |=IS_BROXTON (dev_priv) &&INTEL_REVID (dev_priv) <0xA ; pre |=IS_KABYLAKE (dev_priv) &&INTEL_REVID (dev_priv) <0x1 ; diff --git
a/drivers/gpu/drm/i915/i915_drv.hb/drivers/gpu/drm/i915/i915_drv.hindex682ef2b5c7d5..1003154ec71e100644drivers/gpu/drm/i915/i915_drv.h +1
-0@@ -592,7 +592,7 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,IS_SUBPLATFORM (i915,INTEL_ALDERLAKE_P , INTEL_SUBPLATFORM_RPL) #define IS_ADLP_RPLU(i915) \ IS_SUBPLATFORM(i915, INTEL_ALDERLAKE_P, INTEL_SUBPLATFORM_RPLU) -#define IS_HSW_EARLY_SDV(i915) (IS_HASWELL (i915) && \ +#define IS_HASWELL_EARLY_SDV(i915) (IS_HASWELL(i915) && \ (INTEL_DEVID(i915) & 0xFF00) == 0x0C00)#define
IS_BDW_ULT(i915)\
IS_SUBPLATFORM(i915,INTEL_BROADWELL,INTEL_SUBPLATFORM_ULT) @@ -600,14 +600,14 @@ IS_SUBPLATFORM(const structdrm_i915_private*i915,
IS_SUBPLATFORM(i915,INTEL_BROADWELL,INTEL_SUBPLATFORM_ULX)
#defineIS_BDW_GT3(i915)(IS_BROADWELL(i915)&& \drivers/gpu/drm/i915/i915_drv.h +4
-3INTEL_INFO(i915)->gt == 3) -#define IS_HSW_ULT (i915) \ +#define IS_HASWELL_ULT (i915) \ IS_SUBPLATFORM(i915, INTEL_HASWELL, INTEL_SUBPLATFORM_ULT) -#define IS_HSW_GT3 (i915) (IS_HASWELL(i915) && \ +#define IS_HASWELL_GT3 (i915) (IS_HASWELL(i915) && \ INTEL_INFO(i915)->gt == 3) -#define IS_HSW_GT1 (i915) (IS_HASWELL(i915) && \ +#define IS_HASWELL_GT1 (i915) (IS_HASWELL(i915) && \ INTEL_INFO(i915)->gt == 1) /* ULX machines are also considered ULT. */ -#define IS_HSW_ULX(i915) \ +#define IS_HASWELL_ULX(i915) \ IS_SUBPLATFORM(i915, INTEL_HASWELL, INTEL_SUBPLATFORM_ULX)#define
IS_SKL_ULT(i915)\drivers/gpu/drm/i915/i915_drv.h +1
-0IS_SUBPLATFORM (i915,INTEL_SKYLAKE ,INTEL_SUBPLATFORM_ULT )@@ -861,7 +861,7 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,/* DPF == dynamic parity feature */ #define HAS_L3_DPF (i915) (INTEL_INFO(i915)->has_l3_dpf) -#define NUM_L3_SLICES(i915) (IS_HSW_GT3(i915) ? \ +#define NUM_L3_SLICES(i915) (IS_HASWELL_GT3(i915) ? \ 2 : HAS_L3_DPF(i915)) /* Only valid when HAS_DISPLAY() is true */ diff --git
a/drivers/gpu/drm/i915/soc/intel_pch.cb/drivers/gpu/drm/i915/soc/intel_pch.cindexba9843cb1b13..bf829f85be7e100644drivers/gpu/drm/i915/soc/intel_pch.c +2
-2@@ -32,21 +32,21 @@ intel_pch_type(const struct drm_i915_private *dev_priv, unsigned short id) drm_WARN_ON(&dev_priv->drm, !IS_HASWELL (dev_priv) && !IS_BROADWELL(dev_priv));drm_WARN_ON (&dev_priv->drm, -IS_HSW_ULT (dev_priv) ||IS_BDW_ULT (dev_priv)); +IS_HASWELL_ULT (dev_priv) ||IS_BDW_ULT (dev_priv));return PCH_LPT ;case INTEL_PCH_LPT_LP_DEVICE_ID_TYPE :drm_dbg_kms (&dev_priv->drm,"Found LynxPoint LP PCH\n" );drm_WARN_ON (&dev_priv->drm, !IS_HASWELL (dev_priv) && !IS_BROADWELL (dev_priv));drm_WARN_ON (&dev_priv->drm, - !IS_HSW_ULT (dev_priv) && !IS_BDW_ULT (dev_priv)); + !IS_HASWELL_ULT (dev_priv) && !IS_BDW_ULT (dev_priv));return PCH_LPT ;case INTEL_PCH_WPT_DEVICE_ID_TYPE :drm_dbg_kms (&dev_priv->drm,"Found WildcatPoint PCH\n" ); drm_WARN_ON(&dev_priv->drm, !IS_HASWELL(dev_priv) &&!IS_BROADWELL(dev_priv));
drivers/gpu/drm/i915/soc/intel_pch.c +1
-1drm_WARN_ON(&dev_priv->drm, -IS_HSW_ULT (dev_priv) ||IS_BDW_ULT (dev_priv)); + IS_HASWELL_ULT(dev_priv) ||
IS_BDW_ULT(dev_priv));drivers/gpu/drm/i915/soc/intel_pch.c +1
-1/* WPT is LPT compatible */ return PCH_LPT ;case INTEL_PCH_WPT_LP_DEVICE_ID_TYPE :@@ -54,7 +54,7 @@ intel_pch_type(const struct drm_i915_private *dev_priv, unsigned short id) drm_WARN_ON(&dev_priv->drm, !IS_HASWELL (dev_priv) && !IS_BROADWELL(dev_priv));drm_WARN_ON (&dev_priv->drm, - !IS_HSW_ULT (dev_priv) && !IS_BDW_ULT (dev_priv)); + !IS_HASWELL_ULT (dev_priv) && !IS_BDW_ULT (dev_priv));drivers/gpu/drm/i915/soc/intel_pch.c +1
-1/* WPT is LPT compatible */ return PCH_LPT ;case INTEL_PCH_SPT_DEVICE_ID_TYPE :@@ -186,7 +186,7 @@ intel_virt_detect_pch(const struct drm_i915_private *dev_priv, id =INTEL_PCH_CNP_DEVICE_ID_TYPE ; else if (IS_KABYLAKE(dev_priv) || IS_SKYLAKE(dev_priv)) id =INTEL_PCH_SPT_DEVICE_ID_TYPE ; - else if (IS_HSW_ULT(dev_priv) || IS_BDW_ULT(dev_priv)) + else if (IS_HASWELL_ULT(dev_priv) || IS_BDW_ULT(dev_priv)) id =INTEL_PCH_LPT_LP_DEVICE_ID_TYPE ; else if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv))id =
INTEL_PCH_LPT_DEVICE_ID_TYPE;
--
2.34.1
PATCH 2/14 drm/i915/bdw: s/BDW/BROADWELL for platform/subplatform defines
In reply to Dnyaneshwar BhadaneFollow consistent naming convention. Replace BDW with BROADWELL.
--- drivers/gpu/drm/i915/display/intel_cdclk.c | 4 ++-- drivers/gpu/drm/i915/display/intel_display.c | 2 +- drivers/gpu/drm/i915/gt/intel_workarounds.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 6 +++--- drivers/gpu/drm/i915/soc/intel_pch.c | 10 +++++----- 5 files changed, 12 insertions(+), 12 deletions(-)
drivers/gpu/drm/i915/display/intel_cdclk.c +2 -2
@@ -3200,9 +3200,9 @@ void intel_update_max_cdclk(struct drm_i915_private *dev_priv)*/ if (intel_de_read (dev_priv,FUSE_STRAP ) &HSW_CDCLK_LIMIT ) dev_priv->display.cdclk.max_cdclk_freq =450000 ; -else if (IS_BDW_ULX (dev_priv)) +else if (IS_BROADWELL_ULX (dev_priv)) dev_priv->display.cdclk.max_cdclk_freq =450000 ; -else if (IS_BDW_ULT (dev_priv)) +else if (IS_BROADWELL_ULT (dev_priv)) dev_priv->display.cdclk.max_cdclk_freq =540000 ;else dev_priv->display.cdclk.max_cdclk_freq =675000 ;
drivers/gpu/drm/i915/display/intel_display.c +1 -1
@@ -7377,7 +7377,7 @@ static bool intel_ddi_crt_present(struct drm_i915_private *dev_priv)if (DISPLAY_VER (dev_priv) >=9 )return false; -if (IS_HASWELL_ULT (dev_priv) ||IS_BDW_ULT (dev_priv)) +if (IS_HASWELL_ULT (dev_priv) ||IS_BROADWELL_ULT (dev_priv))return false; if (HAS_PCH_LPT_H(dev_priv) &&
drivers/gpu/drm/i915/gt/intel_workarounds.c +1 -1
@@ -420,7 +420,7 @@ static void bdw_ctx_workarounds_init(struct intel_engine_cs *engine,/* WaForceContextSaveRestoreNonCoherent:bdw */ HDC_FORCE_CONTEXT_SAVE_RESTORE_NON_COHERENT |/* WaDisableFenceDestinationToSLM:bdw (pre-prod) */ - (IS_BDW_GT3(i915) ? HDC_FENCE_DEST_SLM_DISABLE : 0)); + (IS_BROADWELL_GT3(i915) ? HDC_FENCE_DEST_SLM_DISABLE : 0)); } static void chv_ctx_workarounds_init(struct intel_engine_cs *engine,
drivers/gpu/drm/i915/i915_drv.h +3 -3
@@ -594,11 +594,11 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, IS_SUBPLATFORM(i915, INTEL_ALDERLAKE_P, INTEL_SUBPLATFORM_RPLU)#define IS_HASWELL_EARLY_SDV (i915) (IS_HASWELL(i915) && \ (INTEL_DEVID(i915) & 0xFF00) == 0x0C00) -#define IS_BDW_ULT (i915) \ +#define IS_BROADWELL_ULT (i915) \ IS_SUBPLATFORM(i915, INTEL_BROADWELL, INTEL_SUBPLATFORM_ULT) -#define IS_BDW_ULX (i915) \ +#define IS_BROADWELL_ULX (i915) \ IS_SUBPLATFORM(i915, INTEL_BROADWELL, INTEL_SUBPLATFORM_ULX) -#define IS_BDW_GT3 (i915) (IS_BROADWELL(i915) && \ +#define IS_BROADWELL_GT3 (i915) (IS_BROADWELL(i915) && \ INTEL_INFO(i915)->gt == 3)#define IS_HASWELL_ULT (i915) \ IS_SUBPLATFORM(i915, INTEL_HASWELL, INTEL_SUBPLATFORM_ULT)
drivers/gpu/drm/i915/soc/intel_pch.c +5 -5
@@ -32,21 +32,21 @@ intel_pch_type(const struct drm_i915_private *dev_priv, unsigned short id)drm_WARN_ON (&dev_priv->drm, !IS_HASWELL (dev_priv) && !IS_BROADWELL (dev_priv));drm_WARN_ON (&dev_priv->drm, -IS_HASWELL_ULT (dev_priv) ||IS_BDW_ULT (dev_priv)); +IS_HASWELL_ULT (dev_priv) ||IS_BROADWELL_ULT (dev_priv));return PCH_LPT ;case INTEL_PCH_LPT_LP_DEVICE_ID_TYPE :drm_dbg_kms (&dev_priv->drm,"Found LynxPoint LP PCH\n" );drm_WARN_ON (&dev_priv->drm, !IS_HASWELL (dev_priv) && !IS_BROADWELL (dev_priv));drm_WARN_ON (&dev_priv->drm, - !IS_HASWELL_ULT (dev_priv) && !IS_BDW_ULT (dev_priv)); + !IS_HASWELL_ULT (dev_priv) && !IS_BROADWELL_ULT (dev_priv));return PCH_LPT ;case INTEL_PCH_WPT_DEVICE_ID_TYPE :drm_dbg_kms (&dev_priv->drm,"Found WildcatPoint PCH\n" );drm_WARN_ON (&dev_priv->drm, !IS_HASWELL (dev_priv) && !IS_BROADWELL (dev_priv));drm_WARN_ON (&dev_priv->drm, -IS_HASWELL_ULT (dev_priv) ||IS_BDW_ULT (dev_priv)); +IS_HASWELL_ULT (dev_priv) ||IS_BROADWELL_ULT (dev_priv));/* WPT is LPT compatible */ return PCH_LPT ;case INTEL_PCH_WPT_LP_DEVICE_ID_TYPE :
@@ -54,7 +54,7 @@ intel_pch_type(const struct drm_i915_private *dev_priv, unsigned short id)drm_WARN_ON (&dev_priv->drm, !IS_HASWELL (dev_priv) && !IS_BROADWELL (dev_priv));drm_WARN_ON (&dev_priv->drm, - !IS_HASWELL_ULT (dev_priv) && !IS_BDW_ULT (dev_priv)); + !IS_HASWELL_ULT (dev_priv) && !IS_BROADWELL_ULT (dev_priv));/* WPT is LPT compatible */ return PCH_LPT ;case INTEL_PCH_SPT_DEVICE_ID_TYPE :
@@ -186,7 +186,7 @@ intel_virt_detect_pch(const struct drm_i915_private *dev_priv, id =INTEL_PCH_CNP_DEVICE_ID_TYPE ; else if (IS_KABYLAKE(dev_priv) || IS_SKYLAKE(dev_priv)) id =INTEL_PCH_SPT_DEVICE_ID_TYPE ; - else if (IS_HASWELL_ULT(dev_priv) || IS_BDW_ULT(dev_priv)) + else if (IS_HASWELL_ULT(dev_priv) || IS_BROADWELL_ULT(dev_priv)) id =INTEL_PCH_LPT_LP_DEVICE_ID_TYPE ; else if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv)) id =INTEL_PCH_LPT_DEVICE_ID_TYPE ;
Signature · 1 line
2.34.1
Re: [Intel-gfx] [PATCH v1 02/14] drm/i915/bdw: s/BDW/BROADWELL for platform/subplatform defines
Quoted 14 lines
-----Original Message-----
From: Bhadane, Dnyaneshwar <[email protected]>
Sent: Wednesday, July 26, 2023 1:07 PM
To: [email protected]
Cc: Ursulin, Tvrtko <[email protected]>; [email protected]; Srivatsa, Anusha <[email protected]>; Atwood, Matthew S <[email protected]>; Roper, Matthew D <[email protected]>; Bhadane, Dnyaneshwar <[email protected]>
Subject: [PATCH v1 02/14] drm/i915/bdw: s/BDW/BROADWELL for platform/subplatform defines
Quoted 3 lines
Follow consistent naming convention. Replace BDW with BROADWELL.
Signed-off-by Dnyaneshwar Bhadane <[email protected]>
Thanks for the effort,
Quoted 144 lines
--- drivers/gpu/drm/i915/display/intel_cdclk.c | 4 ++-- drivers/gpu/drm/i915/display/intel_display.c | 2 +- drivers/gpu/drm/i915/gt/intel_workarounds.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 6 +++--- drivers/gpu/drm/i915/soc/intel_pch.c | 10 +++++----- 5 files changed, 12 insertions(+), 12 deletions(-)drivers/gpu/drm/i915/display/intel_cdclk.c +2
-2@@ -3200,9 +3200,9 @@ void intel_update_max_cdclk(struct drm_i915_private*dev_priv) */ if (intel_de_read (dev_priv,FUSE_STRAP ) &HSW_CDCLK_LIMIT ) dev_priv->display.cdclk.max_cdclk_freq =450000 ; -else if (IS_BDW_ULX (dev_priv)) +else if (IS_BROADWELL_ULX (dev_priv)) dev_priv->display.cdclk.max_cdclk_freq =450000 ; -else if (IS_BDW_ULT (dev_priv)) +else if (IS_BROADWELL_ULT (dev_priv)) dev_priv->display.cdclk.max_cdclk_freq =540000 ;else drivers/gpu/drm/i915/display/intel_cdclk.c +0
-1dev_priv->display.cdclk.max_cdclk_freq = 675000; diff - -git a/drivers/gpu/drm/i915/display/intel_display.c
b/drivers/gpu/drm/i915/display/intel_display.c
index6352c530bd7b..e401bcb234c2100644drivers/gpu/drm/i915/display/intel_display.c +1
-1@@ -7377,7 +7377,7 @@ static bool intel_ddi_crt_present(struct drm_i915_private *dev_priv)if (DISPLAY_VER (dev_priv) >=9 )return false; -if (IS_HASWELL_ULT (dev_priv) ||IS_BDW_ULT (dev_priv)) +if (IS_HASWELL_ULT (dev_priv) ||IS_BROADWELL_ULT (dev_priv))return false;drivers/gpu/drm/i915/display/intel_display.c +0
-0if (HAS_PCH_LPT_H(dev_priv) &&drivers/gpu/drm/i915/gt/intel_workarounds.c +1
-1@@ -420,7 +420,7 @@ static void bdw_ctx_workarounds_init(struct intel_engine_cs *engine,/* WaForceContextSaveRestoreNonCoherent:bdw */ HDC_FORCE_CONTEXT_SAVE_RESTORE_NON_COHERENT |/* WaDisableFenceDestinationToSLM:bdw (pre-prod) */ - (IS_BDW_GT3(i915) ? HDC_FENCE_DEST_SLM_DISABLE : 0)); + (IS_BROADWELL_GT3 (i915) ? HDC_FENCE_DEST_SLM_DISABLE : 0)); }static void chv_ctx_workarounds_init(struct
intel_engine_cs*engine, diff --gita/drivers/gpu/drm/i915/i915_drv.hb/drivers/gpu/drm/i915/i915_drv.hindex1003154ec71e..6607f233461a100644drivers/gpu/drm/i915/i915_drv.h +2
-0@@ -594,11 +594,11 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,IS_SUBPLATFORM (i915,INTEL_ALDERLAKE_P , INTEL_SUBPLATFORM_RPLU) #define IS_HASWELL_EARLY_SDV(i915) (IS_HASWELL(i915) && \ (INTEL_DEVID(i915) & 0xFF00) == 0x0C00) -#define IS_BDW_ULT (i915) \ +#define IS_BROADWELL_ULT(i915) \ IS_SUBPLATFORM(i915, INTEL_BROADWELL, INTEL_SUBPLATFORM_ULT) -#define IS_BDW_ULX(i915) \ +#define IS_BROADWELL_ULX(i915) \ IS_SUBPLATFORM(i915, INTEL_BROADWELL,
INTEL_SUBPLATFORM_ULX)drivers/gpu/drm/i915/i915_drv.h +1
-1-#define IS_BDW_GT3 (i915) (IS_BROADWELL(i915) && \ +#define IS_BROADWELL_GT3 (i915) (IS_BROADWELL(i915) && \ INTEL_INFO(i915)->gt == 3)#define IS_HASWELL_ULT (i915) \ IS_SUBPLATFORM(i915, INTEL_HASWELL, INTEL_SUBPLATFORM_ULT)drivers/gpu/drm/i915/soc/intel_pch.c +2
-2@@ -32,21 +32,21 @@ intel_pch_type(const struct drm_i915_private *dev_priv, unsigned short id) drm_WARN_ON(&dev_priv->drm, !IS_HASWELL (dev_priv) && !IS_BROADWELL(dev_priv));drm_WARN_ON (&dev_priv->drm, -IS_HASWELL_ULT (dev_priv) ||IS_BDW_ULT (dev_priv)); +IS_HASWELL_ULT (dev_priv) || IS_BROADWELL_ULT(dev_priv));return PCH_LPT ;case INTEL_PCH_LPT_LP_DEVICE_ID_TYPE :drm_dbg_kms (&dev_priv->drm,"Found LynxPoint LP PCH\n" );drm_WARN_ON (&dev_priv->drm, !IS_HASWELL (dev_priv) && !IS_BROADWELL (dev_priv));drm_WARN_ON (&dev_priv->drm, - !IS_HASWELL_ULT (dev_priv) && !IS_BDW_ULT (dev_priv)); + !IS_HASWELL_ULT (dev_priv) && !IS_BROADWELL_ULT(dev_priv));return PCH_LPT ;case INTEL_PCH_WPT_DEVICE_ID_TYPE :drm_dbg_kms (&dev_priv->drm,"Found WildcatPoint PCH\n" );drivers/gpu/drm/i915/soc/intel_pch.c +0
-0drm_WARN_ON(&dev_priv->drm, !IS_HASWELL(dev_priv) &&!IS_BROADWELL(dev_priv));
drivers/gpu/drm/i915/soc/intel_pch.c +0
-1drm_WARN_ON(&dev_priv->drm, - IS_HASWELL_ULT(dev_priv) ||
IS_BDW_ULT(dev_priv));drivers/gpu/drm/i915/soc/intel_pch.c +1
-0+ IS_HASWELL_ULT(dev_priv) ||
IS_BROADWELL_ULT(dev_priv));drivers/gpu/drm/i915/soc/intel_pch.c +1
-1/* WPT is LPT compatible */ return PCH_LPT ;case INTEL_PCH_WPT_LP_DEVICE_ID_TYPE :@@ -54,7 +54,7 @@ intel_pch_type(const struct drm_i915_private *dev_priv, unsigned short id) drm_WARN_ON(&dev_priv->drm, !IS_HASWELL (dev_priv) && !IS_BROADWELL(dev_priv));drm_WARN_ON (&dev_priv->drm, - !IS_HASWELL_ULT (dev_priv) && !IS_BDW_ULT (dev_priv)); + !IS_HASWELL_ULT(dev_priv) &&!IS_BROADWELL_ULT(dev_priv));
drivers/gpu/drm/i915/soc/intel_pch.c +1
-1/* WPT is LPT compatible */ return PCH_LPT ;case INTEL_PCH_SPT_DEVICE_ID_TYPE :@@ -186,7 +186,7 @@ intel_virt_detect_pch(const struct drm_i915_private *dev_priv, id =INTEL_PCH_CNP_DEVICE_ID_TYPE ; else if (IS_KABYLAKE(dev_priv) || IS_SKYLAKE(dev_priv)) id =INTEL_PCH_SPT_DEVICE_ID_TYPE ; - else if (IS_HASWELL_ULT(dev_priv) || IS_BDW_ULT(dev_priv)) + else if (IS_HASWELL_ULT(dev_priv) || IS_BROADWELL_ULT(dev_priv)) id =INTEL_PCH_LPT_LP_DEVICE_ID_TYPE ; else if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv))id =
INTEL_PCH_LPT_DEVICE_ID_TYPE;
--
2.34.1
PATCH v4 3/14 drm/i915/skl: s/SKL/SKYLAKE for platform/subplatform defines
In reply to Dnyaneshwar BhadaneFollow consistent naming convention. Replace SKL with SKYLAKE and Replace IS_SKL_GRAPHICS_STEP with IS_SKYLAKE() && IS_GRAPHICS_STEP().
v2:
- Change subject skl instead of SKL(Anusha)
v3:
- Unrolled wrapper IS_SKL_GRAPHICS_STEP.
- Replace with IS_PLATFORM && DISPLAY_STEP(tvrtko/jani)
v4:
- Removed the unused macro.
--- drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c | 4 ++-- drivers/gpu/drm/i915/gt/intel_workarounds.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 13 ++++++------- 3 files changed, 9 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c +2 -2
@@ -1746,9 +1746,9 @@ void intel_ddi_buf_trans_init(struct intel_encoder *encoder) encoder->get_buf_trans = kbl_u_get_buf_trans; }else if (IS_COMETLAKE (i915) ||IS_COFFEELAKE (i915) ||IS_KABYLAKE (i915)) { encoder->get_buf_trans = kbl_get_buf_trans; - }else if (IS_SKL_ULX (i915)) { + }else if (IS_SKYLAKE_ULX (i915)) { encoder->get_buf_trans = skl_y_get_buf_trans; - }else if (IS_SKL_ULT (i915)) { + }else if (IS_SKYLAKE_ULT (i915)) { encoder->get_buf_trans = skl_u_get_buf_trans; }else if (IS_SKYLAKE (i915)) { encoder->get_buf_trans = skl_get_buf_trans;
drivers/gpu/drm/i915/gt/intel_workarounds.c +1 -1
@@ -1192,7 +1192,7 @@ skl_gt_workarounds_init(struct intel_gt *gt, struct i915_wa_list *wal) GEN8_EU_GAUNIT_CLOCK_GATE_DISABLE);/* WaInPlaceDecompressionHang:skl */ -if (IS_SKL_GRAPHICS_STEP (gt->i915,STEP_A0 ,STEP_H0 )) +if (IS_SKYLAKE (gt->i915) &&IS_GRAPHICS_STEP (gt->i915,STEP_A0 ,STEP_H0 ))wa_write_or (wal,GEN9_GAMT_ECO_REG_RW_IA ,GAMT_ECO_ENABLE_IN_PLACE_DECOMPRESS );
drivers/gpu/drm/i915/i915_drv.h +6 -7
@@ -609,19 +609,19 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,/* ULX machines are also considered ULT. */ #define IS_HASWELL_ULX (i915) \ IS_SUBPLATFORM(i915, INTEL_HASWELL, INTEL_SUBPLATFORM_ULX) -#define IS_SKL_ULT (i915) \ +#define IS_SKYLAKE_ULT (i915) \ IS_SUBPLATFORM(i915, INTEL_SKYLAKE, INTEL_SUBPLATFORM_ULT) -#define IS_SKL_ULX (i915) \ +#define IS_SKYLAKE_ULX (i915) \ IS_SUBPLATFORM(i915, INTEL_SKYLAKE, INTEL_SUBPLATFORM_ULX)#define IS_KBL_ULT (i915) \ IS_SUBPLATFORM(i915, INTEL_KABYLAKE, INTEL_SUBPLATFORM_ULT)#define IS_KBL_ULX (i915) \ IS_SUBPLATFORM(i915, INTEL_KABYLAKE, INTEL_SUBPLATFORM_ULX) -#define IS_SKL_GT2 (i915) (IS_SKYLAKE(i915) && \ +#define IS_SKYLAKE_GT2 (i915) (IS_SKYLAKE(i915) && \ INTEL_INFO(i915)->gt == 2) -#define IS_SKL_GT3 (i915) (IS_SKYLAKE(i915) && \ +#define IS_SKYLAKE_GT3 (i915) (IS_SKYLAKE(i915) && \ INTEL_INFO(i915)->gt == 3) -#define IS_SKL_GT4 (i915) (IS_SKYLAKE(i915) && \ +#define IS_SKYLAKE_GT4 (i915) (IS_SKYLAKE(i915) && \ INTEL_INFO(i915)->gt == 4)#define IS_KBL_GT2 (i915) (IS_KABYLAKE(i915) && \ INTEL_INFO(i915)->gt == 2)
@@ -649,7 +649,6 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,#define IS_TGL_UY (i915) \ IS_SUBPLATFORM(i915, INTEL_TIGERLAKE, INTEL_SUBPLATFORM_UY) -#define IS_SKL_GRAPHICS_STEP (p, since, until) (IS_SKYLAKE(p) && IS_GRAPHICS_STEP(p, since, until))#define IS_KBL_GRAPHICS_STEP (i915, since, until) \ (IS_KABYLAKE(i915) && IS_GRAPHICS_STEP(i915, since, until))
@@ -800,7 +799,7 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,/* WaRsDisableCoarsePowerGating:skl,cnl */ #define NEEDS_WaRsDisableCoarsePowerGating (i915) \ - (IS_SKL_GT3(i915) || IS_SKL_GT4(i915)) + (IS_SKYLAKE_GT3(i915) || IS_SKYLAKE_GT4(i915))/* With the 945 and later, Y tiling got adjusted so that it was 32 128-byte * rows, which changed the alignment requirements and fence programming.
Signature · 1 line
2.34.1
Re: [Intel-gfx] [PATCH v4 03/14] drm/i915/skl: s/SKL/SKYLAKE for platform/subplatform defines
Quoted 26 lines
-----Original Message-----
From: Bhadane, Dnyaneshwar <[email protected]>
Sent: Wednesday, July 26, 2023 1:07 PM
To: [email protected]
Cc: Ursulin, Tvrtko <[email protected]>; [email protected]; Srivatsa, Anusha <[email protected]>; Atwood, Matthew S <[email protected]>; Roper, Matthew D <[email protected]>; Bhadane, Dnyaneshwar <[email protected]>; Srivatsa, Anusha <[email protected]>
Subject: [PATCH v4 03/14] drm/i915/skl: s/SKL/SKYLAKE for platform/subplatform definesFollow consistent naming convention. Replace SKL with SKYLAKE and Replace
IS_SKL_GRAPHICS_STEPwithIS_SKYLAKE()&&IS_GRAPHICS_STEP().v2:
- Change subject skl instead of SKL(Anusha)v3:
- Unrolled wrapperIS_SKL_GRAPHICS_STEP.
- Replace withIS_PLATFORM&&DISPLAY_STEP(tvrtko/jani)
Quoted 5 lines
v4:
- Removed the unused macro.Cc Anusha Srivatsa <[email protected]>Signed-off-by Dnyaneshwar Bhadane <[email protected]>
Quoted 91 lines
--- drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c | 4 ++-- drivers/gpu/drm/i915/gt/intel_workarounds.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 13 ++++++------- 3 files changed, 9 insertions(+), 10 deletions(-)drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c +2
-2@@ -1746,9 +1746,9 @@ void intel_ddi_buf_trans_init(struct intel_encoder *encoder) encoder->get_buf_trans = kbl_u_get_buf_trans; }else if (IS_COMETLAKE (i915) ||IS_COFFEELAKE (i915) ||IS_KABYLAKE (i915)) { encoder->get_buf_trans = kbl_get_buf_trans; - }else if (IS_SKL_ULX (i915)) { + }else if (IS_SKYLAKE_ULX (i915)) { encoder->get_buf_trans = skl_y_get_buf_trans; - }else if (IS_SKL_ULT (i915)) { + }else if (IS_SKYLAKE_ULT (i915)) { encoder->get_buf_trans = skl_u_get_buf_trans;drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c +0
-0}else if (IS_SKYLAKE (i915)) { encoder->get_buf_trans = skl_get_buf_trans; diff --git
a/drivers/gpu/drm/i915/gt/intel_workarounds.cb/drivers/gpu/drm/i915/gt/intel_workarounds.c
index9634ab8d738b..b0b7d448364a100644drivers/gpu/drm/i915/gt/intel_workarounds.c +2
-1@@ -1192,7 +1192,7 @@ skl_gt_workarounds_init(struct intel_gt *gt, struct i915_wa_list *wal) GEN8_EU_GAUNIT_CLOCK_GATE_DISABLE);/* WaInPlaceDecompressionHang:skl */ -if (IS_SKL_GRAPHICS_STEP (gt->i915,STEP_A0 ,STEP_H0 )) +if (IS_SKYLAKE (gt->i915) &&IS_GRAPHICS_STEP (gt->i915,STEP_A0 , +STEP_H0 ))wa_write_or (wal,GEN9_GAMT_ECO_REG_RW_IA ,GAMT_ECO_ENABLE_IN_PLACE_DECOMPRESS );drivers/gpu/drm/i915/i915_drv.h +5
-4@@ -609,19 +609,19 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,/* ULX machines are also considered ULT. */ #define IS_HASWELL_ULX (i915) \ IS_SUBPLATFORM(i915, INTEL_HASWELL, INTEL_SUBPLATFORM_ULX) -#define IS_SKL_ULT (i915) \ +#define IS_SKYLAKE_ULT(i915) \ IS_SUBPLATFORM(i915, INTEL_SKYLAKE, INTEL_SUBPLATFORM_ULT) -#define IS_SKL_ULX (i915) \ +#define IS_SKYLAKE_ULX(i915) \ IS_SUBPLATFORM(i915, INTEL_SKYLAKE, INTEL_SUBPLATFORM_ULX)#define IS_KBL_ULT (i915) \ IS_SUBPLATFORM(i915, INTEL_KABYLAKE, INTEL_SUBPLATFORM_ULT)#define IS_KBL_ULX (i915) \ IS_SUBPLATFORM(i915, INTEL_KABYLAKE, INTEL_SUBPLATFORM_ULX) -#define IS_SKL_GT2 (i915) (IS_SKYLAKE(i915) && \ +#define IS_SKYLAKE_GT2 (i915) (IS_SKYLAKE(i915) && \ INTEL_INFO(i915)->gt == 2) -#define IS_SKL_GT3 (i915) (IS_SKYLAKE(i915) && \ +#define IS_SKYLAKE_GT3 (i915) (IS_SKYLAKE(i915) && \ INTEL_INFO(i915)->gt == 3) -#define IS_SKL_GT4 (i915) (IS_SKYLAKE(i915) && \ +#define IS_SKYLAKE_GT4 (i915) (IS_SKYLAKE(i915) && \ INTEL_INFO(i915)->gt == 4)#define IS_KBL_GT2 (i915) (IS_KABYLAKE(i915) && \ INTEL_INFO(i915)->gt == 2)@@ -649,7 +649,6 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,#define IS_TGL_UY (i915) \ IS_SUBPLATFORM(i915, INTEL_TIGERLAKE, INTEL_SUBPLATFORM_UY) -#define IS_SKL_GRAPHICS_STEP (p, since, until) (IS_SKYLAKE(p) && IS_GRAPHICS_STEP(p, since, until))#define IS_KBL_GRAPHICS_STEP (i915, since, until) \(
IS_KABYLAKE(i915)&&IS_GRAPHICS_STEP(i915, since, until)) @@ -
800,7 +799,7 @@ IS_SUBPLATFORM(const structdrm_i915_private*i915,/* WaRsDisableCoarsePowerGating:skl,cnl */
#defineNEEDS_WaRsDisableCoarsePowerGating(i915)\drivers/gpu/drm/i915/i915_drv.h +1
-2- (IS_SKL_GT3 (i915) ||IS_SKL_GT4 (i915)) + (IS_SKYLAKE_GT3 (i915) ||IS_SKYLAKE_GT4 (i915))/* With the 945 and later, Y tiling got adjusted so that it was 32 128-byte * rows, which changed the alignment requirements and fence programming. -- 2.34.1
PATCH v4 4/14 drm/i915/kbl: s/KBL/KABYLAKE for platform/subplatform defines
In reply to Dnyaneshwar BhadaneFollow consistent naming convention. Replace KBL with KABYLAKE.Replace IS_KBL_GRAPHICS_STEP with IS_KABYLAKE () && IS_GRAPHICS_STEP().
v2:
- s/KBL/kbl in the subject prefix(Anusha)
v3:
- Unrolled wrapper IS_KBL_GRAPHICS_STEP.
- Replace with IS_PLATFORM && DISPLAY_STEP(tvrtko/jani)
v4:
- Removed unused macro.
--- drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c | 4 ++-- drivers/gpu/drm/i915/gt/gen8_engine_cs.c | 2 +- drivers/gpu/drm/i915/gt/intel_workarounds.c | 6 +++--- drivers/gpu/drm/i915/i915_drv.h | 12 ++++-------- drivers/gpu/drm/i915/intel_clock_gating.c | 4 ++-- 5 files changed, 12 insertions(+), 16 deletions(-)
drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c +2 -2
@@ -1740,9 +1740,9 @@ void intel_ddi_buf_trans_init(struct intel_encoder *encoder) encoder->get_buf_trans = icl_get_mg_buf_trans; }else if (IS_GEMINILAKE (i915) ||IS_BROXTON (i915)) { encoder->get_buf_trans = bxt_get_buf_trans; - }else if (IS_CML_ULX (i915) ||IS_CFL_ULX (i915) ||IS_KBL_ULX (i915)) { + }else if (IS_CML_ULX (i915) ||IS_CFL_ULX (i915) ||IS_KABYLAKE_ULX (i915)) { encoder->get_buf_trans = kbl_y_get_buf_trans; - }else if (IS_CML_ULT (i915) ||IS_CFL_ULT (i915) ||IS_KBL_ULT (i915)) { + }else if (IS_CML_ULT (i915) ||IS_CFL_ULT (i915) ||IS_KABYLAKE_ULT (i915)) { encoder->get_buf_trans = kbl_u_get_buf_trans; }else if (IS_COMETLAKE (i915) ||IS_COFFEELAKE (i915) ||IS_KABYLAKE (i915)) { encoder->get_buf_trans = kbl_get_buf_trans;
drivers/gpu/drm/i915/gt/gen8_engine_cs.c +1 -1
@@ -43,7 +43,7 @@ int gen8_emit_flush_rcs(struct i915_request *rq, u32 mode) vf_flush_wa = true;/* WaForGAMHang:kbl */ -if (IS_KBL_GRAPHICS_STEP (rq->i915,0 ,STEP_C0 )) +if (IS_KABYLAKE (rq->i915) &&IS_GRAPHICS_STEP (rq->i915,0 ,STEP_C0 )) dc_flush_wa = true; }
drivers/gpu/drm/i915/gt/intel_workarounds.c +3 -3
@@ -600,7 +600,7 @@ static void kbl_ctx_workarounds_init(struct intel_engine_cs *engine,gen9_ctx_workarounds_init (engine, wal);/* WaToEnableHwFixForPushConstHWBug:kbl */ -if (IS_KBL_GRAPHICS_STEP (i915,STEP_C0 ,STEP_FOREVER )) +if (IS_KABYLAKE (i915) &&IS_GRAPHICS_STEP (i915,STEP_C0 ,STEP_FOREVER ))wa_masked_en (wal,COMMON_SLICE_CHICKEN2 ,GEN8_SBE_DISABLE_REPLAY_BUF_OPTIMIZATION );
@@ -1204,7 +1204,7 @@ kbl_gt_workarounds_init(struct intel_gt *gt, struct i915_wa_list *wal)gen9_gt_workarounds_init (gt, wal);/* WaDisableDynamicCreditSharing:kbl */ -if (IS_KBL_GRAPHICS_STEP (gt->i915,0 ,STEP_C0 )) +if (IS_KABYLAKE (gt->i915) &&IS_GRAPHICS_STEP (gt->i915,0 ,STEP_C0 ))wa_write_or (wal,GAMT_CHKN_BIT_REG ,GAMT_CHKN_DISABLE_DYNAMIC_CREDIT_SHARING );
@@ -2945,7 +2945,7 @@ xcs_engine_wa_init(struct intel_engine_cs *engine, struct i915_wa_list *wal)struct drm_i915_private *i915 = engine->i915;/* WaKBLVECSSemaphoreWaitPoll:kbl */ -if (IS_KBL_GRAPHICS_STEP (i915,STEP_A0 ,STEP_F0 )) { +if (IS_KABYLAKE (i915) &&IS_GRAPHICS_STEP (i915,STEP_A0 ,STEP_F0 )) {wa_write (wal,RING_SEMA_WAIT_POLL (engine->mmio_base),1 );
drivers/gpu/drm/i915/i915_drv.h +4 -8
@@ -613,9 +613,9 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, IS_SUBPLATFORM(i915, INTEL_SKYLAKE, INTEL_SUBPLATFORM_ULT)#define IS_SKYLAKE_ULX (i915) \ IS_SUBPLATFORM(i915, INTEL_SKYLAKE, INTEL_SUBPLATFORM_ULX) -#define IS_KBL_ULT (i915) \ +#define IS_KABYLAKE_ULT (i915) \ IS_SUBPLATFORM(i915, INTEL_KABYLAKE, INTEL_SUBPLATFORM_ULT) -#define IS_KBL_ULX (i915) \ +#define IS_KABYLAKE_ULX (i915) \ IS_SUBPLATFORM(i915, INTEL_KABYLAKE, INTEL_SUBPLATFORM_ULX)#define IS_SKYLAKE_GT2 (i915) (IS_SKYLAKE(i915) && \ INTEL_INFO(i915)->gt == 2)
@@ -623,9 +623,9 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, INTEL_INFO(i915)->gt == 3)#define IS_SKYLAKE_GT4 (i915) (IS_SKYLAKE(i915) && \ INTEL_INFO(i915)->gt == 4) -#define IS_KBL_GT2 (i915) (IS_KABYLAKE(i915) && \ +#define IS_KABYLAKE_GT2 (i915) (IS_KABYLAKE(i915) && \ INTEL_INFO(i915)->gt == 2) -#define IS_KBL_GT3 (i915) (IS_KABYLAKE(i915) && \ +#define IS_KABYLAKE_GT3 (i915) (IS_KABYLAKE(i915) && \ INTEL_INFO(i915)->gt == 3)#define IS_CFL_ULT (i915) \ IS_SUBPLATFORM(i915, INTEL_COFFEELAKE, INTEL_SUBPLATFORM_ULT)
@@ -650,10 +650,6 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, IS_SUBPLATFORM(i915, INTEL_TIGERLAKE, INTEL_SUBPLATFORM_UY) -#define IS_KBL_GRAPHICS_STEP (i915, since, until) \ - (IS_KABYLAKE(i915) && IS_GRAPHICS_STEP(i915, since, until)) -#define IS_KBL_DISPLAY_STEP (i915, since, until) \ - (IS_KABYLAKE(i915) && IS_DISPLAY_STEP(i915, since, until))#define IS_JSL_EHL_GRAPHICS_STEP (p, since, until) \ (IS_JSL_EHL(p) && IS_GRAPHICS_STEP(p, since, until))
drivers/gpu/drm/i915/intel_clock_gating.c +2 -2
@@ -456,12 +456,12 @@ static void kbl_init_clock_gating(struct drm_i915_private *i915)intel_uncore_rmw (&i915->uncore,FBC_LLC_READ_CTRL ,0 ,FBC_LLC_FULLY_OPEN );/* WaDisableSDEUnitClockGating:kbl */ -if (IS_KBL_GRAPHICS_STEP (i915,0 ,STEP_C0 )) +if (IS_KABYLAKE (i915) &&IS_GRAPHICS_STEP (i915,0 ,STEP_C0 ))intel_uncore_rmw (&i915->uncore,GEN8_UCGCTL6 ,0 ,GEN8_SDEUNIT_CLOCK_GATE_DISABLE );/* WaDisableGamClockGating:kbl */ -if (IS_KBL_GRAPHICS_STEP (i915,0 ,STEP_C0 )) +if (IS_KABYLAKE (i915) &&IS_GRAPHICS_STEP (i915,0 ,STEP_C0 ))intel_uncore_rmw (&i915->uncore,GEN6_UCGCTL1 ,0 ,GEN6_GAMUNIT_CLOCK_GATE_DISABLE );
Signature · 1 line
2.34.1
PATCH v4 6/14 drm/i915/cml: s/CML/COMETLAKE for platform/subplatform defines
In reply to Dnyaneshwar BhadaneFollow consistent naming convention. Replace CML with COMETLAKE.
--- drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c | 4 ++-- drivers/gpu/drm/i915/i915_drv.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c +2 -2
@@ -1740,9 +1740,9 @@ void intel_ddi_buf_trans_init(struct intel_encoder *encoder) encoder->get_buf_trans = icl_get_mg_buf_trans; }else if (IS_GEMINILAKE (i915) ||IS_BROXTON (i915)) { encoder->get_buf_trans = bxt_get_buf_trans; - }else if (IS_CML_ULX (i915) ||IS_COFFEELAKE_ULX (i915) ||IS_KABYLAKE_ULX (i915)) { + }else if (IS_COMETLAKE_ULX (i915) ||IS_COFFEELAKE_ULX (i915) ||IS_KABYLAKE_ULX (i915)) { encoder->get_buf_trans = kbl_y_get_buf_trans; - }else if (IS_CML_ULT (i915) ||IS_COFFEELAKE_ULT (i915) ||IS_KABYLAKE_ULT (i915)) { + }else if (IS_COMETLAKE_ULT (i915) ||IS_COFFEELAKE_ULT (i915) ||IS_KABYLAKE_ULT (i915)) { encoder->get_buf_trans = kbl_u_get_buf_trans; }else if (IS_COMETLAKE (i915) ||IS_COFFEELAKE (i915) ||IS_KABYLAKE (i915)) { encoder->get_buf_trans = kbl_get_buf_trans;
drivers/gpu/drm/i915/i915_drv.h +3 -3
@@ -636,11 +636,11 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,#define IS_COFFEELAKE_GT3 (i915) (IS_COFFEELAKE(i915) && \ INTEL_INFO(i915)->gt == 3) -#define IS_CML_ULT (i915) \ +#define IS_COMETLAKE_ULT (i915) \ IS_SUBPLATFORM(i915, INTEL_COMETLAKE, INTEL_SUBPLATFORM_ULT) -#define IS_CML_ULX (i915) \ +#define IS_COMETLAKE_ULX (i915) \ IS_SUBPLATFORM(i915, INTEL_COMETLAKE, INTEL_SUBPLATFORM_ULX) -#define IS_CML_GT2 (i915) (IS_COMETLAKE(i915) && \ +#define IS_COMETLAKE_GT2 (i915) (IS_COMETLAKE(i915) && \ INTEL_INFO(i915)->gt == 2)#define IS_ICL_WITH_PORT_F (i915) \
Signature · 1 line
2.34.1
Re: [Intel-gfx] [PATCH v4 06/14] drm/i915/cml: s/CML/COMETLAKE for platform/subplatform defines
Quoted 14 lines
-----Original Message-----
From: Bhadane, Dnyaneshwar <[email protected]>
Sent: Wednesday, July 26, 2023 1:07 PM
To: [email protected]
Cc: Ursulin, Tvrtko <[email protected]>; [email protected]; Srivatsa, Anusha <[email protected]>; Atwood, Matthew S <[email protected]>; Roper, Matthew D <[email protected]>; Bhadane, Dnyaneshwar <[email protected]>
Subject: [PATCH v4 06/14] drm/i915/cml: s/CML/COMETLAKE for platform/subplatform defines
Quoted 3 lines
Follow consistent naming convention. Replace CML with COMETLAKE.
Signed-off-by Dnyaneshwar Bhadane <[email protected]>
Quoted 51 lines
--- drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c | 4 ++-- drivers/gpu/drm/i915/i915_drv.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-)drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c +4
-2@@ -1740,9 +1740,9 @@ void intel_ddi_buf_trans_init(struct intel_encoder *encoder) encoder->get_buf_trans = icl_get_mg_buf_trans; }else if (IS_GEMINILAKE (i915) ||IS_BROXTON (i915)) { encoder->get_buf_trans = bxt_get_buf_trans; - }else if (IS_CML_ULX (i915) ||IS_COFFEELAKE_ULX (i915) || IS_KABYLAKE_ULX(i915)) { + }else if (IS_COMETLAKE_ULX (i915) ||IS_COFFEELAKE_ULX (i915) || +IS_KABYLAKE_ULX (i915)) { encoder->get_buf_trans = kbl_y_get_buf_trans; - }else if (IS_CML_ULT (i915) ||IS_COFFEELAKE_ULT (i915) || IS_KABYLAKE_ULT(i915)) { + }else if (IS_COMETLAKE_ULT (i915) ||IS_COFFEELAKE_ULT (i915) || +IS_KABYLAKE_ULT (i915)) { encoder->get_buf_trans = kbl_u_get_buf_trans; } else if (IS_COMETLAKE(i915) || IS_COFFEELAKE(i915) ||
IS_KABYLAKE(i915)) {
encoder->get_buf_trans=kbl_get_buf_trans; diff --gita/drivers/gpu/drm/i915/i915_drv.hb/drivers/gpu/drm/i915/i915_drv.hindex04107696e966..e6f77498d46c100644drivers/gpu/drm/i915/i915_drv.h +3
-3@@ -636,11 +636,11 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,#define IS_COFFEELAKE_GT3 (i915) (IS_COFFEELAKE(i915) && \ INTEL_INFO(i915)->gt == 3) -#define IS_CML_ULT (i915) \ +#define IS_COMETLAKE_ULT (i915) \ IS_SUBPLATFORM(i915, INTEL_COMETLAKE, INTEL_SUBPLATFORM_ULT) -#define IS_CML_ULX(i915) \ +#define IS_COMETLAKE_ULX(i915) \ IS_SUBPLATFORM(i915, INTEL_COMETLAKE, INTEL_SUBPLATFORM_ULX) -#define IS_CML_GT2 (i915) (IS_COMETLAKE(i915) && \ +#define IS_COMETLAKE_GT2 (i915) (IS_COMETLAKE(i915) && \ INTEL_INFO(i915)->gt == 2)#define IS_ICL_WITH_PORT_F (i915) \ --2.34.1
PATCH 5/14 drm/i915/cfl: s/CFL/COFFEELAKE for platform/subplatform defines
In reply to Dnyaneshwar BhadaneFollow consistent naming convention. Replace CFL with COFFEELAKE.
--- drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c | 4 ++-- drivers/gpu/drm/i915/i915_drv.h | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c +2 -2
@@ -1740,9 +1740,9 @@ void intel_ddi_buf_trans_init(struct intel_encoder *encoder) encoder->get_buf_trans = icl_get_mg_buf_trans; }else if (IS_GEMINILAKE (i915) ||IS_BROXTON (i915)) { encoder->get_buf_trans = bxt_get_buf_trans; - }else if (IS_CML_ULX (i915) ||IS_CFL_ULX (i915) ||IS_KABYLAKE_ULX (i915)) { + }else if (IS_CML_ULX (i915) ||IS_COFFEELAKE_ULX (i915) ||IS_KABYLAKE_ULX (i915)) { encoder->get_buf_trans = kbl_y_get_buf_trans; - }else if (IS_CML_ULT (i915) ||IS_CFL_ULT (i915) ||IS_KABYLAKE_ULT (i915)) { + }else if (IS_CML_ULT (i915) ||IS_COFFEELAKE_ULT (i915) ||IS_KABYLAKE_ULT (i915)) { encoder->get_buf_trans = kbl_u_get_buf_trans; }else if (IS_COMETLAKE (i915) ||IS_COFFEELAKE (i915) ||IS_KABYLAKE (i915)) { encoder->get_buf_trans = kbl_get_buf_trans;
drivers/gpu/drm/i915/i915_drv.h +4 -4
@@ -627,13 +627,13 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, INTEL_INFO(i915)->gt == 2)#define IS_KABYLAKE_GT3 (i915) (IS_KABYLAKE(i915) && \ INTEL_INFO(i915)->gt == 3) -#define IS_CFL_ULT (i915) \ +#define IS_COFFEELAKE_ULT (i915) \ IS_SUBPLATFORM(i915, INTEL_COFFEELAKE, INTEL_SUBPLATFORM_ULT) -#define IS_CFL_ULX (i915) \ +#define IS_COFFEELAKE_ULX (i915) \ IS_SUBPLATFORM(i915, INTEL_COFFEELAKE, INTEL_SUBPLATFORM_ULX) -#define IS_CFL_GT2 (i915) (IS_COFFEELAKE(i915) && \ +#define IS_COFFEELAKE_GT2 (i915) (IS_COFFEELAKE(i915) && \ INTEL_INFO(i915)->gt == 2) -#define IS_CFL_GT3 (i915) (IS_COFFEELAKE(i915) && \ +#define IS_COFFEELAKE_GT3 (i915) (IS_COFFEELAKE(i915) && \ INTEL_INFO(i915)->gt == 3)#define IS_CML_ULT (i915) \
Signature · 1 line
2.34.1
Re: [Intel-gfx] [PATCH v1 05/14] drm/i915/cfl: s/CFL/COFFEELAKE for platform/subplatform defines
Quoted 14 lines
-----Original Message-----
From: Bhadane, Dnyaneshwar <[email protected]>
Sent: Wednesday, July 26, 2023 1:07 PM
To: [email protected]
Cc: Ursulin, Tvrtko <[email protected]>; [email protected]; Srivatsa, Anusha <[email protected]>; Atwood, Matthew S <[email protected]>; Roper, Matthew D <[email protected]>; Bhadane, Dnyaneshwar <[email protected]>
Subject: [PATCH v1 05/14] drm/i915/cfl: s/CFL/COFFEELAKE for platform/subplatform defines
Quoted 3 lines
Follow consistent naming convention. Replace CFL with COFFEELAKE.
Signed-off-by Dnyaneshwar Bhadane <[email protected]>
Quoted 54 lines
--- drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c | 4 ++-- drivers/gpu/drm/i915/i915_drv.h | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-)drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c +4
-2@@ -1740,9 +1740,9 @@ void intel_ddi_buf_trans_init(struct intel_encoder *encoder) encoder->get_buf_trans = icl_get_mg_buf_trans; }else if (IS_GEMINILAKE (i915) ||IS_BROXTON (i915)) { encoder->get_buf_trans = bxt_get_buf_trans; - }else if (IS_CML_ULX (i915) ||IS_CFL_ULX (i915) || IS_KABYLAKE_ULX(i915)) { + }else if (IS_CML_ULX (i915) ||IS_COFFEELAKE_ULX (i915) || +IS_KABYLAKE_ULX (i915)) { encoder->get_buf_trans = kbl_y_get_buf_trans; - }else if (IS_CML_ULT (i915) ||IS_CFL_ULT (i915) || IS_KABYLAKE_ULT(i915)) { + }else if (IS_CML_ULT (i915) ||IS_COFFEELAKE_ULT (i915) || +IS_KABYLAKE_ULT (i915)) { encoder->get_buf_trans = kbl_u_get_buf_trans; } else if (IS_COMETLAKE(i915) || IS_COFFEELAKE(i915) ||
IS_KABYLAKE(i915)) {
encoder->get_buf_trans=kbl_get_buf_trans; diff --gita/drivers/gpu/drm/i915/i915_drv.hb/drivers/gpu/drm/i915/i915_drv.hindexba075bb183db..04107696e966100644drivers/gpu/drm/i915/i915_drv.h +4
-4@@ -627,13 +627,13 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, INTEL_INFO(i915)->gt == 2)#define IS_KABYLAKE_GT3 (i915) (IS_KABYLAKE(i915) && \ INTEL_INFO(i915)->gt == 3) -#define IS_CFL_ULT (i915) \ +#define IS_COFFEELAKE_ULT (i915) \ IS_SUBPLATFORM(i915, INTEL_COFFEELAKE, INTEL_SUBPLATFORM_ULT) -#define IS_CFL_ULX(i915) \ +#define IS_COFFEELAKE_ULX(i915) \ IS_SUBPLATFORM(i915, INTEL_COFFEELAKE, INTEL_SUBPLATFORM_ULX) -#define IS_CFL_GT2 (i915) (IS_COFFEELAKE(i915) && \ +#define IS_COFFEELAKE_GT2 (i915) (IS_COFFEELAKE(i915) && \ INTEL_INFO(i915)->gt == 2) -#define IS_CFL_GT3 (i915) (IS_COFFEELAKE(i915) && \ +#define IS_COFFEELAKE_GT3 (i915) (IS_COFFEELAKE(i915) && \ INTEL_INFO(i915)->gt == 3)#define IS_CML_ULT (i915) \ --2.34.1
PATCH v4 8/14 drm/i915/jsl: s/JSL/JASPERLAKE for platform/subplatform defines
In reply to Dnyaneshwar BhadaneFollow consistent naming convention. Replace JSL with JASPERLAKE. Unroll IS_JSL_EHL() define with IS_JASPERLAKE() || IS_ELKHARTLAKE() condition. Change in the display step define for Jasperlake.
v2:
- Change subject prefix skl instead of SKL(Anusha)
v3:
- Remove the use of define IS_JSL_EHL.
- Replace with IS_JASPERLAKE() || IS_ELKHARTLAKE()
- Unrolled wrapper IS_JSL_ELK_DISPLAY_STEP
v4:
- Removed unused macro
--- drivers/gpu/drm/i915/display/icl_dsi.c | 5 ++-- drivers/gpu/drm/i915/display/intel_cdclk.c | 4 +-- .../gpu/drm/i915/display/intel_combo_phy.c | 7 +++-- drivers/gpu/drm/i915/display/intel_ddi.c | 7 +++-- drivers/gpu/drm/i915/display/intel_display.c | 5 ++-- drivers/gpu/drm/i915/display/intel_dp.c | 2 +- drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 29 +++++++++++-------- drivers/gpu/drm/i915/display/intel_hdmi.c | 3 +- drivers/gpu/drm/i915/display/intel_psr.c | 2 +- drivers/gpu/drm/i915/gem/i915_gem_object.c | 2 +- drivers/gpu/drm/i915/gt/intel_sseu.c | 2 +- drivers/gpu/drm/i915/gt/intel_workarounds.c | 3 +- drivers/gpu/drm/i915/i915_drv.h | 8 ++--- drivers/gpu/drm/i915/intel_step.c | 2 +- drivers/gpu/drm/i915/soc/intel_pch.c | 8 +++-- 15 files changed, 49 insertions(+), 40 deletions(-)
drivers/gpu/drm/i915/display/icl_dsi.c +3 -2
@@ -444,7 +444,8 @@ static void gen11_dsi_config_phy_lanes_sequence(struct intel_encoder *encoder)intel_de_write (dev_priv,ICL_PORT_TX_DW2_GRP (phy), tmp);/* For EHL, TGL, set latency optimization for PCS_DW1 lanes */ -if (IS_JSL_EHL (dev_priv) || (DISPLAY_VER (dev_priv) >=12 )) { +if (IS_JASPERLAKE (dev_priv) ||IS_ELKHARTLAKE (dev_priv) || + (DISPLAY_VER (dev_priv) >=12 )) {intel_de_rmw (dev_priv,ICL_PORT_PCS_DW1_AUX (phy),LATENCY_OPTIM_MASK ,LATENCY_OPTIM_VAL (0 ));
@@ -553,7 +554,7 @@ gen11_dsi_setup_dphy_timings(struct intel_encoder *encoder, } } -if (IS_JSL_EHL (dev_priv)) { +if (IS_JASPERLAKE (dev_priv) ||IS_ELKHARTLAKE (dev_priv)) {for_each_dsi_phy (phy, intel_dsi->phys)intel_de_rmw (dev_priv,ICL_DPHY_CHKN (phy),0 ,ICL_DPHY_CHKN_AFE_OVER_PPI_STRAP );
drivers/gpu/drm/i915/display/intel_cdclk.c +2 -2
@@ -3155,7 +3155,7 @@ static int intel_compute_max_dotclk(struct drm_i915_private *dev_priv)*/ void intel_update_max_cdclk (struct drm_i915_private *dev_priv) { -if (IS_JSL_EHL (dev_priv)) { +if (IS_JASPERLAKE (dev_priv) ||IS_ELKHARTLAKE (dev_priv)) {if (dev_priv->display.cdclk.hw.ref ==24000 ) dev_priv->display.cdclk.max_cdclk_freq =552000 ;else
@@ -3583,7 +3583,7 @@ void intel_init_cdclk_hooks(struct drm_i915_private *dev_priv) }else if (DISPLAY_VER (dev_priv) >=12 ) { dev_priv->display.funcs.cdclk = &tgl_cdclk_funcs; dev_priv->display.cdclk.table = icl_cdclk_table; - }else if (IS_JSL_EHL (dev_priv)) { + }else if (IS_JASPERLAKE (dev_priv) ||IS_ELKHARTLAKE (dev_priv)) { dev_priv->display.funcs.cdclk = &ehl_cdclk_funcs; dev_priv->display.cdclk.table = icl_cdclk_table; }else if (DISPLAY_VER (dev_priv) >=11 ) {
drivers/gpu/drm/i915/display/intel_combo_phy.c +4 -3
@@ -141,7 +141,7 @@ static bool has_phy_misc(struct drm_i915_private *i915, enum phy phy)if (IS_ALDERLAKE_S (i915))return phy ==PHY_A ; -else if (IS_JSL_EHL (i915) || +else if ((IS_JASPERLAKE (i915) ||IS_ELKHARTLAKE (i915)) ||IS_ROCKETLAKE (i915) ||IS_DG1 (i915))return phy <PHY_C ;
@@ -242,7 +242,7 @@ static bool icl_combo_phy_verify_state(struct drm_i915_private *dev_priv, ret &=check_phy_reg (dev_priv, phy,ICL_PORT_COMP_DW8 (phy),IREFGEN ,IREFGEN ); -if (IS_JSL_EHL (dev_priv)) { +if (IS_JASPERLAKE (dev_priv) ||IS_ELKHARTLAKE (dev_priv)) {if (ehl_vbt_ddi_d_present (dev_priv)) expected_val =ICL_PHY_MISC_MUX_DDID ;
@@ -333,7 +333,8 @@ static void icl_combo_phys_init(struct drm_i915_private *dev_priv)* "internal" child devices. */ val =intel_de_read (dev_priv,ICL_PHY_MISC (phy)); -if (IS_JSL_EHL (dev_priv) && phy ==PHY_A ) { +if ((IS_JASPERLAKE (dev_priv) ||IS_ELKHARTLAKE (dev_priv)) && + phy ==PHY_A ) { val &= ~ICL_PHY_MISC_MUX_DDID ;if (ehl_vbt_ddi_d_present (dev_priv))
drivers/gpu/drm/i915/display/intel_ddi.c +4 -3
@@ -3583,7 +3583,8 @@ void intel_ddi_compute_min_voltage_level(struct drm_i915_private *dev_priv, {if (DISPLAY_VER (dev_priv) >=12 && crtc_state->port_clock >594000 ) crtc_state->min_voltage_level =2 ; -else if (IS_JSL_EHL (dev_priv) && crtc_state->port_clock >594000 ) +else if ((IS_JASPERLAKE (dev_priv) ||IS_ELKHARTLAKE (dev_priv)) && + crtc_state->port_clock >594000 ) crtc_state->min_voltage_level =3 ;else if (DISPLAY_VER (dev_priv) >=11 && crtc_state->port_clock >594000 ) crtc_state->min_voltage_level =1 ;
@@ -4878,7 +4879,7 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, encoder->disable_clock = dg1_ddi_disable_clock; encoder->is_clock_enabled = dg1_ddi_is_clock_enabled; encoder->get_config = dg1_ddi_get_config; - }else if (IS_JSL_EHL (dev_priv)) { + }else if (IS_JASPERLAKE (dev_priv) ||IS_ELKHARTLAKE (dev_priv)) {if (intel_ddi_is_tc (dev_priv, port)) { encoder->enable_clock = jsl_ddi_tc_enable_clock; encoder->disable_clock = jsl_ddi_tc_disable_clock;
@@ -4949,7 +4950,7 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, encoder->hpd_pin =rkl_hpd_pin (dev_priv, port); else if (DISPLAY_VER(dev_priv) >= 12) encoder->hpd_pin = tgl_hpd_pin(dev_priv, port); - else if (IS_JSL_EHL(dev_priv)) + else if (IS_JASPERLAKE(dev_priv) || IS_ELKHARTLAKE(dev_priv)) encoder->hpd_pin = ehl_hpd_pin(dev_priv, port); else if (DISPLAY_VER(dev_priv) == 11) encoder->hpd_pin = icl_hpd_pin(dev_priv, port);
drivers/gpu/drm/i915/display/intel_display.c +3 -2
@@ -1749,7 +1749,7 @@ bool intel_phy_is_combo(struct drm_i915_private *dev_priv, enum phy phy)return phy <=PHY_E ; else if (IS_DG1(dev_priv) || IS_ROCKETLAKE(dev_priv)) return phy <= PHY_D; - else if (IS_JSL_EHL(dev_priv)) + else if (IS_JASPERLAKE(dev_priv) || IS_ELKHARTLAKE(dev_priv)) return phy <= PHY_C; else if (IS_ALDERLAKE_P(dev_priv) || IS_DISPLAY_VER(dev_priv, 11, 12)) return phy <= PHY_B;
@@ -1801,7 +1801,8 @@ enum phy intel_port_to_phy(struct drm_i915_private *i915, enum port port)return PHY_B + port -PORT_TC1 ; else if ((IS_DG1(i915) || IS_ROCKETLAKE(i915)) && port >= PORT_TC1)return PHY_C + port -PORT_TC1 ; - else if (IS_JSL_EHL(i915) && port == PORT_D) + else if ((IS_JASPERLAKE(i915) || IS_ELKHARTLAKE(i915)) && + port == PORT_D)return PHY_A ;return PHY_A + port -PORT_A ;
drivers/gpu/drm/i915/display/intel_dp.c +1 -1
@@ -500,7 +500,7 @@ intel_dp_set_source_rates(struct intel_dp *intel_dp)else if (IS_ALDERLAKE_P (dev_priv) ||IS_ALDERLAKE_S (dev_priv) ||IS_DG1 (dev_priv) ||IS_ROCKETLAKE (dev_priv)) max_rate =810000 ; -else if (IS_JSL_EHL (dev_priv)) +else if (IS_JASPERLAKE (dev_priv) ||IS_ELKHARTLAKE (dev_priv)) max_rate =ehl_max_source_rate (intel_dp);else max_rate =icl_max_source_rate (intel_dp);
drivers/gpu/drm/i915/display/intel_dpll_mgr.c +17 -12
@@ -191,7 +191,8 @@ intel_combo_pll_enable_reg(struct drm_i915_private *i915, {if (IS_DG1 (i915))return DG1_DPLL_ENABLE (pll->info->id); -else if (IS_JSL_EHL (i915) && (pll->info->id ==DPLL_ID_EHL_DPLL4 )) +else if ((IS_JASPERLAKE (i915) ||IS_ELKHARTLAKE (i915)) && + (pll->info->id ==DPLL_ID_EHL_DPLL4 ))return MG_PLL_ENABLE (0 );return ICL_DPLL_ENABLE (pll->info->id);
@@ -2460,8 +2461,8 @@ static void icl_wrpll_params_populate(struct skl_wrpll_params *params,static bool ehl_combo_pll_div_frac_wa_needed (struct drm_i915_private *i915) { -return ((IS_PLATFORM (i915,INTEL_ELKHARTLAKE ) && -IS_JSL_EHL_DISPLAY_STEP (i915,STEP_B0 ,STEP_FOREVER )) || +return (((IS_ELKHARTLAKE (i915) ||IS_JASPERLAKE (i915)) && +IS_DISPLAY_STEP (i915,STEP_B0 ,STEP_FOREVER )) ||IS_TIGERLAKE (i915) ||IS_ALDERLAKE_S (i915) ||IS_ALDERLAKE_P (i915)) && i915->display.dpll.ref_clks.nssc ==38400 ; }
@@ -3226,7 +3227,8 @@ static int icl_get_combo_phy_dpll(struct intel_atomic_state *state,BIT (DPLL_ID_EHL_DPLL4 ) |BIT (DPLL_ID_ICL_DPLL1 ) |BIT (DPLL_ID_ICL_DPLL0 ); - }else if (IS_JSL_EHL (dev_priv) && port !=PORT_A ) { + }else if ((IS_JASPERLAKE (dev_priv) ||IS_ELKHARTLAKE (dev_priv)) && + port !=PORT_A ) { dpll_mask =BIT (DPLL_ID_EHL_DPLL4 ) | BIT(DPLL_ID_ICL_DPLL1) |
@@ -3567,7 +3569,8 @@ static bool icl_pll_get_hw_state(struct drm_i915_private *dev_priv, hw_state->div0 &=TGL_DPLL0_DIV0_AFC_STARTUP_MASK ; } }else { -if (IS_JSL_EHL (dev_priv) && id ==DPLL_ID_EHL_DPLL4 ) { +if ((IS_JASPERLAKE (dev_priv) ||IS_ELKHARTLAKE (dev_priv)) && + id ==DPLL_ID_EHL_DPLL4 ) { hw_state->cfgcr0 =intel_de_read (dev_priv,ICL_DPLL_CFGCR0 (4 )); hw_state->cfgcr1 = intel_de_read(dev_priv,
@@ -3623,7 +3626,8 @@ static void icl_dpll_write(struct drm_i915_private *dev_priv, cfgcr1_reg =TGL_DPLL_CFGCR1 (id); div0_reg =TGL_DPLL0_DIV0 (id); }else { -if (IS_JSL_EHL (dev_priv) && id ==DPLL_ID_EHL_DPLL4 ) { +if ((IS_JASPERLAKE (dev_priv) ||IS_ELKHARTLAKE (dev_priv)) && + id ==DPLL_ID_EHL_DPLL4 ) { cfgcr0_reg =ICL_DPLL_CFGCR0 (4 ); cfgcr1_reg =ICL_DPLL_CFGCR1 (4 ); }else {
@@ -3806,8 +3810,8 @@ static void combo_pll_enable(struct drm_i915_private *dev_priv, {i915_reg_t enable_reg =intel_combo_pll_enable_reg (dev_priv, pll); -if (IS_JSL_EHL (dev_priv) && - pll->info->id ==DPLL_ID_EHL_DPLL4 ) { +if ((IS_JASPERLAKE (dev_priv) ||IS_ELKHARTLAKE (dev_priv)) && + pll->info->id ==DPLL_ID_EHL_DPLL4 ) {/* * We need to disable DC states when this DPLL is enabled.
@@ -3914,8 +3918,8 @@ static void combo_pll_disable(struct drm_i915_private *dev_priv,icl_pll_disable (dev_priv, pll, enable_reg); -if (IS_JSL_EHL (dev_priv) && - pll->info->id ==DPLL_ID_EHL_DPLL4 ) +if ((IS_JASPERLAKE (dev_priv) ||IS_ELKHARTLAKE (dev_priv)) && + pll->info->id ==DPLL_ID_EHL_DPLL4 )intel_display_power_put (dev_priv,POWER_DOMAIN_DC_OFF , pll->wakeref); }
@@ -4150,7 +4154,7 @@ void intel_shared_dpll_init(struct drm_i915_private *dev_priv) dpll_mgr = &rkl_pll_mgr; else if (DISPLAY_VER(dev_priv) >= 12) dpll_mgr = &tgl_pll_mgr; - else if (IS_JSL_EHL(dev_priv)) + else if (IS_JASPERLAKE(dev_priv) || IS_ELKHARTLAKE(dev_priv)) dpll_mgr = &ehl_pll_mgr; else if (DISPLAY_VER(dev_priv) >= 11) dpll_mgr = &icl_pll_mgr;
@@ -4335,7 +4339,8 @@ static void readout_dpll_hw_state(struct drm_i915_private *i915, pll->on =intel_dpll_get_hw_state (i915, pll, &pll->state.hw_state); -if (IS_JSL_EHL (i915) && pll->on && +if ((IS_JASPERLAKE (i915) ||IS_ELKHARTLAKE (i915)) && + pll->on && pll->info->id ==DPLL_ID_EHL_DPLL4 ) { pll->wakeref =intel_display_power_get (i915,POWER_DOMAIN_DC_OFF );
drivers/gpu/drm/i915/display/intel_hdmi.c +2 -1
@@ -2894,7 +2894,8 @@ static u8 intel_hdmi_default_ddc_pin(struct intel_encoder *encoder) ddc_pin =rkl_port_to_ddc_pin (dev_priv, port); else if (DISPLAY_VER(dev_priv) == 9 && HAS_PCH_TGP(dev_priv)) ddc_pin =gen9bc_tgp_port_to_ddc_pin (dev_priv, port); - else if (IS_JSL_EHL(dev_priv) && HAS_PCH_TGP(dev_priv)) + else if ((IS_JASPERLAKE(dev_priv) || IS_ELKHARTLAKE(dev_priv)) && + HAS_PCH_TGP(dev_priv)) ddc_pin = mcc_port_to_ddc_pin(dev_priv, port); else if (INTEL_PCH_TYPE(dev_priv) >= PCH_ICP) ddc_pin =icl_port_to_ddc_pin (dev_priv, port);
drivers/gpu/drm/i915/display/intel_psr.c +1 -1
@@ -1074,7 +1074,7 @@ static bool intel_psr2_config_valid(struct intel_dp *intel_dp,return false;/* JSL and EHL only supports eDP 1.3 */ -if (IS_JSL_EHL (dev_priv)) { +if (IS_JASPERLAKE (dev_priv) ||IS_ELKHARTLAKE (dev_priv)) {drm_dbg_kms (&dev_priv->drm,"PSR2 not supported by phy\n" );return false; }
drivers/gpu/drm/i915/gem/i915_gem_object.c +1 -1
@@ -226,7 +226,7 @@ bool i915_gem_object_can_bypass_llc(struct drm_i915_gem_object *obj)* it, but since i915 takes the stance of always zeroing memory before * handing it to userspace, we need to prevent this. */ -return IS_JSL_EHL (i915); +return (IS_JASPERLAKE (i915) ||IS_ELKHARTLAKE (i915)); }static void i915_gem_close_object (struct drm_gem_object *gem,struct drm_file *file)
drivers/gpu/drm/i915/gt/intel_sseu.c +1 -1
@@ -302,7 +302,7 @@ static void gen11_sseu_info_init(struct intel_gt *gt)u8 eu_en;u8 s_en; -if (IS_JSL_EHL (gt->i915)) +if (IS_JASPERLAKE (gt->i915) ||IS_ELKHARTLAKE (gt->i915))intel_sseu_set_info (sseu,1 ,4 ,8 );else intel_sseu_set_info (sseu,1 ,8 ,8 );
drivers/gpu/drm/i915/gt/intel_workarounds.c +2 -1
@@ -1460,7 +1460,8 @@ icl_gt_workarounds_init(struct intel_gt *gt, struct i915_wa_list *wal)/* Wa_1607087056:icl,ehl,jsl */ if (IS_ICELAKE (i915) || -IS_JSL_EHL_GRAPHICS_STEP (i915,STEP_A0 ,STEP_B0 )) + ((IS_JASPERLAKE (i915) ||IS_ELKHARTLAKE (i915)) && +IS_GRAPHICS_STEP (i915,STEP_A0 ,STEP_B0 )))wa_write_or (wal,GEN11_SLICE_UNIT_LEVEL_CLKGATE ,L3_CLKGATE_DIS |L3_CR2X_CLKGATE_DIS );
drivers/gpu/drm/i915/i915_drv.h +2 -6
@@ -562,8 +562,8 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,#define IS_COFFEELAKE (i915) IS_PLATFORM(i915, INTEL_COFFEELAKE)#define IS_COMETLAKE (i915) IS_PLATFORM(i915, INTEL_COMETLAKE)#define IS_ICELAKE (i915) IS_PLATFORM(i915, INTEL_ICELAKE) -#define IS_JSL_EHL (i915) (IS_PLATFORM(i915, INTEL_JASPERLAKE) || \ - IS_PLATFORM(i915, INTEL_ELKHARTLAKE)) +#define IS_JASPERLAKE (i915) IS_PLATFORM(i915, INTEL_JASPERLAKE) +#define IS_ELKHARTLAKE (i915) IS_PLATFORM(i915, INTEL_ELKHARTLAKE)#define IS_TIGERLAKE (i915) IS_PLATFORM(i915, INTEL_TIGERLAKE)#define IS_ROCKETLAKE (i915) IS_PLATFORM(i915, INTEL_ROCKETLAKE)#define IS_DG1 (i915) IS_PLATFORM(i915, INTEL_DG1)
@@ -651,10 +651,6 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, -#define IS_JSL_EHL_GRAPHICS_STEP (p, since, until) \ - (IS_JSL_EHL(p) && IS_GRAPHICS_STEP(p, since, until)) -#define IS_JSL_EHL_DISPLAY_STEP (p, since, until) \ - (IS_JSL_EHL(p) && IS_DISPLAY_STEP(p, since, until))#define IS_TGL_DISPLAY_STEP (__i915, since, until) \ (IS_TIGERLAKE(__i915) && \
drivers/gpu/drm/i915/intel_step.c +1 -1
@@ -219,7 +219,7 @@ void intel_step_init(struct drm_i915_private *i915) }else if (IS_TIGERLAKE (i915)) { revids = tgl_revids; size =ARRAY_SIZE (tgl_revids); - }else if (IS_JSL_EHL (i915)) { + }else if (IS_JASPERLAKE (i915) ||IS_ELKHARTLAKE (i915)) { revids = jsl_ehl_revids; size =ARRAY_SIZE (jsl_ehl_revids); }else if (IS_ICELAKE (i915)) {
drivers/gpu/drm/i915/soc/intel_pch.c +5 -3
@@ -115,7 +115,8 @@ intel_pch_type(const struct drm_i915_private *dev_priv, unsigned short id)return PCH_ICP ;case INTEL_PCH_MCC_DEVICE_ID_TYPE :drm_dbg_kms (&dev_priv->drm,"Found Mule Creek Canyon PCH\n" ); -drm_WARN_ON (&dev_priv->drm, !IS_JSL_EHL (dev_priv)); +drm_WARN_ON (&dev_priv->drm, !(IS_JASPERLAKE (dev_priv) || +IS_ELKHARTLAKE (dev_priv)));/* MCC is TGP compatible */ return PCH_TGP ;case INTEL_PCH_TGP_DEVICE_ID_TYPE :
@@ -127,7 +128,8 @@ intel_pch_type(const struct drm_i915_private *dev_priv, unsigned short id)return PCH_TGP ;case INTEL_PCH_JSP_DEVICE_ID_TYPE :drm_dbg_kms (&dev_priv->drm,"Found Jasper Lake PCH\n" ); -drm_WARN_ON (&dev_priv->drm, !IS_JSL_EHL (dev_priv)); +drm_WARN_ON (&dev_priv->drm, !(IS_JASPERLAKE (dev_priv) || +IS_ELKHARTLAKE (dev_priv)));/* JSP is ICP compatible */ return PCH_ICP ;case INTEL_PCH_ADP_DEVICE_ID_TYPE :
@@ -177,7 +179,7 @@ intel_virt_detect_pch(const struct drm_i915_private *dev_priv, id =INTEL_PCH_ADP_DEVICE_ID_TYPE ; else if (IS_TIGERLAKE(dev_priv) || IS_ROCKETLAKE(dev_priv)) id =INTEL_PCH_TGP_DEVICE_ID_TYPE ; - else if (IS_JSL_EHL(dev_priv)) + else if (IS_JASPERLAKE(dev_priv) || IS_ELKHARTLAKE(dev_priv)) id =INTEL_PCH_MCC_DEVICE_ID_TYPE ; else if (IS_ICELAKE(dev_priv)) id =INTEL_PCH_ICP_DEVICE_ID_TYPE ;
Signature · 1 line
2.34.1
PATCH v3 7/14 drm/i915/rkl: s/RKL/ROCKETLAKE for platform/subplatform defines
In reply to Dnyaneshwar BhadaneFollow consistent naming convention. Replace RKL with ROCKETLAKE.Replace IS_RKL_GRAPHICS_STEP with IS_ROCKETLAKE && IS_DISPLAY_STEP.
v2:
- s/RKL/rkl in the subject prefix(Anusha)
v3:
- Unrolled wrapper IS_RKL_DISPLAY_STEP.
- Replace IS_PLATFORM && IS_DISPLAY_STEP (Jani/Tvrtko)
--- drivers/gpu/drm/i915/display/intel_display_power.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-)
drivers/gpu/drm/i915/display/intel_display_power.c +1 -1
@@ -1609,7 +1609,7 @@ static void tgl_bw_buddy_init(struct drm_i915_private *dev_priv)return ;if (IS_ALDERLAKE_S (dev_priv) || -IS_RKL_DISPLAY_STEP (dev_priv,STEP_A0 ,STEP_B0 )) + (IS_ROCKETLAKE (dev_priv) &&IS_DISPLAY_STEP (dev_priv,STEP_A0 ,STEP_B0 )))/* Wa_1409767108 */ table = wa_1409767108_buddy_page_masks;else
drivers/gpu/drm/i915/i915_drv.h +0 -2
@@ -660,8 +660,6 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, (IS_TIGERLAKE (__i915) && \ IS_DISPLAY_STEP(__i915, since, until)) -#define IS_RKL_DISPLAY_STEP (p, since, until) \ - (IS_ROCKETLAKE(p) && IS_DISPLAY_STEP(p, since, until))#define IS_ADLS_DISPLAY_STEP (__i915, since, until) \ (IS_ALDERLAKE_S(__i915) && \
Signature · 1 line
2.34.1
Re: [Intel-gfx] [PATCH v3 07/14] drm/i915/rkl: s/RKL/ROCKETLAKE for platform/subplatform defines
Quoted 21 lines
-----Original Message-----
From: Bhadane, Dnyaneshwar <[email protected]>
Sent: Wednesday, July 26, 2023 1:07 PM
To: [email protected]
Cc: Ursulin, Tvrtko <[email protected]>; [email protected]; Srivatsa, Anusha <[email protected]>; Atwood, Matthew S <[email protected]>; Roper, Matthew D <[email protected]>; Bhadane, Dnyaneshwar <[email protected]>; Srivatsa, Anusha <[email protected]>
Subject: [PATCH v3 07/14] drm/i915/rkl: s/RKL/ROCKETLAKE for platform/subplatform definesFollow consistent naming convention. Replace RKL with ROCKETLAKE.Replace
IS_RKL_GRAPHICS_STEPwithIS_ROCKETLAKE&&IS_DISPLAY_STEP.v2:
- s/RKL/rkl in the subject prefix(Anusha)
Quoted 8 lines
v3:
- Unrolled wrapperIS_RKL_DISPLAY_STEP.
- ReplaceIS_PLATFORM&&IS_DISPLAY_STEP(Jani/Tvrtko)Cc Tvrtko Ursulin <[email protected]>Cc Jani Nikula <[email protected]>Cc Anusha Srivatsa <[email protected]>Signed-off-by Dnyaneshwar Bhadane <[email protected]>
Quoted 36 lines
--- drivers/gpu/drm/i915/display/intel_display_power.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-)drivers/gpu/drm/i915/display/intel_display_power.c +2
-1@@ -1609,7 +1609,7 @@ static void tgl_bw_buddy_init(struct drm_i915_private *dev_priv) return;if (IS_ALDERLAKE_S (dev_priv) || -IS_RKL_DISPLAY_STEP (dev_priv,STEP_A0 ,STEP_B0 )) + (IS_ROCKETLAKE (dev_priv) &&IS_DISPLAY_STEP (dev_priv,STEP_A0 , +STEP_B0 )))/* Wa_1409767108 */ table = wa_1409767108_buddy_page_masks;else drivers/gpu/drm/i915/i915_drv.h +0
-3@@ -660,8 +660,6 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, (IS_TIGERLAKE (__i915) && \ IS_DISPLAY_STEP(__i915, since, until)) -#define IS_RKL_DISPLAY_STEP (p, since, until) \ - (IS_ROCKETLAKE(p) && IS_DISPLAY_STEP(p, since, until))#define IS_ADLS_DISPLAY_STEP (__i915, since, until) \ (IS_ALDERLAKE_S(__i915) && \ --2.34.1
PATCH v2 11/14 drm/i915/rplp: s/ADLP_RPLP/RAPTORLAKE_P for RPLP defines
In reply to Dnyaneshwar BhadaneFollow consistent naming convention. Replace ADLP with ALDERLAKE_P.
v2:
- Replace IS_ADLP_RPLP with IS_RAPTORLAKE_P. (Tvrtko/Lucas)
- Change the subject
--- drivers/gpu/drm/i915/i915_drv.h | 2 +- drivers/gpu/drm/i915/intel_step.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +1 -1
@@ -588,7 +588,7 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, IS_SUBPLATFORM(i915, INTEL_ALDERLAKE_S, INTEL_SUBPLATFORM_RPL)#define IS_ADLP_N (i915) \ IS_SUBPLATFORM(i915, INTEL_ALDERLAKE_P, INTEL_SUBPLATFORM_N) -#define IS_ADLP_RPLP (i915) \ +#define IS_RAPTORLAKE_P (i915) \ IS_SUBPLATFORM(i915, INTEL_ALDERLAKE_P, INTEL_SUBPLATFORM_RPL)#define IS_ADLP_RPLU (i915) \ IS_SUBPLATFORM(i915, INTEL_ALDERLAKE_P, INTEL_SUBPLATFORM_RPLU)
drivers/gpu/drm/i915/intel_step.c +1 -1
@@ -195,7 +195,7 @@ void intel_step_init(struct drm_i915_private *i915) }else if (IS_ADLP_N (i915)) { revids = adlp_n_revids; size =ARRAY_SIZE (adlp_n_revids); - }else if (IS_ADLP_RPLP (i915)) { + }else if (IS_RAPTORLAKE_P (i915)) { revids = adlp_rplp_revids; size =ARRAY_SIZE (adlp_rplp_revids); }else if (IS_ALDERLAKE_P (i915)) {
Signature · 1 line
2.34.1
Re: [Intel-gfx] [PATCH v2 11/14] drm/i915/rplp: s/ADLP_RPLP/RAPTORLAKE_P for RPLP defines
Quoted 17 lines
-----Original Message-----
From: Bhadane, Dnyaneshwar <[email protected]>
Sent: Wednesday, July 26, 2023 1:07 PM
To: [email protected]
Cc: Ursulin, Tvrtko <[email protected]>; [email protected]; Srivatsa, Anusha <[email protected]>; Atwood, Matthew S <[email protected]>; Roper, Matthew D <[email protected]>; Bhadane, Dnyaneshwar <[email protected]>; Srivatsa, Anusha <[email protected]>
Subject: [PATCH v2 11/14] drm/i915/rplp: s/ADLP_RPLP/RAPTORLAKE_P for RPLP definesFollow consistent naming convention. Replace ADLP with
ALDERLAKE_P.
Quoted 8 lines
v2:
- ReplaceIS_ADLP_RPLPwithIS_RAPTORLAKE_P. (Tvrtko/Lucas)
- Change the subjectCc Tvrtko Ursulin <[email protected]>Cc Jani Nikula <[email protected]>Cc Anusha Srivatsa <[email protected]>Signed-off-by Dnyaneshwar Bhadane <[email protected]>
Quoted 34 lines
--- drivers/gpu/drm/i915/i915_drv.h | 2 +- drivers/gpu/drm/i915/intel_step.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/i915_drv.h +1
-0@@ -588,7 +588,7 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,IS_SUBPLATFORM (i915,INTEL_ALDERLAKE_S , INTEL_SUBPLATFORM_RPL) #define IS_ADLP_N(i915) \ IS_SUBPLATFORM(i915, INTEL_ALDERLAKE_P, INTEL_SUBPLATFORM_N) -#define IS_ADLP_RPLP(i915) \ +#define IS_RAPTORLAKE_P(i915) \ IS_SUBPLATFORM(i915, INTEL_ALDERLAKE_P, INTEL_SUBPLATFORM_RPL) #define IS_ADLP_RPLU(i915) \ IS_SUBPLATFORM(i915, INTEL_ALDERLAKE_P,
INTEL_SUBPLATFORM_RPLU) diff --gita/drivers/gpu/drm/i915/intel_step.cb/drivers/gpu/drm/i915/intel_step.c
index4ca22d0c945b..7601122765b7100644drivers/gpu/drm/i915/intel_step.c +1
-2@@ -195,7 +195,7 @@ void intel_step_init(struct drm_i915_private *i915) }else if (IS_ADLP_N (i915)) { revids = adlp_n_revids; size =ARRAY_SIZE (adlp_n_revids); - }else if (IS_ADLP_RPLP (i915)) { + }else if (IS_RAPTORLAKE_P (i915)) { revids = adlp_rplp_revids; size =ARRAY_SIZE (adlp_rplp_revids); }else if (IS_ALDERLAKE_P (i915)) { --2.34.1
PATCH v3 10/14 drm/i915/adlp: s/ADLP/ALDERLAKE_P for display and graphics step
In reply to Dnyaneshwar BhadaneDriver refers to the platform Alderlake P as ADLP in places and ALDERLAKE_P in some. Making the consistent change to avoid confusion of the right naming convention for the platform.
v2:
- Unrolled wrapper IS_ADLP_GRAPHICS_STEP and Replace
- Added IS_ALDERLAKE_P() && IS_GRAPHICS_STEP() (Jani/Tvrtko).
v3:
- Removed unused macros of display steps.
--- drivers/gpu/drm/i915/display/intel_cdclk.c | 2 +- drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 2 +- drivers/gpu/drm/i915/display/intel_psr.c | 8 ++++---- drivers/gpu/drm/i915/display/skl_universal_plane.c | 4 ++-- drivers/gpu/drm/i915/i915_drv.h | 7 ------- 5 files changed, 8 insertions(+), 15 deletions(-)
drivers/gpu/drm/i915/display/intel_cdclk.c +1 -1
@@ -3567,7 +3567,7 @@ void intel_init_cdclk_hooks(struct drm_i915_private *dev_priv) dev_priv->display.cdclk.table = dg2_cdclk_table; }else if (IS_ALDERLAKE_P (dev_priv)) {/* Wa_22011320316:adl-p[a0] */ -if (IS_ADLP_DISPLAY_STEP (dev_priv,STEP_A0 ,STEP_B0 )) { +if (IS_ALDERLAKE_P (dev_priv) &&IS_DISPLAY_STEP (dev_priv,STEP_A0 ,STEP_B0 )) { dev_priv->display.cdclk.table = adlp_a_step_cdclk_table; dev_priv->display.funcs.cdclk = &tgl_cdclk_funcs; }else if (IS_ADLP_RPLU (dev_priv)) {
drivers/gpu/drm/i915/display/intel_dpll_mgr.c +1 -1
@@ -3785,7 +3785,7 @@ static void adlp_cmtg_clock_gating_wa(struct drm_i915_private *i915, struct inte {u32 val; -if (!IS_ADLP_DISPLAY_STEP (i915,STEP_A0 ,STEP_B0 ) || +if (!(IS_ALDERLAKE_P (i915) &&IS_DISPLAY_STEP (i915,STEP_A0 ,STEP_B0 )) || pll->info->id !=DPLL_ID_ICL_DPLL0 )return ;/*
drivers/gpu/drm/i915/display/intel_psr.c +4 -4
@@ -748,7 +748,7 @@ static void hsw_activate_psr2(struct intel_dp *intel_dp) }/* Wa_22012278275:adl-p */ -if (IS_ADLP_DISPLAY_STEP (dev_priv,STEP_A0 ,STEP_E0 )) { +if (IS_ALDERLAKE_P (dev_priv) &&IS_DISPLAY_STEP (dev_priv,STEP_A0 ,STEP_E0 )) {static const u8 map[] = {2 ,/* 5 lines */ 1 ,/* 6 lines */
@@ -918,7 +918,7 @@ tgl_dc3co_exitline_compute_config(struct intel_dp *intel_dp,return ;/* Wa_16011303918:adl-p */ -if (IS_ADLP_DISPLAY_STEP (dev_priv,STEP_A0 ,STEP_B0 )) +if (IS_ALDERLAKE_P (dev_priv) &&IS_DISPLAY_STEP (dev_priv,STEP_A0 ,STEP_B0 ))return ;/*
@@ -1086,7 +1086,7 @@ static bool intel_psr2_config_valid(struct intel_dp *intel_dp,return false; } -if (IS_ADLP_DISPLAY_STEP (dev_priv,STEP_A0 ,STEP_B0 )) { +if (IS_ALDERLAKE_P (dev_priv) &&IS_DISPLAY_STEP (dev_priv,STEP_A0 ,STEP_B0 )) {drm_dbg_kms (&dev_priv->drm,"PSR2 not completely functional in this stepping\n" );return false; }
@@ -1144,7 +1144,7 @@ static bool intel_psr2_config_valid(struct intel_dp *intel_dp,/* Wa_16011303918:adl-p */ if (crtc_state->vrr.enable && -IS_ADLP_DISPLAY_STEP (dev_priv,STEP_A0 ,STEP_B0 )) { +IS_ALDERLAKE_P (dev_priv) &&IS_DISPLAY_STEP (dev_priv,STEP_A0 ,STEP_B0 )) {drm_dbg_kms (&dev_priv->drm,"PSR2 not enabled, not compatible with HW stepping + VRR\n" );return false;
drivers/gpu/drm/i915/display/skl_universal_plane.c +2 -2
@@ -2174,7 +2174,7 @@ static bool skl_plane_has_rc_ccs(struct drm_i915_private *i915,return false;/* Wa_22011186057 */ -if (IS_ADLP_DISPLAY_STEP (i915,STEP_A0 ,STEP_B0 )) +if (IS_ALDERLAKE_P (i915) &&IS_DISPLAY_STEP (i915,STEP_A0 ,STEP_B0 ))return false;if (DISPLAY_VER (i915) >=11 )
@@ -2200,7 +2200,7 @@ static bool gen12_plane_has_mc_ccs(struct drm_i915_private *i915,return false;/* Wa_22011186057 */ -if (IS_ADLP_DISPLAY_STEP (i915,STEP_A0 ,STEP_B0 )) +if (IS_ALDERLAKE_P (i915) &&IS_DISPLAY_STEP (i915,STEP_A0 ,STEP_B0 ))return false;/* Wa_14013215631 */
drivers/gpu/drm/i915/i915_drv.h +0 -7
@@ -662,13 +662,6 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, (IS_ALDERLAKE_S (__i915) && \ IS_GRAPHICS_STEP(__i915, since, until)) -#define IS_ADLP_DISPLAY_STEP (__i915, since, until) \ - (IS_ALDERLAKE_P(__i915) && \ - IS_DISPLAY_STEP(__i915, since, until)) - -#define IS_ADLP_GRAPHICS_STEP (__i915, since, until) \ - (IS_ALDERLAKE_P(__i915) && \ - IS_GRAPHICS_STEP(__i915, since, until))#define IS_XEHPSDV_GRAPHICS_STEP (__i915, since, until) \ (IS_XEHPSDV(__i915) && IS_GRAPHICS_STEP(__i915, since, until))
Signature · 1 line
2.34.1
PATCH v4 9/14 drm/i915/tgl: s/TGL/TIGERLAKE for platform/subplatform defines
In reply to Dnyaneshwar BhadaneFollow consistent naming convention. Replace TGL with TIGERLAKE.Replace IS_TGL_DISPLAY_STEP with IS_TIGERLAKE() && IS_DISPLAY_STEP().
v2:
- s/TGL/tgl in the subject prefix(Anusha)
v3:
- Unrolled wrapper IS_TGL_DISPLAY_STEP and Replace
- Replace IS_PLATFORM && DISPLAY_STEP (Jani/Tvrtko).
v4:
- Removed unused macros
--- drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c | 2 +- drivers/gpu/drm/i915/display/skl_universal_plane.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 5 +---- drivers/gpu/drm/i915/intel_step.c | 2 +- 4 files changed, 4 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c +1 -1
@@ -1410,7 +1410,7 @@ tgl_get_combo_buf_trans_dp(struct intel_encoder *encoder,struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);if (crtc_state->port_clock >270000 ) { -if (IS_TGL_UY (dev_priv)) { +if (IS_TIGERLAKE_UY (dev_priv)) {return intel_get_buf_trans (&tgl_uy_combo_phy_trans_dp_hbr2, n_entries); }else {
drivers/gpu/drm/i915/display/skl_universal_plane.c +1 -1
@@ -2196,7 +2196,7 @@ static bool gen12_plane_has_mc_ccs(struct drm_i915_private *i915,/* Wa_14010477008 */ if (IS_DG1 (i915) ||IS_ROCKETLAKE (i915) || -IS_TGL_DISPLAY_STEP (i915,STEP_A0 ,STEP_D0 )) + (IS_TIGERLAKE (i915) &&IS_DISPLAY_STEP (i915,STEP_A0 ,STEP_D0 )))return false;/* Wa_22011186057 */
drivers/gpu/drm/i915/i915_drv.h +1 -4
@@ -646,15 +646,12 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,#define IS_ICL_WITH_PORT_F (i915) \ IS_SUBPLATFORM(i915, INTEL_ICELAKE, INTEL_SUBPLATFORM_PORTF) -#define IS_TGL_UY (i915) \ +#define IS_TIGERLAKE_UY (i915) \ IS_SUBPLATFORM(i915, INTEL_TIGERLAKE, INTEL_SUBPLATFORM_UY) -#define IS_TGL_DISPLAY_STEP (__i915, since, until) \ - (IS_TIGERLAKE(__i915) && \ - IS_DISPLAY_STEP(__i915, since, until))#define IS_ADLS_DISPLAY_STEP (__i915, since, until) \
drivers/gpu/drm/i915/intel_step.c +1 -1
@@ -213,7 +213,7 @@ void intel_step_init(struct drm_i915_private *i915) }else if (IS_ROCKETLAKE (i915)) { revids = rkl_revids; size =ARRAY_SIZE (rkl_revids); - }else if (IS_TGL_UY (i915)) { + }else if (IS_TIGERLAKE_UY (i915)) { revids = tgl_uy_revids; size =ARRAY_SIZE (tgl_uy_revids); }else if (IS_TIGERLAKE (i915)) {
Signature · 1 line
2.34.1
PATCH v2 12/14 drm/i915/rplu: s/ADLP_RPLU/RAPTORLAKE_U in RPLU defines
In reply to Dnyaneshwar BhadaneFollow consistent naming convention. Replace ADLP with ALDERLAKE_P
v2:
- Replace IS_ADLP_RPLU with IS_RAPTORLAKE_U (Tvrtko/Lucas)
- Change the subject
--- drivers/gpu/drm/i915/display/intel_cdclk.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/display/intel_cdclk.c +1 -1
@@ -3570,7 +3570,7 @@ void intel_init_cdclk_hooks(struct drm_i915_private *dev_priv)if (IS_ALDERLAKE_P (dev_priv) &&IS_DISPLAY_STEP (dev_priv,STEP_A0 ,STEP_B0 )) { dev_priv->display.cdclk.table = adlp_a_step_cdclk_table; dev_priv->display.funcs.cdclk = &tgl_cdclk_funcs; - }else if (IS_ADLP_RPLU (dev_priv)) { + }else if (IS_RAPTORLAKE_U (dev_priv)) { dev_priv->display.cdclk.table = rplu_cdclk_table; dev_priv->display.funcs.cdclk = &rplu_cdclk_funcs; }else {
drivers/gpu/drm/i915/i915_drv.h +1 -1
@@ -590,7 +590,7 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, IS_SUBPLATFORM(i915, INTEL_ALDERLAKE_P, INTEL_SUBPLATFORM_N)#define IS_RAPTORLAKE_P (i915) \ IS_SUBPLATFORM(i915, INTEL_ALDERLAKE_P, INTEL_SUBPLATFORM_RPL) -#define IS_ADLP_RPLU (i915) \ +#define IS_RAPTORLAKE_U (i915) \ IS_SUBPLATFORM(i915, INTEL_ALDERLAKE_P, INTEL_SUBPLATFORM_RPLU)#define IS_HASWELL_EARLY_SDV (i915) (IS_HASWELL(i915) && \ (INTEL_DEVID(i915) & 0xFF00) == 0x0C00)
Signature · 1 line
2.34.1
Re: [Intel-gfx] [PATCH v2 12/14] drm/i915/rplu: s/ADLP_RPLU/RAPTORLAKE_U in RPLU defines
Quoted 17 lines
-----Original Message-----
From: Bhadane, Dnyaneshwar <[email protected]>
Sent: Wednesday, July 26, 2023 1:07 PM
To: [email protected]
Cc: Ursulin, Tvrtko <[email protected]>; [email protected]; Srivatsa, Anusha <[email protected]>; Atwood, Matthew S <[email protected]>; Roper, Matthew D <[email protected]>; Bhadane, Dnyaneshwar <[email protected]>; Srivatsa, Anusha <[email protected]>
Subject: [PATCH v2 12/14] drm/i915/rplu: s/ADLP_RPLU/RAPTORLAKE_U in RPLU definesFollow consistent naming convention. Replace ADLP with
ALDERLAKE_P
Quoted 8 lines
v2:
- ReplaceIS_ADLP_RPLUwithIS_RAPTORLAKE_U(Tvrtko/Lucas)
- Change the subjectCc Tvrtko Ursulin <[email protected]>Cc Jani Nikula <[email protected]>Cc Anusha Srivatsa <[email protected]>Signed-off-by Dnyaneshwar Bhadane <[email protected]>
Quoted 38 lines
--- drivers/gpu/drm/i915/display/intel_cdclk.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/display/intel_cdclk.c +1
-1@@ -3570,7 +3570,7 @@ void intel_init_cdclk_hooks(struct drm_i915_private *dev_priv)if (IS_ALDERLAKE_P (dev_priv) &&IS_DISPLAY_STEP (dev_priv,STEP_A0 ,STEP_B0 )) { dev_priv->display.cdclk.table = adlp_a_step_cdclk_table; dev_priv->display.funcs.cdclk = &tgl_cdclk_funcs; - }else if (IS_ADLP_RPLU (dev_priv)) { + }else if (IS_RAPTORLAKE_U (dev_priv)) {drivers/gpu/drm/i915/display/intel_cdclk.c +0
-0dev_priv->display.cdclk.table = rplu_cdclk_table; dev_priv->display.funcs.cdclk = &rplu_cdclk_funcs; }else {drivers/gpu/drm/i915/i915_drv.h +1
-0@@ -590,7 +590,7 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,IS_SUBPLATFORM (i915,INTEL_ALDERLAKE_P , INTEL_SUBPLATFORM_N) #define IS_RAPTORLAKE_P(i915) \ IS_SUBPLATFORM(i915, INTEL_ALDERLAKE_P, INTEL_SUBPLATFORM_RPL) -#define IS_ADLP_RPLU(i915) \ +#define IS_RAPTORLAKE_U(i915) \ IS_SUBPLATFORM(i915, INTEL_ALDERLAKE_P, INTEL_SUBPLATFORM_RPLU) #define IS_HASWELL_EARLY_SDV(i915)(
IS_HASWELL(i915)&& \
(INTEL_DEVID(i915)&0xFF00) ==0x0C00)
--
2.34.1
PATCH v3 14/14 drm/i915/adls: s/ADLS_RPLS/RAPTORLAKE_S in platform and subplatform defines
In reply to Dnyaneshwar BhadaneDriver refers to the platform Alderlake S as ADLS_RPLS in places and RAPTORLAKE_S in some.
v2:
- Unrolled wrapper IS_ADLS_GRAPHICS_STEP
v3:
- Replace IS_RAPTORLAKE_S instead of IS_ADLS_RPLS. (Tvrtko/Lucas).
- Remove unused macro IS_ADLS_GRAPHICS/DISPLAY_STEP
- Change the subject
--- drivers/gpu/drm/i915/display/intel_display_device.c | 2 +- drivers/gpu/drm/i915/gt/uc/intel_uc.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 9 +-------- drivers/gpu/drm/i915/intel_step.c | 2 +- 4 files changed, 4 insertions(+), 11 deletions(-)
drivers/gpu/drm/i915/display/intel_display_device.c +1 -1
@@ -858,7 +858,7 @@ void intel_display_device_info_runtime_init(struct drm_i915_private *i915)BUILD_BUG_ON (BITS_PER_TYPE (display_runtime->port_mask) <I915_MAX_PORTS );/* Wa_14011765242: adl-s A0,A1 */ -if (IS_ADLS_DISPLAY_STEP (i915,STEP_A0 ,STEP_A2 )) +if (IS_ALDERLAKE_S (i915) &&IS_DISPLAY_STEP (i915,STEP_A0 ,STEP_A2 ))for_each_pipe (i915, pipe) display_runtime->num_scalers[pipe] =0 ;else if (DISPLAY_VER (i915) >=11 ) {
drivers/gpu/drm/i915/gt/uc/intel_uc.c +1 -1
@@ -43,7 +43,7 @@ static void uc_expand_default_options(struct intel_uc *uc) }/* Intermediate platforms are HuC authentication only */ -if (IS_ALDERLAKE_S (i915) && !IS_ADLS_RPLS (i915)) { +if (IS_ALDERLAKE_S (i915) && !IS_RAPTORLAKE_S (i915)) { i915->params.enable_guc =ENABLE_GUC_LOAD_HUC ;return ; }
drivers/gpu/drm/i915/i915_drv.h +1 -8
@@ -584,7 +584,7 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, IS_SUBPLATFORM(i915, INTEL_DG2, INTEL_SUBPLATFORM_G11)#define IS_DG2_G12 (i915) \ IS_SUBPLATFORM(i915, INTEL_DG2, INTEL_SUBPLATFORM_G12) -#define IS_ADLS_RPLS (i915) \ +#define IS_RAPTORLAKE_S (i915) \ IS_SUBPLATFORM(i915, INTEL_ALDERLAKE_S, INTEL_SUBPLATFORM_RPL)#define IS_ALDERLAKE_P_N (i915) \ IS_SUBPLATFORM(i915, INTEL_ALDERLAKE_P, INTEL_SUBPLATFORM_N)
@@ -654,13 +654,6 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, -#define IS_ADLS_DISPLAY_STEP (__i915, since, until) \ - (IS_ALDERLAKE_S(__i915) && \ - IS_DISPLAY_STEP(__i915, since, until)) - -#define IS_ADLS_GRAPHICS_STEP (__i915, since, until) \ - (IS_ALDERLAKE_S(__i915) && \ - IS_GRAPHICS_STEP(__i915, since, until))#define IS_XEHPSDV_GRAPHICS_STEP (__i915, since, until) \
drivers/gpu/drm/i915/intel_step.c +1 -1
@@ -201,7 +201,7 @@ void intel_step_init(struct drm_i915_private *i915) }else if (IS_ALDERLAKE_P (i915)) { revids = adlp_revids; size =ARRAY_SIZE (adlp_revids); - }else if (IS_ADLS_RPLS (i915)) { + }else if (IS_RAPTORLAKE_S (i915)) { revids = adls_rpls_revids; size =ARRAY_SIZE (adls_rpls_revids); }else if (IS_ALDERLAKE_S (i915)) {
Signature · 1 line
2.34.1
Re: [Intel-gfx] [PATCH v3 14/14] drm/i915/adls: s/ADLS_RPLS/RAPTORLAKE_S in platform and subplatform defines
Quoted 26 lines
-----Original Message-----
From: Bhadane, Dnyaneshwar <[email protected]>
Sent: Wednesday, July 26, 2023 1:07 PM
To: [email protected]
Cc: Ursulin, Tvrtko <[email protected]>; [email protected]; Srivatsa, Anusha <[email protected]>; Atwood, Matthew S <[email protected]>; Roper, Matthew D <[email protected]>; Bhadane, Dnyaneshwar <[email protected]>; Srivatsa, Anusha <[email protected]>
Subject: [PATCH v3 14/14] drm/i915/adls: s/ADLS_RPLS/RAPTORLAKE_S in platform and subplatform definesDriver refers to the platform Alderlake S as
ADLS_RPLSin places andRAPTORLAKE_Sin some.v2:
- Unrolled wrapperIS_ADLS_GRAPHICS_STEPv3:
- ReplaceIS_RAPTORLAKE_Sinstead ofIS_ADLS_RPLS. (Tvrtko/Lucas).
- Remove unused macro IS_ADLS_GRAPHICS/DISPLAY_STEP
- Change the subject
Quoted 4 lines
Cc Tvrtko Ursulin <[email protected]>Cc Jani Nikula <[email protected]>Cc Anusha Srivatsa <[email protected]>Signed-off-by Dnyaneshwar Bhadane <[email protected]>
Quoted 81 lines
--- drivers/gpu/drm/i915/display/intel_display_device.c | 2 +- drivers/gpu/drm/i915/gt/uc/intel_uc.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 9 +-------- drivers/gpu/drm/i915/intel_step.c | 2 +- 4 files changed, 4 insertions(+), 11 deletions(-)drivers/gpu/drm/i915/display/intel_display_device.c +1
-1@@ -858,7 +858,7 @@ void intel_display_device_info_runtime_init(struct drm_i915_private *i915) BUILD_BUG_ON(BITS_PER_TYPE(display_runtime->port_mask) <I915_MAX_PORTS );/* Wa_14011765242: adl-s A0,A1 */ -if (IS_ADLS_DISPLAY_STEP (i915,STEP_A0 ,STEP_A2 )) +if (IS_ALDERLAKE_S (i915) &&IS_DISPLAY_STEP (i915,STEP_A0 ,STEP_A2 ))drivers/gpu/drm/i915/display/intel_display_device.c +0
-0for_each_pipe (i915, pipe) display_runtime->num_scalers[pipe] =0 ; else if (DISPLAY_VER(i915) >= 11) {drivers/gpu/drm/i915/gt/uc/intel_uc.c +1
-1@@ -43,7 +43,7 @@ static void uc_expand_default_options(struct intel_uc *uc) }/* Intermediate platforms are HuC authentication only */ -if (IS_ALDERLAKE_S (i915) && !IS_ADLS_RPLS (i915)) { +if (IS_ALDERLAKE_S (i915) && !IS_RAPTORLAKE_S (i915)) { i915->params.enable_guc =ENABLE_GUC_LOAD_HUC ;return ; }drivers/gpu/drm/i915/i915_drv.h +1
-0@@ -584,7 +584,7 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, IS_SUBPLATFORM(i915, INTEL_DG2, INTEL_SUBPLATFORM_G11)#define IS_DG2_G12 (i915) \ IS_SUBPLATFORM(i915, INTEL_DG2, INTEL_SUBPLATFORM_G12) -#define IS_ADLS_RPLS (i915) \ +#define IS_RAPTORLAKE_S(i915) \ IS_SUBPLATFORM(i915, INTEL_ALDERLAKE_S, INTEL_SUBPLATFORM_RPL) #define IS_ALDERLAKE_P_N(i915) \ IS_SUBPLATFORM(i915, INTEL_ALDERLAKE_P,
INTEL_SUBPLATFORM_N) @@ -654,13 +654,6 @@ IS_SUBPLATFORM(const structdrm_i915_private*i915,drivers/gpu/drm/i915/i915_drv.h +0
-7-#define IS_ADLS_DISPLAY_STEP (__i915, since, until) \ - (IS_ALDERLAKE_S(__i915) && \ - IS_DISPLAY_STEP(__i915, since, until)) - -#define IS_ADLS_GRAPHICS_STEP (__i915, since, until) \ - (IS_ALDERLAKE_S(__i915) && \ - IS_GRAPHICS_STEP(__i915, since, until))#define IS_XEHPSDV_GRAPHICS_STEP (__i915, since, until) \ diff --git
a/drivers/gpu/drm/i915/intel_step.cb/drivers/gpu/drm/i915/intel_step.cindex5553de469fa0..c02a6f156a00100644drivers/gpu/drm/i915/intel_step.c +1
-2@@ -201,7 +201,7 @@ void intel_step_init(struct drm_i915_private *i915) }else if (IS_ALDERLAKE_P (i915)) { revids = adlp_revids; size =ARRAY_SIZE (adlp_revids); - }else if (IS_ADLS_RPLS (i915)) { + }else if (IS_RAPTORLAKE_S (i915)) { revids = adls_rpls_revids; size =ARRAY_SIZE (adls_rpls_revids); }else if (IS_ALDERLAKE_S (i915)) { --2.34.1
PATCH v4 13/14 drm/i915/adln: s/ADLP/ALDERLAKE_P in ADLN defines
In reply to Dnyaneshwar BhadaneFrom: Anusha Srivatsa <[email protected]>
Follow consistent naming convention. Replace ADLP with ALDERLAKE_P
--- drivers/gpu/drm/i915/gt/uc/intel_guc_hwconfig.c | 2 +- drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 2 +- drivers/gpu/drm/i915/intel_step.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/gt/uc/intel_guc_hwconfig.c +1 -1
@@ -94,7 +94,7 @@ static int guc_hwconfig_fill_buffer(struct intel_guc *guc, struct intel_hwconfigstatic bool has_table (struct drm_i915_private *i915) { -if (IS_ALDERLAKE_P (i915) && !IS_ADLP_N (i915)) +if (IS_ALDERLAKE_P (i915) && !IS_ALDERLAKE_P_N (i915))return true;if (GRAPHICS_VER_FULL (i915) >=IP_VER (12 ,55 ))return true;
drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c +1 -1
@@ -295,7 +295,7 @@ __uc_fw_auto_select(struct drm_i915_private *i915, struct intel_uc_fw *uc_fw)* ADL-S, otherwise the GuC might attempt to fetch a config table that * does not exist. */ -if (IS_ADLP_N (i915)) +if (IS_ALDERLAKE_P_N (i915)) p =INTEL_ALDERLAKE_S ;GEM_BUG_ON (uc_fw->type >=ARRAY_SIZE (blobs_all));
drivers/gpu/drm/i915/i915_drv.h +1 -1
@@ -586,7 +586,7 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, IS_SUBPLATFORM(i915, INTEL_DG2, INTEL_SUBPLATFORM_G12)#define IS_ADLS_RPLS (i915) \ IS_SUBPLATFORM(i915, INTEL_ALDERLAKE_S, INTEL_SUBPLATFORM_RPL) -#define IS_ADLP_N (i915) \ +#define IS_ALDERLAKE_P_N (i915) \ IS_SUBPLATFORM(i915, INTEL_ALDERLAKE_P, INTEL_SUBPLATFORM_N)#define IS_RAPTORLAKE_P (i915) \ IS_SUBPLATFORM(i915, INTEL_ALDERLAKE_P, INTEL_SUBPLATFORM_RPL)
drivers/gpu/drm/i915/intel_step.c +1 -1
@@ -192,7 +192,7 @@ void intel_step_init(struct drm_i915_private *i915) }else if (IS_XEHPSDV (i915)) { revids = xehpsdv_revids; size =ARRAY_SIZE (xehpsdv_revids); - }else if (IS_ADLP_N (i915)) { + }else if (IS_ALDERLAKE_P_N (i915)) { revids = adlp_n_revids; size =ARRAY_SIZE (adlp_n_revids); }else if (IS_RAPTORLAKE_P (i915)) {
Signature · 1 line
2.34.1
Patchwork
CI[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Replace acronym with full platform name in defines.
In reply to Dnyaneshwar Bhadane== Series Details ==
== Series Details ==
Series: Replace acronym with full platform name in defines.
URL : https://patchwork.freedesktop.org/series/121387/
State : warning
== Summary ==
Error: dim checkpatch failed26b2934657f0 drm/i915/hsw: s/HSW/HASWELL for platform/subplatform defines -:46: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'i915' - possible side-effects? #46: FILE: drivers/gpu/drm/i915/display/intel_display_device.h:57:
+#define HAS_IPS(i915) (IS_HASWELL_ULT(i915) || IS_BROADWELL(i915))
-:124: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'i915' - possible side-effects? #124: FILE: drivers/gpu/drm/i915/i915_drv.h:595:
+#define IS_HASWELL_EARLY_SDV(i915) (IS_HASWELL(i915) && \
(INTEL_DEVID(i915) & 0xFF00) == 0x0C00)
-:136: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'i915' - possible side-effects? #136: FILE: drivers/gpu/drm/i915/i915_drv.h:605:
+#define IS_HASWELL_GT3(i915) (IS_HASWELL(i915) && \
INTEL_INFO(i915)->gt == 3)
-:139: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'i915' - possible side-effects? #139: FILE: drivers/gpu/drm/i915/i915_drv.h:607:
+#define IS_HASWELL_GT1(i915) (IS_HASWELL(i915) && \
INTEL_INFO(i915)->gt == 1)
-:152: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'i915' - possible side-effects? #152: FILE: drivers/gpu/drm/i915/i915_drv.h:864:
+#define NUM_L3_SLICES(i915) (IS_HASWELL_GT3(i915) ? \
2 : HAS_L3_DPF(i915))
total: 0 errors, 0 warnings, 5 checks, 138 lines checked 918824b50d4c drm/i915/bdw: s/BDW/BROADWELL for platform/subplatform defines -:69: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'i915' - possible side-effects? #69: FILE: drivers/gpu/drm/i915/i915_drv.h:601:
+#define IS_BROADWELL_GT3(i915) (IS_BROADWELL(i915) && \
INTEL_INFO(i915)->gt == 3)
total: 0 errors, 0 warnings, 1 checks, 81 lines checked0a3dbaf76831 drm/i915/skl: s/SKL/SKYLAKE for platform/subplatform defines -:71: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'i915' - possible side-effects? #71: FILE: drivers/gpu/drm/i915/i915_drv.h:620:
+#define IS_SKYLAKE_GT2(i915) (IS_SKYLAKE(i915) && \
INTEL_INFO(i915)->gt == 2)
-:74: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'i915' - possible side-effects? #74: FILE: drivers/gpu/drm/i915/i915_drv.h:622:
+#define IS_SKYLAKE_GT3(i915) (IS_SKYLAKE(i915) && \
INTEL_INFO(i915)->gt == 3)
-:77: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'i915' - possible side-effects? #77: FILE: drivers/gpu/drm/i915/i915_drv.h:624:
+#define IS_SKYLAKE_GT4(i915) (IS_SKYLAKE(i915) && \
INTEL_INFO(i915)->gt == 4)
total: 0 errors, 0 warnings, 3 checks, 58 lines checked985ef963e0e6 drm/i915/kbl: s/KBL/KABYLAKE for platform/subplatform defines -:106: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'i915' - possible side-effects? #106: FILE: drivers/gpu/drm/i915/i915_drv.h:626:
+#define IS_KABYLAKE_GT2(i915) (IS_KABYLAKE(i915) && \
INTEL_INFO(i915)->gt == 2)
-:109: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'i915' - possible side-effects? #109: FILE: drivers/gpu/drm/i915/i915_drv.h:628:
+#define IS_KABYLAKE_GT3(i915) (IS_KABYLAKE(i915) && \
INTEL_INFO(i915)->gt == 3)
total: 0 errors, 0 warnings, 2 checks, 89 lines checkeddfe80846f681 drm/i915/cfl: s/CFL/COFFEELAKE for platform/subplatform defines -:43: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'i915' - possible side-effects? #43: FILE: drivers/gpu/drm/i915/i915_drv.h:634:
+#define IS_COFFEELAKE_GT2(i915) (IS_COFFEELAKE(i915) && \
INTEL_INFO(i915)->gt == 2)
-:46: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'i915' - possible side-effects? #46: FILE: drivers/gpu/drm/i915/i915_drv.h:636:
+#define IS_COFFEELAKE_GT3(i915) (IS_COFFEELAKE(i915) && \
INTEL_INFO(i915)->gt == 3)
total: 0 errors, 0 warnings, 2 checks, 28 lines checkedbe676d5fe142 drm/i915/cml: s/CML/COMETLAKE for platform/subplatform defines -:43: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'i915' - possible side-effects? #43: FILE: drivers/gpu/drm/i915/i915_drv.h:643:
+#define IS_COMETLAKE_GT2(i915) (IS_COMETLAKE(i915) && \
INTEL_INFO(i915)->gt == 2)
total: 0 errors, 0 warnings, 1 checks, 25 lines checked 512da45fb53f drm/i915/rkl: s/RKL/ROCKETLAKE for platform/subplatform defines b0b6ca2cb60d drm/i915/jsl: s/JSL/JASPERLAKE for platform/subplatform defines -:38: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #38: FILE: drivers/gpu/drm/i915/display/icl_dsi.c:448:
+ if (IS_JASPERLAKE(dev_priv) || IS_ELKHARTLAKE(dev_priv) ||
+ (DISPLAY_VER(dev_priv) >= 12)) {
-:101: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #101: FILE: drivers/gpu/drm/i915/display/intel_combo_phy.c:337:
+ if ((IS_JASPERLAKE(dev_priv) || IS_ELKHARTLAKE(dev_priv)) &&
+ phy == PHY_A) {
-:115: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #115: FILE: drivers/gpu/drm/i915/display/intel_ddi.c:3587:
+ else if ((IS_JASPERLAKE(dev_priv) || IS_ELKHARTLAKE(dev_priv)) &&
+ crtc_state->port_clock > 594000)
-:156: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #156: FILE: drivers/gpu/drm/i915/display/intel_display.c:1805:
+ else if ((IS_JASPERLAKE(i915) || IS_ELKHARTLAKE(i915)) &&
+ port == PORT_D)
-:183: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #183: FILE: drivers/gpu/drm/i915/display/intel_dpll_mgr.c:195:
+ else if ((IS_JASPERLAKE(i915) || IS_ELKHARTLAKE(i915)) &&
+ (pll->info->id == DPLL_ID_EHL_DPLL4))
-:214: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #214: FILE: drivers/gpu/drm/i915/display/intel_dpll_mgr.c:3573:
+ if ((IS_JASPERLAKE(dev_priv) || IS_ELKHARTLAKE(dev_priv)) &&
+ id == DPLL_ID_EHL_DPLL4) {
-:224: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #224: FILE: drivers/gpu/drm/i915/display/intel_dpll_mgr.c:3630:
+ if ((IS_JASPERLAKE(dev_priv) || IS_ELKHARTLAKE(dev_priv)) &&
+ id == DPLL_ID_EHL_DPLL4) {
-:235: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #235: FILE: drivers/gpu/drm/i915/display/intel_dpll_mgr.c:3814:
+ if ((IS_JASPERLAKE(dev_priv) || IS_ELKHARTLAKE(dev_priv)) &&
+ pll->info->id == DPLL_ID_EHL_DPLL4) {
-:246: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #246: FILE: drivers/gpu/drm/i915/display/intel_dpll_mgr.c:3922:
+ if ((IS_JASPERLAKE(dev_priv) || IS_ELKHARTLAKE(dev_priv)) &&
+ pll->info->id == DPLL_ID_EHL_DPLL4)
-:265: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #265: FILE: drivers/gpu/drm/i915/display/intel_dpll_mgr.c:4343:
+ if ((IS_JASPERLAKE(i915) || IS_ELKHARTLAKE(i915)) &&
+ pll->on &&
-:279: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #279: FILE: drivers/gpu/drm/i915/display/intel_hdmi.c:2898:
+ else if ((IS_JASPERLAKE(dev_priv) || IS_ELKHARTLAKE(dev_priv)) &&
+ HAS_PCH_TGP(dev_priv))
-:385: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #385: FILE: drivers/gpu/drm/i915/soc/intel_pch.c:119:
+ drm_WARN_ON(&dev_priv->drm, !(IS_JASPERLAKE(dev_priv) ||
+ IS_ELKHARTLAKE(dev_priv)));
-:395: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #395: FILE: drivers/gpu/drm/i915/soc/intel_pch.c:132:
+ drm_WARN_ON(&dev_priv->drm, !(IS_JASPERLAKE(dev_priv) ||
+ IS_ELKHARTLAKE(dev_priv)));
total: 0 errors, 0 warnings, 13 checks, 287 lines checked50f802312bf7 drm/i915/tgl: s/TGL/TIGERLAKE for platform/subplatform defines 7ff9b41a0866 drm/i915/adlp: s/ADLP/ALDERLAKE_P for display and graphics step c9a24742c4a5 drm/i915/rplp: s/ADLP_RPLP/RAPTORLAKE_P for RPLP defines ce9e55e38ac0 drm/i915/rplu: s/ADLP_RPLU/RAPTORLAKE_U in RPLU defines cf806fab3784 drm/i915/adln: s/ADLP/ALDERLAKE_P in ADLN defines 7e6314b961f8 drm/i915/adls: s/ADLS_RPLS/RAPTORLAKE_S in platform and subplatform defines
Jani Nikula
maintainerRe: [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Replace acronym with full platform name in defines.
Quoted 9 lines · Patchwork
== Series Details ==
Series: Replace acronym with full platform name in defines.
URL : https://patchwork.freedesktop.org/series/121387/
State : warning== Summary ==
Error: dim checkpatch failed
All the parenthesis alignments warnings are valid.
BR,
Jani.
Quoted 67 lines
b0b6ca2cb60ddrm/i915/jsl: s/JSL/JASPERLAKE for platform/subplatform defines -:38: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #38: FILE:drivers/gpu/drm/i915/display/icl_dsi.c:448:(quoted diff) +2
-1+ if (IS_JASPERLAKE(dev_priv) || IS_ELKHARTLAKE(dev_priv) || + (DISPLAY_VER(dev_priv) >= 12)) { -:101: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis#101: FILE:
drivers/gpu/drm/i915/display/intel_combo_phy.c:337:(quoted diff) +2
-1+ if ((IS_JASPERLAKE(dev_priv) || IS_ELKHARTLAKE(dev_priv)) && + phy == PHY_A) { -:115: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis#115: FILE:
drivers/gpu/drm/i915/display/intel_ddi.c:3587:(quoted diff) +2
-1+ else if ((IS_JASPERLAKE(dev_priv) || IS_ELKHARTLAKE(dev_priv)) && + crtc_state->port_clock > 594000) -:156: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis#156: FILE:
drivers/gpu/drm/i915/display/intel_display.c:1805:(quoted diff) +2
-1+ else if ((IS_JASPERLAKE(i915) || IS_ELKHARTLAKE(i915)) && + port == PORT_D) -:183: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis#183: FILE:
drivers/gpu/drm/i915/display/intel_dpll_mgr.c:195:(quoted diff) +2
-1+ else if ((IS_JASPERLAKE(i915) || IS_ELKHARTLAKE(i915)) && + (pll->info->id == DPLL_ID_EHL_DPLL4)) -:214: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis#214: FILE:
drivers/gpu/drm/i915/display/intel_dpll_mgr.c:3573:(quoted diff) +2
-1+ if ((IS_JASPERLAKE(dev_priv) || IS_ELKHARTLAKE(dev_priv)) && + id == DPLL_ID_EHL_DPLL4) { -:224: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis#224: FILE:
drivers/gpu/drm/i915/display/intel_dpll_mgr.c:3630:(quoted diff) +2
-1+ if ((IS_JASPERLAKE(dev_priv) || IS_ELKHARTLAKE(dev_priv)) && + id == DPLL_ID_EHL_DPLL4) { -:235: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis#235: FILE:
drivers/gpu/drm/i915/display/intel_dpll_mgr.c:3814:(quoted diff) +2
-1+ if ((IS_JASPERLAKE(dev_priv) || IS_ELKHARTLAKE(dev_priv)) && + pll->info->id == DPLL_ID_EHL_DPLL4) { -:246: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis#246: FILE:
drivers/gpu/drm/i915/display/intel_dpll_mgr.c:3922:(quoted diff) +2
-1+ if ((IS_JASPERLAKE(dev_priv) || IS_ELKHARTLAKE(dev_priv)) && + pll->info->id == DPLL_ID_EHL_DPLL4) -:265: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis#265: FILE:
drivers/gpu/drm/i915/display/intel_dpll_mgr.c:4343:(quoted diff) +2
-1+ if ((IS_JASPERLAKE(i915) || IS_ELKHARTLAKE(i915)) && + pll->on && -:279: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis#279: FILE:
drivers/gpu/drm/i915/display/intel_hdmi.c:2898:(quoted diff) +2
-1+ else if ((IS_JASPERLAKE(dev_priv) || IS_ELKHARTLAKE(dev_priv)) && + HAS_PCH_TGP(dev_priv)) -:385: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis#385: FILE:
drivers/gpu/drm/i915/soc/intel_pch.c:119:(quoted diff) +2
-1+ drm_WARN_ON(&dev_priv->drm, !(IS_JASPERLAKE(dev_priv) || + IS_ELKHARTLAKE(dev_priv))); -:395: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis#395: FILE:
drivers/gpu/drm/i915/soc/intel_pch.c:132:(quoted diff) +2
-0+ drm_WARN_ON(&dev_priv->drm, !(IS_JASPERLAKE(dev_priv) || + IS_ELKHARTLAKE(dev_priv)));total: 0 errors, 0 warnings, 13 checks, 287 lines checked
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
Patchwork
CI[Intel-gfx] ✗ Fi.CI.SPARSE: warning for Replace acronym with full platform name in defines.
In reply to Dnyaneshwar Bhadane== Series Details ==
== Series Details ==
Series: Replace acronym with full platform name in defines.
URL : https://patchwork.freedesktop.org/series/121387/
State : warning
== Summary ==
Error: dim sparse failed
Sparse version: v0.6.2
Fast mode used, each commit won't be checked separately.
Patchwork
CI[Intel-gfx] ✓ Fi.CI.BAT: success for Replace acronym with full platform name in defines.
In reply to Dnyaneshwar Bhadane== Series Details ==
== Series Details ==
Series: Replace acronym with full platform name in defines.
URL : https://patchwork.freedesktop.org/series/121387/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_13426 -> Patchwork_121387v1
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/index.html
Participating hosts (41 -> 41)
------------------------------
Additional (2): fi-kbl-soraka bat-adlp-11
Missing (2): fi-tgl-1115g4 fi-snb-2520m
Known issues
------------
Here are the changes found in Patchwork_121387v1 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@core_auth@basic-auth:
- bat-adlp-11: NOTRUN -> [ABORT][1] ([i915#4423] / [i915#8011])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/bat-adlp-11/igt@[email protected]
* igt@gem_huc_copy@huc-copy:
- fi-kbl-soraka: NOTRUN -> [SKIP][2] ([fdo#109271] / [i915#2190])
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/fi-kbl-soraka/igt@[email protected]
* igt@gem_lmem_swapping@basic:
- fi-kbl-soraka: NOTRUN -> [SKIP][3] ([fdo#109271] / [i915#4613]) +3 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/fi-kbl-soraka/igt@[email protected]
* igt@i915_module_load@load:
- bat-adlp-11: NOTRUN -> [DMESG-WARN][4] ([i915#4423])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/bat-adlp-11/igt@[email protected]
* igt@i915_pm_rpm@basic-rte:
- fi-skl-guc: [PASS][5] -> [FAIL][6] ([i915#7940])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13426/fi-skl-guc/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/fi-skl-guc/igt@[email protected]
- fi-kbl-7567u: [PASS][7] -> [FAIL][8] ([i915#7940])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13426/fi-kbl-7567u/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/fi-kbl-7567u/igt@[email protected]
* igt@i915_selftest@live@gt_mocs:
- bat-mtlp-6: [PASS][9] -> [DMESG-FAIL][10] ([i915#7059])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13426/bat-mtlp-6/igt@i915_selftest@live@gt_mocs.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/bat-mtlp-6/igt@i915_selftest@live@gt_mocs.html
* igt@i915_selftest@live@gt_pm:
- fi-kbl-soraka: NOTRUN -> [DMESG-FAIL][11] ([i915#1886] / [i915#7913])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/fi-kbl-soraka/igt@i915_selftest@live@gt_pm.html
* igt@i915_selftest@live@slpc:
- bat-mtlp-6: [PASS][12] -> [DMESG-WARN][13] ([i915#6367])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13426/bat-mtlp-6/igt@i915_selftest@[email protected]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/bat-mtlp-6/igt@i915_selftest@[email protected]
- bat-rpls-2: NOTRUN -> [DMESG-WARN][14] ([i915#6367])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/bat-rpls-2/igt@i915_selftest@[email protected]
- bat-rpls-1: NOTRUN -> [DMESG-WARN][15] ([i915#6367])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/bat-rpls-1/igt@i915_selftest@[email protected]
* igt@i915_suspend@basic-s3-without-i915:
- bat-rpls-1: NOTRUN -> [ABORT][16] ([i915#6687] / [i915#7978] / [i915#8668])
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/bat-rpls-1/igt@[email protected]
* igt@kms_chamelium_hpd@common-hpd-after-suspend:
- bat-rpls-2: NOTRUN -> [SKIP][17] ([i915#7828])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/bat-rpls-2/igt@[email protected]
- bat-jsl-3: NOTRUN -> [SKIP][18] ([i915#7828])
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/bat-jsl-3/igt@[email protected]
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic:
- fi-kbl-soraka: NOTRUN -> [SKIP][19] ([fdo#109271]) +15 similar issues
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/fi-kbl-soraka/igt@[email protected]
* igt@kms_pipe_crc_basic@suspend-read-crc:
- bat-rpls-2: NOTRUN -> [SKIP][20] ([i915#1845])
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/bat-rpls-2/igt@[email protected]
#### Possible fixes ####
* igt@gem_exec_suspend@basic-s0@smem:
- bat-jsl-3: [ABORT][21] ([i915#5122]) -> [PASS][22]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13426/bat-jsl-3/igt@gem_exec_suspend@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/bat-jsl-3/igt@gem_exec_suspend@[email protected]
* igt@i915_pm_rpm@basic-rte:
- fi-kbl-x1275: [FAIL][23] ([i915#8843]) -> [PASS][24]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13426/fi-kbl-x1275/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/fi-kbl-x1275/igt@[email protected]
* igt@i915_selftest@live@gt_heartbeat:
- fi-apl-guc: [DMESG-FAIL][25] ([i915#5334]) -> [PASS][26]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13426/fi-apl-guc/igt@i915_selftest@live@gt_heartbeat.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/fi-apl-guc/igt@i915_selftest@live@gt_heartbeat.html
* igt@i915_selftest@live@migrate:
- bat-mtlp-6: [DMESG-FAIL][27] ([i915#7699]) -> [PASS][28]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13426/bat-mtlp-6/igt@i915_selftest@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/bat-mtlp-6/igt@i915_selftest@[email protected]
- bat-mtlp-8: [DMESG-FAIL][29] ([i915#7699]) -> [PASS][30]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13426/bat-mtlp-8/igt@i915_selftest@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/bat-mtlp-8/igt@i915_selftest@[email protected]
* igt@i915_selftest@live@requests:
- bat-mtlp-8: [DMESG-FAIL][31] ([i915#8497]) -> [PASS][32]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13426/bat-mtlp-8/igt@i915_selftest@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/bat-mtlp-8/igt@i915_selftest@[email protected]
- bat-mtlp-6: [DMESG-FAIL][33] ([i915#7269]) -> [PASS][34]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13426/bat-mtlp-6/igt@i915_selftest@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/bat-mtlp-6/igt@i915_selftest@[email protected]
* igt@i915_selftest@live@reset:
- bat-rpls-1: [ABORT][35] ([i915#4983] / [i915#7461] / [i915#8347] / [i915#8384]) -> [PASS][36]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13426/bat-rpls-1/igt@i915_selftest@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/bat-rpls-1/igt@i915_selftest@[email protected]
- bat-rpls-2: [ABORT][37] ([i915#4983] / [i915#7461] / [i915#7913] / [i915#8347]) -> [PASS][38]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13426/bat-rpls-2/igt@i915_selftest@[email protected]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/bat-rpls-2/igt@i915_selftest@[email protected]
* igt@i915_selftest@live@slpc:
- bat-mtlp-8: [DMESG-WARN][39] ([i915#6367]) -> [PASS][40]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13426/bat-mtlp-8/igt@i915_selftest@[email protected]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/bat-mtlp-8/igt@i915_selftest@[email protected]
* igt@i915_suspend@basic-s3-without-i915:
- bat-jsl-3: [FAIL][41] ([fdo#103375]) -> [PASS][42]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13426/bat-jsl-3/igt@[email protected]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/bat-jsl-3/igt@[email protected]
#### Warnings ####
* igt@kms_psr@cursor_plane_move:
- bat-rplp-1: [SKIP][43] ([i915#1072]) -> [ABORT][44] ([i915#8434])
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13426/bat-rplp-1/igt@kms_psr@cursor_plane_move.html
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/bat-rplp-1/igt@kms_psr@cursor_plane_move.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#103375]: https://bugs.freedesktop.org/show_bug.cgi?id=103375
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
[i915#1845]: https://gitlab.freedesktop.org/drm/intel/issues/1845
[i915#1886]: https://gitlab.freedesktop.org/drm/intel/issues/1886
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#4423]: https://gitlab.freedesktop.org/drm/intel/issues/4423
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#4983]: https://gitlab.freedesktop.org/drm/intel/issues/4983
[i915#5122]: https://gitlab.freedesktop.org/drm/intel/issues/5122
[i915#5334]: https://gitlab.freedesktop.org/drm/intel/issues/5334
[i915#6367]: https://gitlab.freedesktop.org/drm/intel/issues/6367
[i915#6687]: https://gitlab.freedesktop.org/drm/intel/issues/6687
[i915#7059]: https://gitlab.freedesktop.org/drm/intel/issues/7059
[i915#7269]: https://gitlab.freedesktop.org/drm/intel/issues/7269
[i915#7461]: https://gitlab.freedesktop.org/drm/intel/issues/7461
[i915#7699]: https://gitlab.freedesktop.org/drm/intel/issues/7699
[i915#7828]: https://gitlab.freedesktop.org/drm/intel/issues/7828
[i915#7913]: https://gitlab.freedesktop.org/drm/intel/issues/7913
[i915#7940]: https://gitlab.freedesktop.org/drm/intel/issues/7940
[i915#7978]: https://gitlab.freedesktop.org/drm/intel/issues/7978
[i915#8011]: https://gitlab.freedesktop.org/drm/intel/issues/8011
[i915#8347]: https://gitlab.freedesktop.org/drm/intel/issues/8347
[i915#8384]: https://gitlab.freedesktop.org/drm/intel/issues/8384
[i915#8434]: https://gitlab.freedesktop.org/drm/intel/issues/8434
[i915#8497]: https://gitlab.freedesktop.org/drm/intel/issues/8497
[i915#8668]: https://gitlab.freedesktop.org/drm/intel/issues/8668
[i915#8843]: https://gitlab.freedesktop.org/drm/intel/issues/8843
Build changes
-------------
* Linux: CI_DRM_13426 -> Patchwork_121387v1
CI-20190529: 20190529
CI_DRM_13426: 50f130ab3021dd575aca3fab9c08eae15cd323a8 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7405: 6745761cb6050514a12aac973d02aeccdff06255 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_121387v1: 50f130ab3021dd575aca3fab9c08eae15cd323a8 @ git://anongit.freedesktop.org/gfx-ci/linux
### Linux commits
f45427534330 drm/i915/adls: s/ADLS_RPLS/RAPTORLAKE_S in platform and subplatform defines cdc4695b4a75 drm/i915/adln: s/ADLP/ALDERLAKE_P in ADLN defines 86307366514a drm/i915/rplu: s/ADLP_RPLU/RAPTORLAKE_U in RPLU defines ffabb792e4a7 drm/i915/rplp: s/ADLP_RPLP/RAPTORLAKE_P for RPLP defines b78f0cd9ea48 drm/i915/adlp: s/ADLP/ALDERLAKE_P for display and graphics step a7791537765c drm/i915/tgl: s/TGL/TIGERLAKE for platform/subplatform defines 32a92af7f33d drm/i915/jsl: s/JSL/JASPERLAKE for platform/subplatform defines dbaecadab515 drm/i915/rkl: s/RKL/ROCKETLAKE for platform/subplatform defines 09adf2235557 drm/i915/cml: s/CML/COMETLAKE for platform/subplatform defines 1e654a92244d drm/i915/cfl: s/CFL/COFFEELAKE for platform/subplatform defines 6ba475a0a6e4 drm/i915/kbl: s/KBL/KABYLAKE for platform/subplatform defines 6ba27754e16c drm/i915/skl: s/SKL/SKYLAKE for platform/subplatform defines 358d7d38b020 drm/i915/bdw: s/BDW/BROADWELL for platform/subplatform defines 25fba1a95f3a drm/i915/hsw: s/HSW/HASWELL for platform/subplatform defines
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/index.html
Patchwork
CI[Intel-gfx] ✗ Fi.CI.IGT: failure for Replace acronym with full platform name in defines.
In reply to Dnyaneshwar Bhadane== Series Details ==
== Series Details ==
Series: Replace acronym with full platform name in defines.
URL : https://patchwork.freedesktop.org/series/121387/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_13426_full -> Patchwork_121387v1_full
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_121387v1_full absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_121387v1_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 -> 10)
------------------------------
No changes in participating hosts
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_121387v1_full:
### IGT changes ###
#### Possible regressions ####
* igt@kms_flip@plain-flip-ts-check@a-vga1:
- shard-snb: [PASS][1] -> [ABORT][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13426/shard-snb4/igt@kms_flip@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-snb7/igt@kms_flip@[email protected]
Known issues
------------
Here are the changes found in Patchwork_121387v1_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@drm_fdinfo@most-busy-check-all@rcs0:
- shard-rkl: [PASS][3] -> [FAIL][4] ([i915#7742])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13426/shard-rkl-1/igt@drm_fdinfo@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-rkl-6/igt@drm_fdinfo@[email protected]
* igt@drm_fdinfo@most-busy-idle-check-all@ccs0:
- shard-mtlp: NOTRUN -> [SKIP][5] ([i915#8414]) +5 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-mtlp-7/igt@drm_fdinfo@[email protected]
* igt@gem_barrier_race@remote-request@rcs0:
- shard-glk: NOTRUN -> [ABORT][6] ([i915#7461] / [i915#8211])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-glk1/igt@gem_barrier_race@[email protected]
* igt@gem_basic@multigpu-create-close:
- shard-rkl: NOTRUN -> [SKIP][7] ([i915#7697])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-rkl-4/igt@[email protected]
* igt@gem_eio@reset-stress:
- shard-dg1: [PASS][8] -> [FAIL][9] ([i915#5784])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13426/shard-dg1-18/igt@[email protected]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-dg1-16/igt@[email protected]
* igt@gem_exec_balancer@invalid-bonds:
- shard-mtlp: NOTRUN -> [SKIP][10] ([i915#4036])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-mtlp-3/igt@[email protected]
* igt@gem_exec_balancer@parallel-balancer:
- shard-rkl: NOTRUN -> [SKIP][11] ([i915#4525])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-rkl-4/igt@[email protected]
* igt@gem_exec_fair@basic-pace@vecs0:
- shard-rkl: [PASS][12] -> [FAIL][13] ([i915#2842]) +2 similar issues
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13426/shard-rkl-2/igt@gem_exec_fair@[email protected]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-rkl-2/igt@gem_exec_fair@[email protected]
* igt@gem_exec_reloc@basic-cpu-gtt-active:
- shard-rkl: NOTRUN -> [SKIP][14] ([i915#3281])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-rkl-4/igt@[email protected]
* igt@gem_exec_reloc@basic-gtt:
- shard-mtlp: NOTRUN -> [SKIP][15] ([i915#3281])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-mtlp-7/igt@[email protected]
* igt@gem_exec_suspend@basic-s3@smem:
- shard-snb: NOTRUN -> [DMESG-WARN][16] ([i915#8841]) +4 similar issues
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-snb6/igt@gem_exec_suspend@[email protected]
* igt@gem_exec_suspend@basic-s4-devices@lmem0:
- shard-dg2: [PASS][17] -> [ABORT][18] ([i915#7975] / [i915#8213])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13426/shard-dg2-11/igt@gem_exec_suspend@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-dg2-10/igt@gem_exec_suspend@[email protected]
- shard-dg1: [PASS][19] -> [ABORT][20] ([i915#7975] / [i915#8213])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13426/shard-dg1-15/igt@gem_exec_suspend@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-dg1-14/igt@gem_exec_suspend@[email protected]
* igt@gem_lmem_swapping@heavy-random:
- shard-glk: NOTRUN -> [SKIP][21] ([fdo#109271] / [i915#4613])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-glk1/igt@[email protected]
* igt@gem_lmem_swapping@parallel-multi:
- shard-rkl: NOTRUN -> [SKIP][22] ([i915#4613])
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-rkl-4/igt@[email protected]
* igt@gem_partial_pwrite_pread@writes-after-reads-uncached:
- shard-rkl: NOTRUN -> [SKIP][23] ([i915#3282])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-rkl-4/igt@[email protected]
* igt@gem_pwrite@basic-exhaustion:
- shard-snb: NOTRUN -> [WARN][24] ([i915#2658])
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-snb6/igt@[email protected]
* igt@gem_pxp@reject-modify-context-protection-on:
- shard-rkl: NOTRUN -> [SKIP][25] ([i915#4270])
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-rkl-4/igt@[email protected]
* igt@gem_userptr_blits@forbidden-operations:
- shard-mtlp: NOTRUN -> [SKIP][26] ([i915#3282])
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-mtlp-7/igt@[email protected]
* igt@gem_userptr_blits@readonly-pwrite-unsync:
- shard-rkl: NOTRUN -> [SKIP][27] ([i915#3297])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-rkl-4/igt@[email protected]
* igt@gen7_exec_parse@cmd-crossing-page:
- shard-rkl: NOTRUN -> [SKIP][28] ([fdo#109289])
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-rkl-4/igt@[email protected]
* igt@gen9_exec_parse@bb-start-out:
- shard-rkl: NOTRUN -> [SKIP][29] ([i915#2527])
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-rkl-4/igt@[email protected]
* igt@i915_pm_freq_mult@media-freq@gt0:
- shard-rkl: NOTRUN -> [SKIP][30] ([i915#6590])
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-rkl-4/igt@i915_pm_freq_mult@[email protected]
* igt@i915_pm_rc6_residency@rc6-idle@vecs0:
- shard-dg1: [PASS][31] -> [FAIL][32] ([i915#3591])
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13426/shard-dg1-17/igt@i915_pm_rc6_residency@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-dg1-18/igt@i915_pm_rc6_residency@[email protected]
* igt@i915_pm_rpm@basic-pci-d3-state:
- shard-dg1: [PASS][33] -> [FAIL][34] ([i915#7691])
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13426/shard-dg1-19/igt@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-dg1-15/igt@[email protected]
* igt@i915_pm_rpm@dpms-mode-unset-lpsp:
- shard-dg2: [PASS][35] -> [SKIP][36] ([i915#1397]) +2 similar issues
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13426/shard-dg2-10/igt@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-dg2-8/igt@[email protected]
* igt@i915_pm_rpm@dpms-non-lpsp:
- shard-dg1: [PASS][37] -> [SKIP][38] ([i915#1397]) +1 similar issue
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13426/shard-dg1-16/igt@[email protected]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-dg1-19/igt@[email protected]
* igt@i915_pm_rpm@gem-execbuf-stress@lmem0:
- shard-dg1: [PASS][39] -> [FAIL][40] ([i915#7940])
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13426/shard-dg1-15/igt@i915_pm_rpm@[email protected]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-dg1-14/igt@i915_pm_rpm@[email protected]
* igt@i915_pm_rpm@modeset-non-lpsp:
- shard-rkl: [PASS][41] -> [SKIP][42] ([i915#1397]) +1 similar issue
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13426/shard-rkl-4/igt@[email protected]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-rkl-7/igt@[email protected]
* igt@i915_pm_rpm@pm-caching:
- shard-mtlp: NOTRUN -> [SKIP][43] ([i915#4077]) +1 similar issue
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-mtlp-3/igt@[email protected]
* igt@i915_pm_rpm@system-suspend-modeset:
- shard-dg2: [PASS][44] -> [FAIL][45] ([fdo#103375]) +2 similar issues
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13426/shard-dg2-11/igt@[email protected]
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-dg2-5/igt@[email protected]
* igt@i915_pm_rps@waitboost:
- shard-mtlp: NOTRUN -> [FAIL][46] ([i915#8346])
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-mtlp-3/igt@[email protected]
* igt@kms_atomic_transition@plane-all-modeset-transition-fencing-internal-panels:
- shard-snb: NOTRUN -> [SKIP][47] ([fdo#109271] / [i915#1769])
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-snb6/igt@kms_atomic_transition@plane-all-modeset-transition-fencing-internal-panels.html
* igt@kms_atomic_transition@plane-all-modeset-transition-internal-panels:
- shard-rkl: NOTRUN -> [SKIP][48] ([i915#1769] / [i915#3555])
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-rkl-4/igt@kms_atomic_transition@plane-all-modeset-transition-internal-panels.html
* igt@kms_big_fb@4-tiled-32bpp-rotate-0:
- shard-rkl: NOTRUN -> [SKIP][49] ([i915#5286]) +1 similar issue
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-rkl-4/igt@[email protected]
* igt@kms_big_fb@x-tiled-16bpp-rotate-90:
- shard-rkl: NOTRUN -> [SKIP][50] ([fdo#111614] / [i915#3638])
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-rkl-4/igt@[email protected]
* igt@kms_big_fb@yf-tiled-32bpp-rotate-270:
- shard-mtlp: NOTRUN -> [SKIP][51] ([fdo#111615])
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-mtlp-7/igt@[email protected]
* igt@kms_big_fb@yf-tiled-64bpp-rotate-0:
- shard-rkl: NOTRUN -> [SKIP][52] ([fdo#110723]) +1 similar issue
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-rkl-4/igt@[email protected]
* igt@kms_ccs@pipe-a-missing-ccs-buffer-y_tiled_gen12_mc_ccs:
- shard-glk: NOTRUN -> [SKIP][53] ([fdo#109271] / [i915#3886]) +3 similar issues
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-glk1/igt@kms_ccs@pipe-a-missing-ccs-buffer-y_tiled_gen12_mc_ccs.html
* igt@kms_ccs@pipe-b-ccs-on-another-bo-yf_tiled_ccs:
- shard-rkl: NOTRUN -> [SKIP][54] ([i915#3734] / [i915#5354] / [i915#6095])
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-rkl-4/igt@kms_ccs@pipe-b-ccs-on-another-bo-yf_tiled_ccs.html
* igt@kms_ccs@pipe-b-crc-sprite-planes-basic-4_tiled_mtl_rc_ccs_cc:
- shard-rkl: NOTRUN -> [SKIP][55] ([i915#5354] / [i915#6095]) +4 similar issues
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-rkl-4/igt@kms_ccs@pipe-b-crc-sprite-planes-basic-4_tiled_mtl_rc_ccs_cc.html
* igt@kms_ccs@pipe-b-random-ccs-data-4_tiled_dg2_rc_ccs:
- shard-mtlp: NOTRUN -> [SKIP][56] ([i915#6095]) +4 similar issues
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-mtlp-3/igt@kms_ccs@pipe-b-random-ccs-data-4_tiled_dg2_rc_ccs.html
* igt@kms_ccs@pipe-c-bad-rotation-90-y_tiled_gen12_mc_ccs:
- shard-mtlp: NOTRUN -> [SKIP][57] ([i915#3886] / [i915#6095])
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-mtlp-3/igt@kms_ccs@pipe-c-bad-rotation-90-y_tiled_gen12_mc_ccs.html
* igt@kms_ccs@pipe-c-random-ccs-data-yf_tiled_ccs:
- shard-rkl: NOTRUN -> [SKIP][58] ([i915#5354]) +7 similar issues
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-rkl-4/igt@kms_ccs@pipe-c-random-ccs-data-yf_tiled_ccs.html
* igt@kms_chamelium_audio@dp-audio-edid:
- shard-mtlp: NOTRUN -> [SKIP][59] ([i915#7828])
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-mtlp-3/igt@[email protected]
* igt@kms_chamelium_color@ctm-0-75:
- shard-rkl: NOTRUN -> [SKIP][60] ([fdo#111827])
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-rkl-4/igt@[email protected]
* igt@kms_chamelium_hpd@hdmi-hpd-fast:
- shard-rkl: NOTRUN -> [SKIP][61] ([i915#7828]) +1 similar issue
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-rkl-4/igt@[email protected]
* igt@kms_concurrent@pipe-c:
- shard-rkl: NOTRUN -> [SKIP][62] ([i915#4070] / [i915#6768]) +1 similar issue
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-rkl-4/igt@[email protected]
* igt@kms_content_protection@uevent@pipe-a-dp-2:
- shard-dg2: NOTRUN -> [FAIL][63] ([i915#1339])
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-dg2-12/igt@kms_content_protection@[email protected]
* igt@kms_cursor_crc@cursor-sliding-32x32:
- shard-rkl: NOTRUN -> [SKIP][64] ([i915#3555])
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-rkl-4/igt@[email protected]
* igt@kms_cursor_legacy@cursora-vs-flipb-legacy:
- shard-mtlp: NOTRUN -> [SKIP][65] ([i915#3546])
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-mtlp-3/igt@[email protected]
* igt@kms_dsc@dsc-with-bpc-formats:
- shard-glk: NOTRUN -> [SKIP][66] ([fdo#109271]) +25 similar issues
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-glk1/igt@[email protected]
* igt@kms_flip@2x-plain-flip-interruptible:
- shard-rkl: NOTRUN -> [SKIP][67] ([fdo#111825]) +1 similar issue
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-rkl-4/igt@[email protected]
* igt@kms_flip@flip-vs-suspend-interruptible@c-dp1:
- shard-apl: [PASS][68] -> [ABORT][69] ([i915#180])
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13426/shard-apl6/igt@kms_flip@[email protected]
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-apl2/igt@kms_flip@[email protected]
* igt@kms_flip_scaled_crc@flip-32bpp-yftile-to-32bpp-yftileccs-downscaling@pipe-a-valid-mode:
- shard-rkl: NOTRUN -> [SKIP][70] ([i915#2672])
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-rkl-4/igt@kms_flip_scaled_crc@flip-32bpp-yftile-to-32bpp-yftileccs-downscaling@pipe-a-valid-mode.html
* igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-spr-indfb-onoff:
- shard-snb: NOTRUN -> [SKIP][71] ([fdo#109271]) +97 similar issues
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-snb6/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbcpsr-2p-primscrn-spr-indfb-draw-mmap-cpu:
- shard-mtlp: NOTRUN -> [SKIP][72] ([i915#1825]) +1 similar issue
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-mtlp-3/igt@kms_frontbuffer_tracking@fbcpsr-2p-primscrn-spr-indfb-draw-mmap-cpu.html
* igt@kms_frontbuffer_tracking@fbcpsr-2p-scndscrn-spr-indfb-onoff:
- shard-rkl: NOTRUN -> [SKIP][73] ([fdo#111825] / [i915#1825]) +7 similar issues
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-rkl-4/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbcpsr-farfromfence-mmap-gtt:
- shard-rkl: NOTRUN -> [SKIP][74] ([i915#3023]) +5 similar issues
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-rkl-4/igt@[email protected]
* igt@kms_frontbuffer_tracking@psr-2p-scndscrn-pri-indfb-draw-mmap-wc:
- shard-apl: NOTRUN -> [SKIP][75] ([fdo#109271]) +4 similar issues
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-apl6/igt@kms_frontbuffer_tracking@psr-2p-scndscrn-pri-indfb-draw-mmap-wc.html
* igt@kms_hdr@static-swap:
- shard-dg2: NOTRUN -> [SKIP][76] ([i915#3555] / [i915#8228]) +2 similar issues
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-dg2-1/igt@[email protected]
* igt@kms_pipe_crc_basic@suspend-read-crc@pipe-d-dp-4:
- shard-dg2: NOTRUN -> [FAIL][77] ([fdo#103375])
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-dg2-11/igt@kms_pipe_crc_basic@[email protected]
* igt@kms_plane@pixel-format@pipe-b-planes:
- shard-mtlp: [PASS][78] -> [FAIL][79] ([i915#1623])
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13426/shard-mtlp-3/igt@kms_plane@[email protected]
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-mtlp-2/igt@kms_plane@[email protected]
* igt@kms_plane_scaling@intel-max-src-size@pipe-a-hdmi-a-4:
- shard-dg1: NOTRUN -> [FAIL][80] ([i915#8292])
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-dg1-15/igt@kms_plane_scaling@[email protected]
* igt@kms_plane_scaling@plane-downscale-with-pixel-format-factor-0-25@pipe-a-hdmi-a-3:
- shard-dg2: NOTRUN -> [SKIP][81] ([i915#5176]) +7 similar issues
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-dg2-1/igt@kms_plane_scaling@plane-downscale-with-pixel-format-factor-0-25@pipe-a-hdmi-a-3.html
* igt@kms_plane_scaling@plane-downscale-with-rotation-factor-0-25@pipe-b-hdmi-a-1:
- shard-rkl: NOTRUN -> [SKIP][82] ([i915#5176]) +5 similar issues
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-rkl-7/igt@kms_plane_scaling@[email protected]
* igt@kms_plane_scaling@plane-scaler-with-rotation-unity-scaling@pipe-c-hdmi-a-1:
- shard-dg1: NOTRUN -> [SKIP][83] ([i915#5176]) +23 similar issues
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-dg1-19/igt@kms_plane_scaling@[email protected]
* igt@kms_plane_scaling@planes-upscale-factor-0-25-downscale-factor-0-25@pipe-a-hdmi-a-3:
- shard-dg2: NOTRUN -> [SKIP][84] ([i915#5235]) +11 similar issues
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-dg2-8/igt@kms_plane_scaling@planes-upscale-factor-0-25-downscale-factor-0-25@pipe-a-hdmi-a-3.html
* igt@kms_plane_scaling@planes-upscale-factor-0-25-downscale-factor-0-25@pipe-b-hdmi-a-2:
- shard-rkl: NOTRUN -> [SKIP][85] ([i915#5235]) +3 similar issues
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-rkl-4/igt@kms_plane_scaling@planes-upscale-factor-0-25-downscale-factor-0-25@pipe-b-hdmi-a-2.html
* igt@kms_plane_scaling@planes-upscale-factor-0-25-downscale-factor-0-25@pipe-d-hdmi-a-4:
- shard-dg1: NOTRUN -> [SKIP][86] ([i915#5235]) +11 similar issues
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-dg1-15/igt@kms_plane_scaling@planes-upscale-factor-0-25-downscale-factor-0-25@pipe-d-hdmi-a-4.html
* igt@kms_psr2_sf@cursor-plane-move-continuous-exceed-sf:
- shard-glk: NOTRUN -> [SKIP][87] ([fdo#109271] / [i915#658]) +1 similar issue
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-glk1/igt@[email protected]
* igt@kms_psr@primary_mmap_cpu:
- shard-rkl: NOTRUN -> [SKIP][88] ([i915#1072])
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-rkl-4/igt@kms_psr@primary_mmap_cpu.html
* igt@kms_setmode@basic@pipe-a-vga-1:
- shard-snb: NOTRUN -> [FAIL][89] ([i915#5465]) +1 similar issue
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-snb6/igt@kms_setmode@[email protected]
* igt@kms_vblank@pipe-d-query-busy:
- shard-rkl: NOTRUN -> [SKIP][90] ([i915#4070] / [i915#533] / [i915#6768]) +1 similar issue
[90]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-rkl-4/igt@[email protected]
* igt@prime_udl:
- shard-mtlp: NOTRUN -> [SKIP][91] ([fdo#109291])
[91]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-mtlp-3/igt@prime_udl.html
* igt@v3d/v3d_get_param@get-bad-flags:
- shard-mtlp: NOTRUN -> [SKIP][92] ([i915#2575]) +1 similar issue
[92]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-mtlp-3/igt@v3d/[email protected]
* igt@v3d/v3d_submit_csd@valid-multisync-submission:
- shard-rkl: NOTRUN -> [SKIP][93] ([fdo#109315]) +2 similar issues
[93]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-rkl-4/igt@v3d/[email protected]
* igt@vc4/vc4_mmap@mmap-bo:
- shard-rkl: NOTRUN -> [SKIP][94] ([i915#7711]) +1 similar issue
[94]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-rkl-4/igt@vc4/[email protected]
#### Possible fixes ####
* igt@drm_fdinfo@most-busy-idle-check-all@rcs0:
- shard-rkl: [FAIL][95] ([i915#7742]) -> [PASS][96]
[95]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13426/shard-rkl-2/igt@drm_fdinfo@[email protected]
[96]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-rkl-6/igt@drm_fdinfo@[email protected]
* igt@gem_barrier_race@remote-request@rcs0:
- shard-apl: [ABORT][97] ([i915#7461] / [i915#8211] / [i915#8234] / [i915#8690]) -> [PASS][98]
[97]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13426/shard-apl2/igt@gem_barrier_race@[email protected]
[98]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-apl6/igt@gem_barrier_race@[email protected]
* igt@gem_caching@reads:
- shard-dg1: [DMESG-WARN][99] ([i915#4423]) -> [PASS][100]
[99]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13426/shard-dg1-15/igt@[email protected]
[100]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-dg1-14/igt@[email protected]
* igt@gem_create@hog-create@smem0:
- shard-dg2: [FAIL][101] ([i915#5892] / [i915#8758]) -> [PASS][102]
[101]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13426/shard-dg2-5/igt@gem_create@[email protected]
[102]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-dg2-1/igt@gem_create@[email protected]
* igt@gem_exec_balancer@full-pulse:
- shard-dg2: [FAIL][103] ([i915#6032]) -> [PASS][104]
[103]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13426/shard-dg2-5/igt@[email protected]
[104]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-dg2-1/igt@[email protected]
* igt@gem_exec_fair@basic-deadline:
- shard-glk: [FAIL][105] ([i915#2846]) -> [PASS][106]
[105]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13426/shard-glk8/igt@[email protected]
[106]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-glk4/igt@[email protected]
* igt@gem_exec_fair@basic-none-share@rcs0:
- shard-glk: [FAIL][107] ([i915#2842]) -> [PASS][108]
[107]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13426/shard-glk4/igt@gem_exec_fair@[email protected]
[108]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-glk5/igt@gem_exec_fair@[email protected]
* igt@gem_exec_fair@basic-pace@rcs0:
- shard-rkl: [FAIL][109] ([i915#2842]) -> [PASS][110]
[109]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13426/shard-rkl-2/igt@gem_exec_fair@[email protected]
[110]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-rkl-2/igt@gem_exec_fair@[email protected]
* igt@gem_lmem_swapping@smem-oom@lmem0:
- shard-dg1: [TIMEOUT][111] ([i915#5493]) -> [PASS][112]
[111]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13426/shard-dg1-18/igt@gem_lmem_swapping@[email protected]
[112]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-dg1-18/igt@gem_lmem_swapping@[email protected]
* igt@i915_module_load@reload-with-fault-injection:
- shard-dg2: [DMESG-WARN][113] ([i915#7061] / [i915#8617]) -> [PASS][114]
[113]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13426/shard-dg2-1/igt@[email protected]
[114]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-dg2-2/igt@[email protected]
- shard-mtlp: [ABORT][115] ([i915#8489] / [i915#8668]) -> [PASS][116]
[115]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13426/shard-mtlp-4/igt@[email protected]
[116]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-mtlp-3/igt@[email protected]
* igt@i915_pm_lpsp@kms-lpsp@kms-lpsp-hdmi-a:
- shard-dg1: [SKIP][117] ([i915#1937]) -> [PASS][118]
[117]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13426/shard-dg1-13/igt@i915_pm_lpsp@[email protected]
[118]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-dg1-19/igt@i915_pm_lpsp@[email protected]
* igt@i915_pm_rc6_residency@rc6-idle@bcs0:
- shard-dg1: [FAIL][119] ([i915#3591]) -> [PASS][120]
[119]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13426/shard-dg1-17/igt@i915_pm_rc6_residency@[email protected]
[120]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-dg1-18/igt@i915_pm_rc6_residency@[email protected]
* igt@i915_pm_rpm@dpms-lpsp:
- shard-rkl: [SKIP][121] ([i915#1397]) -> [PASS][122]
[121]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13426/shard-rkl-1/igt@[email protected]
[122]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-rkl-7/igt@[email protected]
* igt@i915_pm_rpm@gem-execbuf-stress@smem0:
- shard-dg1: [FAIL][123] ([i915#7940]) -> [PASS][124]
[123]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13426/shard-dg1-15/igt@i915_pm_rpm@[email protected]
[124]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-dg1-14/igt@i915_pm_rpm@[email protected]
* igt@i915_selftest@live@requests:
- shard-mtlp: [DMESG-FAIL][125] ([i915#7269]) -> [PASS][126]
[125]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13426/shard-mtlp-1/igt@i915_selftest@[email protected]
[126]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-mtlp-4/igt@i915_selftest@[email protected]
* igt@kms_big_fb@4-tiled-64bpp-rotate-180:
- shard-mtlp: [FAIL][127] ([i915#5138]) -> [PASS][128]
[127]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13426/shard-mtlp-4/igt@[email protected]
[128]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-mtlp-3/igt@[email protected]
* igt@kms_big_fb@4-tiled-max-hw-stride-64bpp-rotate-180-async-flip:
- shard-mtlp: [FAIL][129] ([i915#3743]) -> [PASS][130]
[129]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13426/shard-mtlp-3/igt@kms_big_fb@4-tiled-max-hw-stride-64bpp-rotate-180-async-flip.html
[130]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-mtlp-2/igt@kms_big_fb@4-tiled-max-hw-stride-64bpp-rotate-180-async-flip.html
* igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size:
- shard-apl: [FAIL][131] ([i915#2346]) -> [PASS][132]
[131]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13426/shard-apl6/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html
[132]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-apl2/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html
* igt@kms_flip@flip-vs-expired-vblank@d-hdmi-a4:
- shard-dg1: [FAIL][133] -> [PASS][134]
[133]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13426/shard-dg1-17/igt@kms_flip@[email protected]
[134]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-dg1-16/igt@kms_flip@[email protected]
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-move:
- shard-dg2: [FAIL][135] ([i915#6880]) -> [PASS][136] +2 similar issues
[135]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13426/shard-dg2-11/igt@[email protected]
[136]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-dg2-5/igt@[email protected]
* igt@kms_rotation_crc@primary-rotation-90:
- shard-rkl: [ABORT][137] ([i915#8311]) -> [PASS][138]
[137]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13426/shard-rkl-6/igt@[email protected]
[138]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-rkl-4/igt@[email protected]
* igt@perf@non-zero-reason@0-rcs0:
- shard-dg2: [FAIL][139] ([i915#7484]) -> [PASS][140]
[139]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13426/shard-dg2-7/igt@perf@[email protected]
[140]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-dg2-6/igt@perf@[email protected]
* igt@perf@stress-open-close@0-rcs0:
- shard-glk: [ABORT][141] ([i915#5213] / [i915#7941]) -> [PASS][142]
[141]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13426/shard-glk6/igt@perf@[email protected]
[142]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-glk1/igt@perf@[email protected]
* igt@perf_pmu@busy-double-start@vecs1:
- shard-dg2: [FAIL][143] ([i915#4349]) -> [PASS][144] +3 similar issues
[143]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13426/shard-dg2-1/igt@perf_pmu@[email protected]
[144]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-dg2-6/igt@perf_pmu@[email protected]
#### Warnings ####
* igt@gem_exec_whisper@basic-contexts-forked-all:
- shard-mtlp: [TIMEOUT][145] ([i915#8628]) -> [ABORT][146] ([i915#8131])
[145]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13426/shard-mtlp-2/igt@[email protected]
[146]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-mtlp-7/igt@[email protected]
* igt@gem_lmem_swapping@smem-oom@lmem0:
- shard-dg2: [DMESG-WARN][147] ([i915#4936] / [i915#5493]) -> [TIMEOUT][148] ([i915#5493])
[147]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13426/shard-dg2-3/igt@gem_lmem_swapping@[email protected]
[148]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-dg2-5/igt@gem_lmem_swapping@[email protected]
* igt@i915_pm_rpm@i2c:
- shard-dg1: [DMESG-WARN][149] ([i915#4391]) -> [DMESG-WARN][150] ([i915#4391] / [i915#4423])
[149]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13426/shard-dg1-19/igt@[email protected]
[150]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-dg1-15/igt@[email protected]
* igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size:
- shard-mtlp: [FAIL][151] ([i915#2346]) -> [DMESG-FAIL][152] ([i915#2017] / [i915#5954])
[151]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13426/shard-mtlp-3/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html
[152]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-mtlp-2/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html
* igt@kms_flip@2x-flip-vs-absolute-wf_vblank-interruptible:
- shard-dg1: [SKIP][153] ([fdo#111825] / [i915#4423]) -> [SKIP][154] ([fdo#111825])
[153]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13426/shard-dg1-15/igt@kms_flip@2x-flip-vs-absolute-wf_vblank-interruptible.html
[154]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-dg1-14/igt@kms_flip@2x-flip-vs-absolute-wf_vblank-interruptible.html
* igt@kms_force_connector_basic@force-load-detect:
- shard-rkl: [SKIP][155] ([fdo#109285]) -> [SKIP][156] ([fdo#109285] / [i915#4098])
[155]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13426/shard-rkl-6/igt@[email protected]
[156]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-rkl-1/igt@[email protected]
* igt@kms_psr@cursor_plane_move:
- shard-dg1: [SKIP][157] ([i915#1072]) -> [SKIP][158] ([i915#1072] / [i915#4078]) +1 similar issue
[157]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13426/shard-dg1-17/igt@kms_psr@cursor_plane_move.html
[158]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-dg1-18/igt@kms_psr@cursor_plane_move.html
* igt@kms_psr@sprite_plane_onoff:
- shard-dg1: [SKIP][159] ([i915#1072] / [i915#4078]) -> [SKIP][160] ([i915#1072])
[159]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13426/shard-dg1-13/igt@kms_psr@sprite_plane_onoff.html
[160]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-dg1-19/igt@kms_psr@sprite_plane_onoff.html
* igt@prime_mmap@test_aperture_limit@test_aperture_limit-smem:
- shard-dg2: [INCOMPLETE][161] ([i915#5493]) -> [CRASH][162] ([i915#7331])
[161]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13426/shard-dg2-5/igt@prime_mmap@test_aperture_limit@test_aperture_limit-smem.html
[162]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-dg2-2/igt@prime_mmap@test_aperture_limit@test_aperture_limit-smem.html
* igt@runner@aborted:
- shard-snb: ([FAIL][163], [FAIL][164]) ([i915#7812] / [i915#8848]) -> [FAIL][165] ([i915#7812])
[163]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13426/shard-snb7/igt@[email protected]
[164]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13426/shard-snb7/igt@[email protected]
[165]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/shard-snb5/igt@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#103375]: https://bugs.freedesktop.org/show_bug.cgi?id=103375
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[fdo#109289]: https://bugs.freedesktop.org/show_bug.cgi?id=109289
[fdo#109291]: https://bugs.freedesktop.org/show_bug.cgi?id=109291
[fdo#109315]: https://bugs.freedesktop.org/show_bug.cgi?id=109315
[fdo#110723]: https://bugs.freedesktop.org/show_bug.cgi?id=110723
[fdo#111614]: https://bugs.freedesktop.org/show_bug.cgi?id=111614
[fdo#111615]: https://bugs.freedesktop.org/show_bug.cgi?id=111615
[fdo#111825]: https://bugs.freedesktop.org/show_bug.cgi?id=111825
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
[i915#1339]: https://gitlab.freedesktop.org/drm/intel/issues/1339
[i915#1397]: https://gitlab.freedesktop.org/drm/intel/issues/1397
[i915#1623]: https://gitlab.freedesktop.org/drm/intel/issues/1623
[i915#1769]: https://gitlab.freedesktop.org/drm/intel/issues/1769
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#1825]: https://gitlab.freedesktop.org/drm/intel/issues/1825
[i915#1937]: https://gitlab.freedesktop.org/drm/intel/issues/1937
[i915#2017]: https://gitlab.freedesktop.org/drm/intel/issues/2017
[i915#2346]: https://gitlab.freedesktop.org/drm/intel/issues/2346
[i915#2527]: https://gitlab.freedesktop.org/drm/intel/issues/2527
[i915#2575]: https://gitlab.freedesktop.org/drm/intel/issues/2575
[i915#2658]: https://gitlab.freedesktop.org/drm/intel/issues/2658
[i915#2672]: https://gitlab.freedesktop.org/drm/intel/issues/2672
[i915#2842]: https://gitlab.freedesktop.org/drm/intel/issues/2842
[i915#2846]: https://gitlab.freedesktop.org/drm/intel/issues/2846
[i915#3023]: https://gitlab.freedesktop.org/drm/intel/issues/3023
[i915#3281]: https://gitlab.freedesktop.org/drm/intel/issues/3281
[i915#3282]: https://gitlab.freedesktop.org/drm/intel/issues/3282
[i915#3297]: https://gitlab.freedesktop.org/drm/intel/issues/3297
[i915#3546]: https://gitlab.freedesktop.org/drm/intel/issues/3546
[i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
[i915#3591]: https://gitlab.freedesktop.org/drm/intel/issues/3591
[i915#3638]: https://gitlab.freedesktop.org/drm/intel/issues/3638
[i915#3734]: https://gitlab.freedesktop.org/drm/intel/issues/3734
[i915#3743]: https://gitlab.freedesktop.org/drm/intel/issues/3743
[i915#3886]: https://gitlab.freedesktop.org/drm/intel/issues/3886
[i915#4036]: https://gitlab.freedesktop.org/drm/intel/issues/4036
[i915#4070]: https://gitlab.freedesktop.org/drm/intel/issues/4070
[i915#4077]: https://gitlab.freedesktop.org/drm/intel/issues/4077
[i915#4078]: https://gitlab.freedesktop.org/drm/intel/issues/4078
[i915#4098]: https://gitlab.freedesktop.org/drm/intel/issues/4098
[i915#4270]: https://gitlab.freedesktop.org/drm/intel/issues/4270
[i915#4349]: https://gitlab.freedesktop.org/drm/intel/issues/4349
[i915#4391]: https://gitlab.freedesktop.org/drm/intel/issues/4391
[i915#4423]: https://gitlab.freedesktop.org/drm/intel/issues/4423
[i915#4525]: https://gitlab.freedesktop.org/drm/intel/issues/4525
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#4936]: https://gitlab.freedesktop.org/drm/intel/issues/4936
[i915#5138]: https://gitlab.freedesktop.org/drm/intel/issues/5138
[i915#5176]: https://gitlab.freedesktop.org/drm/intel/issues/5176
[i915#5213]: https://gitlab.freedesktop.org/drm/intel/issues/5213
[i915#5235]: https://gitlab.freedesktop.org/drm/intel/issues/5235
[i915#5286]: https://gitlab.freedesktop.org/drm/intel/issues/5286
[i915#533]: https://gitlab.freedesktop.org/drm/intel/issues/533
[i915#5354]: https://gitlab.freedesktop.org/drm/intel/issues/5354
[i915#5465]: https://gitlab.freedesktop.org/drm/intel/issues/5465
[i915#5493]: https://gitlab.freedesktop.org/drm/intel/issues/5493
[i915#5784]: https://gitlab.freedesktop.org/drm/intel/issues/5784
[i915#5892]: https://gitlab.freedesktop.org/drm/intel/issues/5892
[i915#5954]: https://gitlab.freedesktop.org/drm/intel/issues/5954
[i915#6032]: https://gitlab.freedesktop.org/drm/intel/issues/6032
[i915#6095]: https://gitlab.freedesktop.org/drm/intel/issues/6095
[i915#658]: https://gitlab.freedesktop.org/drm/intel/issues/658
[i915#6590]: https://gitlab.freedesktop.org/drm/intel/issues/6590
[i915#6768]: https://gitlab.freedesktop.org/drm/intel/issues/6768
[i915#6880]: https://gitlab.freedesktop.org/drm/intel/issues/6880
[i915#7061]: https://gitlab.freedesktop.org/drm/intel/issues/7061
[i915#7269]: https://gitlab.freedesktop.org/drm/intel/issues/7269
[i915#7331]: https://gitlab.freedesktop.org/drm/intel/issues/7331
[i915#7461]: https://gitlab.freedesktop.org/drm/intel/issues/7461
[i915#7484]: https://gitlab.freedesktop.org/drm/intel/issues/7484
[i915#7691]: https://gitlab.freedesktop.org/drm/intel/issues/7691
[i915#7697]: https://gitlab.freedesktop.org/drm/intel/issues/7697
[i915#7711]: https://gitlab.freedesktop.org/drm/intel/issues/7711
[i915#7742]: https://gitlab.freedesktop.org/drm/intel/issues/7742
[i915#7812]: https://gitlab.freedesktop.org/drm/intel/issues/7812
[i915#7828]: https://gitlab.freedesktop.org/drm/intel/issues/7828
[i915#7940]: https://gitlab.freedesktop.org/drm/intel/issues/7940
[i915#7941]: https://gitlab.freedesktop.org/drm/intel/issues/7941
[i915#7975]: https://gitlab.freedesktop.org/drm/intel/issues/7975
[i915#8131]: https://gitlab.freedesktop.org/drm/intel/issues/8131
[i915#8211]: https://gitlab.freedesktop.org/drm/intel/issues/8211
[i915#8213]: https://gitlab.freedesktop.org/drm/intel/issues/8213
[i915#8228]: https://gitlab.freedesktop.org/drm/intel/issues/8228
[i915#8234]: https://gitlab.freedesktop.org/drm/intel/issues/8234
[i915#8292]: https://gitlab.freedesktop.org/drm/intel/issues/8292
[i915#8311]: https://gitlab.freedesktop.org/drm/intel/issues/8311
[i915#8346]: https://gitlab.freedesktop.org/drm/intel/issues/8346
[i915#8414]: https://gitlab.freedesktop.org/drm/intel/issues/8414
[i915#8489]: https://gitlab.freedesktop.org/drm/intel/issues/8489
[i915#8617]: https://gitlab.freedesktop.org/drm/intel/issues/8617
[i915#8628]: https://gitlab.freedesktop.org/drm/intel/issues/8628
[i915#8661]: https://gitlab.freedesktop.org/drm/intel/issues/8661
[i915#8668]: https://gitlab.freedesktop.org/drm/intel/issues/8668
[i915#8690]: https://gitlab.freedesktop.org/drm/intel/issues/8690
[i915#8758]: https://gitlab.freedesktop.org/drm/intel/issues/8758
[i915#8841]: https://gitlab.freedesktop.org/drm/intel/issues/8841
[i915#8848]: https://gitlab.freedesktop.org/drm/intel/issues/8848
Build changes
-------------
* Linux: CI_DRM_13426 -> Patchwork_121387v1
CI-20190529: 20190529
CI_DRM_13426: 50f130ab3021dd575aca3fab9c08eae15cd323a8 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7405: 6745761cb6050514a12aac973d02aeccdff06255 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_121387v1: 50f130ab3021dd575aca3fab9c08eae15cd323a8 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_121387v1/index.html
Quoted 27 lines · Dnyaneshwar Bhadane
Replacing the acronym used in platform/sub platform defines. This series covers Haswell, Broadwell, Skylake, Kabylake, Coffeelake, Cometlake, Rocketlake, Jasperlake, Elkhartlake, Tigerlake, Alderlake, platform define.This way there is a consistent pattern
to how platforms are referred.splitting to per paltform for easier cherrypicks, if needed.v2:
- Reordered patches by incrementing platform generations.(Anusha)
- Changeed the commit subject with lowercase platform names.
v3:
- The IS_PLATFORM_(DISPLAY/MEDIA/GRAPHICS)_STEPS replace with Unrolled format. i.e.IS_PLATFORM_FULL_NAME() &&IS_DISPLAY_STEPS()v4:
- Removed the MTL platform from the renaming series (Mat Ropper)
- Removed the unused display steps macro.
- Resolved conflicts.Anusha Srivatsa (1):
drm/i915/adln: s/ADLP/ALDERLAKE_P in ADLN definesDnyaneshwar Bhadane (13):
drm/i915/hsw: s/HSW/HASWELL for platform/subplatform defines drm/i915/bdw: s/BDW/BROADWELL for platform/subplatform defines drm/i915/skl: s/SKL/SKYLAKE for platform/subplatform defines Follow consistent naming convention. Replace KBL with KABYLAKE.Replace
Quoted 5 lines
IS_KBL_GRAPHICS_STEP with IS_KABYLAKE () && IS_GRAPHICS_STEP().drm/i915/cfl: s/CFL/COFFEELAKE for platform/subplatform defines drm/i915/cml: s/CML/COMETLAKE for platform/subplatform defines drm/i915/rkl: s/RKL/ROCKETLAKE for platform/subplatform defines drm/i915/jsl: s/JSL/JASPERLAKE for platform/subplatform defines
With the checkpatch warnings fixed in the above patch, the series is
Quoted 42 lines
drm/i915/tgl: s/TGL/TIGERLAKE for platform/subplatform defines drm/i915/adlp: s/ADLP/ALDERLAKE_P for display and graphics step drm/i915/rplp: s/ADLP_RPLP/RAPTORLAKE_P for RPLP defines drm/i915/rplu: s/ADLP_RPLU/RAPTORLAKE_U in RPLU defines drm/i915/adls: s/ADLS_RPLS/RAPTORLAKE_S in platform and subplatform
definesCc Tvrtko Ursulin <[email protected]>Cc Jani Nikula <[email protected]>Cc Matt Roper <[email protected]>Cc Anusha Srivatsa <[email protected]>Cc matthew Atwood <[email protected]>drivers/gpu/drm/i915/display/icl_dsi.c | 5 +- drivers/gpu/drm/i915/display/intel_cdclk.c | 14 +-- .../gpu/drm/i915/display/intel_combo_phy.c | 7 +- drivers/gpu/drm/i915/display/intel_ddi.c | 7 +- .../drm/i915/display/intel_ddi_buf_trans.c | 10 +- drivers/gpu/drm/i915/display/intel_display.c | 7 +- .../drm/i915/display/intel_display_device.c | 2 +- .../drm/i915/display/intel_display_device.h | 2 +- .../drm/i915/display/intel_display_power.c | 2 +- drivers/gpu/drm/i915/display/intel_dp.c | 4 +- drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 33 ++++--- drivers/gpu/drm/i915/display/intel_hdmi.c | 3 +- .../gpu/drm/i915/display/intel_pch_refclk.c | 2 +- drivers/gpu/drm/i915/display/intel_psr.c | 10 +- .../drm/i915/display/skl_universal_plane.c | 6 +- drivers/gpu/drm/i915/gem/i915_gem_object.c | 2 +- drivers/gpu/drm/i915/gt/gen8_engine_cs.c | 2 +- drivers/gpu/drm/i915/gt/intel_gt.c | 2 +- drivers/gpu/drm/i915/gt/intel_sseu.c | 2 +- drivers/gpu/drm/i915/gt/intel_workarounds.c | 13 +-- .../gpu/drm/i915/gt/uc/intel_guc_hwconfig.c | 2 +- drivers/gpu/drm/i915/gt/uc/intel_uc.c | 2 +- drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 2 +- drivers/gpu/drm/i915/i915_driver.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 94 +++++++------------ drivers/gpu/drm/i915/intel_clock_gating.c | 4 +- drivers/gpu/drm/i915/intel_step.c | 10 +- drivers/gpu/drm/i915/soc/intel_pch.c | 18 ++-- 28 files changed, 127 insertions(+), 142 deletions(-)
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center