Skip to content

Commit c224d89

Browse files
bhadanednyaneshwarRadhakrishna Sripada
bhadanednyaneshwar
authored and
Radhakrishna Sripada
committed
drm/i915/bdw: s/BDW/BROADWELL for platform/subplatform defines
Follow consistent naming convention. Replace BDW with BROADWELL. Signed-off-by: Dnyaneshwar Bhadane <dnyaneshwar.bhadane@intel.com> Reviewed-by: Anusha Srivatsa <anusha.srivatsa@intel.com> Acked-by: Jani Nikula <jani.nikula@intel.com> Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20230801135344.3797924-3-dnyaneshwar.bhadane@intel.com
1 parent 927a8e3 commit c224d89

5 files changed

Lines changed: 12 additions & 12 deletions

File tree

‎drivers/gpu/drm/i915/display/intel_cdclk.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3200,9 +3200,9 @@ void intel_update_max_cdclk(struct drm_i915_private *dev_priv)
32003200
*/
32013201
if (intel_de_read(dev_priv, FUSE_STRAP) & HSW_CDCLK_LIMIT)
32023202
dev_priv->display.cdclk.max_cdclk_freq = 450000;
3203-
else if (IS_BDW_ULX(dev_priv))
3203+
else if (IS_BROADWELL_ULX(dev_priv))
32043204
dev_priv->display.cdclk.max_cdclk_freq = 450000;
3205-
else if (IS_BDW_ULT(dev_priv))
3205+
else if (IS_BROADWELL_ULT(dev_priv))
32063206
dev_priv->display.cdclk.max_cdclk_freq = 540000;
32073207
else
32083208
dev_priv->display.cdclk.max_cdclk_freq = 675000;

‎drivers/gpu/drm/i915/display/intel_display.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7377,7 +7377,7 @@ static bool intel_ddi_crt_present(struct drm_i915_private *dev_priv)
73777377
if (DISPLAY_VER(dev_priv) >= 9)
73787378
return false;
73797379

7380-
if (IS_HASWELL_ULT(dev_priv) || IS_BDW_ULT(dev_priv))
7380+
if (IS_HASWELL_ULT(dev_priv) || IS_BROADWELL_ULT(dev_priv))
73817381
return false;
73827382

73837383
if (HAS_PCH_LPT_H(dev_priv) &&

‎drivers/gpu/drm/i915/gt/intel_workarounds.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@ static void bdw_ctx_workarounds_init(struct intel_engine_cs *engine,
420420
/* WaForceContextSaveRestoreNonCoherent:bdw */
421421
HDC_FORCE_CONTEXT_SAVE_RESTORE_NON_COHERENT |
422422
/* WaDisableFenceDestinationToSLM:bdw (pre-prod) */
423-
(IS_BDW_GT3(i915) ? HDC_FENCE_DEST_SLM_DISABLE : 0));
423+
(IS_BROADWELL_GT3(i915) ? HDC_FENCE_DEST_SLM_DISABLE : 0));
424424
}
425425

426426
static void chv_ctx_workarounds_init(struct intel_engine_cs *engine,

‎drivers/gpu/drm/i915/i915_drv.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -593,11 +593,11 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,
593593
IS_SUBPLATFORM(i915, INTEL_ALDERLAKE_P, INTEL_SUBPLATFORM_RPLU)
594594
#define IS_HASWELL_EARLY_SDV(i915) (IS_HASWELL(i915) && \
595595
(INTEL_DEVID(i915) & 0xFF00) == 0x0C00)
596-
#define IS_BDW_ULT(i915) \
596+
#define IS_BROADWELL_ULT(i915) \
597597
IS_SUBPLATFORM(i915, INTEL_BROADWELL, INTEL_SUBPLATFORM_ULT)
598-
#define IS_BDW_ULX(i915) \
598+
#define IS_BROADWELL_ULX(i915) \
599599
IS_SUBPLATFORM(i915, INTEL_BROADWELL, INTEL_SUBPLATFORM_ULX)
600-
#define IS_BDW_GT3(i915) (IS_BROADWELL(i915) && \
600+
#define IS_BROADWELL_GT3(i915) (IS_BROADWELL(i915) && \
601601
INTEL_INFO(i915)->gt == 3)
602602
#define IS_HASWELL_ULT(i915) \
603603
IS_SUBPLATFORM(i915, INTEL_HASWELL, INTEL_SUBPLATFORM_ULT)

‎drivers/gpu/drm/i915/soc/intel_pch.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,29 +32,29 @@ intel_pch_type(const struct drm_i915_private *dev_priv, unsigned short id)
3232
drm_WARN_ON(&dev_priv->drm,
3333
!IS_HASWELL(dev_priv) && !IS_BROADWELL(dev_priv));
3434
drm_WARN_ON(&dev_priv->drm,
35-
IS_HASWELL_ULT(dev_priv) || IS_BDW_ULT(dev_priv));
35+
IS_HASWELL_ULT(dev_priv) || IS_BROADWELL_ULT(dev_priv));
3636
return PCH_LPT;
3737
case INTEL_PCH_LPT_LP_DEVICE_ID_TYPE:
3838
drm_dbg_kms(&dev_priv->drm, "Found LynxPoint LP PCH\n");
3939
drm_WARN_ON(&dev_priv->drm,
4040
!IS_HASWELL(dev_priv) && !IS_BROADWELL(dev_priv));
4141
drm_WARN_ON(&dev_priv->drm,
42-
!IS_HASWELL_ULT(dev_priv) && !IS_BDW_ULT(dev_priv));
42+
!IS_HASWELL_ULT(dev_priv) && !IS_BROADWELL_ULT(dev_priv));
4343
return PCH_LPT;
4444
case INTEL_PCH_WPT_DEVICE_ID_TYPE:
4545
drm_dbg_kms(&dev_priv->drm, "Found WildcatPoint PCH\n");
4646
drm_WARN_ON(&dev_priv->drm,
4747
!IS_HASWELL(dev_priv) && !IS_BROADWELL(dev_priv));
4848
drm_WARN_ON(&dev_priv->drm,
49-
IS_HASWELL_ULT(dev_priv) || IS_BDW_ULT(dev_priv));
49+
IS_HASWELL_ULT(dev_priv) || IS_BROADWELL_ULT(dev_priv));
5050
/* WPT is LPT compatible */
5151
return PCH_LPT;
5252
case INTEL_PCH_WPT_LP_DEVICE_ID_TYPE:
5353
drm_dbg_kms(&dev_priv->drm, "Found WildcatPoint LP PCH\n");
5454
drm_WARN_ON(&dev_priv->drm,
5555
!IS_HASWELL(dev_priv) && !IS_BROADWELL(dev_priv));
5656
drm_WARN_ON(&dev_priv->drm,
57-
!IS_HASWELL_ULT(dev_priv) && !IS_BDW_ULT(dev_priv));
57+
!IS_HASWELL_ULT(dev_priv) && !IS_BROADWELL_ULT(dev_priv));
5858
/* WPT is LPT compatible */
5959
return PCH_LPT;
6060
case INTEL_PCH_SPT_DEVICE_ID_TYPE:
@@ -186,7 +186,7 @@ intel_virt_detect_pch(const struct drm_i915_private *dev_priv,
186186
id = INTEL_PCH_CNP_DEVICE_ID_TYPE;
187187
else if (IS_KABYLAKE(dev_priv) || IS_SKYLAKE(dev_priv))
188188
id = INTEL_PCH_SPT_DEVICE_ID_TYPE;
189-
else if (IS_HASWELL_ULT(dev_priv) || IS_BDW_ULT(dev_priv))
189+
else if (IS_HASWELL_ULT(dev_priv) || IS_BROADWELL_ULT(dev_priv))
190190
id = INTEL_PCH_LPT_LP_DEVICE_ID_TYPE;
191191
else if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv))
192192
id = INTEL_PCH_LPT_DEVICE_ID_TYPE;

0 commit comments

Comments
 (0)