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, platoform 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.
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 drm/i915/kbl: s/KBL/KABYLAKE for platform/subplatform defines 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/ALDERLAKE_P for RPLP defines drm/i915/rplu: s/ADLP/ALDERLAKE_P in RPLU defines drm/i915/adls: s/ADLS/ALDERLAKE_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
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
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 12:33 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]>
This version is indeed neat and not sore to the eye at all. Thanks for this:
Quoted 37 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 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
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
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->engine->i915,0 ,STEP_C0 )) +if (IS_KABYLAKE (rq->engine->i915) &&IS_GRAPHICS_STEP (rq->engine->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
Re: [Intel-gfx] [PATCH v4 04/14] drm/i915/kbl: s/KBL/KABYLAKE for platform/subplatform defines
Quoted 24 lines
-----Original Message-----
From: Bhadane, Dnyaneshwar <[email protected]>
Sent: Wednesday, July 26, 2023 12:33 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 04/14] drm/i915/kbl: s/KBL/KABYLAKE for platform/subplatform definesFollow consistent naming convention. Replace KBL with KABYLAKE.Replace
IS_KBL_GRAPHICS_STEPwithIS_KABYLAKE() &&IS_GRAPHICS_STEP().v2:
- s/KBL/kbl in the subject prefix(Anusha)v3:
- Unrolled wrapperIS_KBL_GRAPHICS_STEP.
- Replace withIS_PLATFORM&&DISPLAY_STEP(tvrtko/jani)
Quoted 7 lines
v4:
- Removed unused macro.Cc Tvrtko Ursulin <[email protected]>Cc Jani Nikula <[email protected]>Cc Anusha Srivatsa <[email protected]>Signed-off-by Dnyaneshwar Bhadane <[email protected]>
Quoted 146 lines
--- 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 +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_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; diff --gita/drivers/gpu/drm/i915/gt/gen8_engine_cs.cb/drivers/gpu/drm/i915/gt/gen8_engine_cs.c
index23857cc08eca..971cddb6d760100644drivers/gpu/drm/i915/gt/gen8_engine_cs.c +2
-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->engine->i915,0 ,STEP_C0 )) +if (IS_KABYLAKE (rq->engine->i915) && +IS_GRAPHICS_STEP (rq->engine->i915,0 ,STEP_C0 )) dc_flush_wa = true; }drivers/gpu/drm/i915/gt/intel_workarounds.c +3
-2@@ -600,7 +600,7 @@ static void kbl_ctx_workarounds_init(structintel_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);drivers/gpu/drm/i915/gt/intel_workarounds.c +1
-1@@ -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),drivers/gpu/drm/i915/gt/intel_workarounds.c +0
-01);drivers/gpu/drm/i915/i915_drv.h +4
-3@@ -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 structdrm_i915_private*i915,drivers/gpu/drm/i915/i915_drv.h +0
-4IS_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)) diff --git
a/drivers/gpu/drm/i915/intel_clock_gating.cb/drivers/gpu/drm/i915/intel_clock_gating.c
indexd9600cd1ab06..81a4d32734e9100644drivers/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);--
2.34.1
Re: [Intel-gfx] [PATCH v4 04/14] drm/i915/kbl: s/KBL/KABYLAKE for platform/subplatform defines
In reply to Dnyaneshwar BhadaneQuoted 24 lines
-----Original Message-----
From: Bhadane, Dnyaneshwar <[email protected]>
Sent: Wednesday, July 26, 2023 12:33 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 04/14] drm/i915/kbl: s/KBL/KABYLAKE for platform/subplatform definesFollow consistent naming convention. Replace KBL with KABYLAKE.Replace
IS_KBL_GRAPHICS_STEPwithIS_KABYLAKE() &&IS_GRAPHICS_STEP().v2:
- s/KBL/kbl in the subject prefix(Anusha)v3:
- Unrolled wrapperIS_KBL_GRAPHICS_STEP.
- Replace withIS_PLATFORM&&DISPLAY_STEP(tvrtko/jani)
Quoted 7 lines
v4:
- Removed unused macro.Cc Tvrtko Ursulin <[email protected]>Cc Jani Nikula <[email protected]>Cc Anusha Srivatsa <[email protected]>Signed-off-by Dnyaneshwar Bhadane <[email protected]>
Quoted 146 lines
--- 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 +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_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; diff --gita/drivers/gpu/drm/i915/gt/gen8_engine_cs.cb/drivers/gpu/drm/i915/gt/gen8_engine_cs.c
index23857cc08eca..971cddb6d760100644drivers/gpu/drm/i915/gt/gen8_engine_cs.c +2
-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->engine->i915,0 ,STEP_C0 )) +if (IS_KABYLAKE (rq->engine->i915) && +IS_GRAPHICS_STEP (rq->engine->i915,0 ,STEP_C0 )) dc_flush_wa = true; }drivers/gpu/drm/i915/gt/intel_workarounds.c +3
-2@@ -600,7 +600,7 @@ static void kbl_ctx_workarounds_init(structintel_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);drivers/gpu/drm/i915/gt/intel_workarounds.c +1
-1@@ -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),drivers/gpu/drm/i915/gt/intel_workarounds.c +0
-01);drivers/gpu/drm/i915/i915_drv.h +4
-3@@ -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 structdrm_i915_private*i915,drivers/gpu/drm/i915/i915_drv.h +0
-4IS_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)) diff --git
a/drivers/gpu/drm/i915/intel_clock_gating.cb/drivers/gpu/drm/i915/intel_clock_gating.c
indexd9600cd1ab06..81a4d32734e9100644drivers/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);--
2.34.1
PATCH 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
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
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
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 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 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 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
PATCH 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.BUILD: 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/121385/
State : failure
== Summary ==
Error: patch https://patchwork.freedesktop.org/api/1.0/series/121385/revisions/1/mbox/ not applied
Applying: drm/i915/hsw: s/HSW/HASWELL for platform/subplatform defines
Applying: drm/i915/bdw: s/BDW/BROADWELL for platform/subplatform defines
Applying: drm/i915/skl: s/SKL/SKYLAKE for platform/subplatform defines
Applying: drm/i915/kbl: s/KBL/KABYLAKE for platform/subplatform defines
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/gt/gen8_engine_cs.c
M drivers/gpu/drm/i915/gt/intel_workarounds.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/gt/intel_workarounds.c
Auto-merging drivers/gpu/drm/i915/gt/gen8_engine_cs.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/gen8_engine_cs.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0004 drm/i915/kbl: s/KBL/KABYLAKE for platform/subplatform defines When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Build failed, no error log produced