mbox series

[v4,00/14] Replace acronym with full platform name in defines.

Message ID 20230726200657.2773903-1-dnyaneshwar.bhadane@intel.com (mailing list archive)
Headers show
Series Replace acronym with full platform name in defines. | expand

Message

Bhadane, Dnyaneshwar July 26, 2023, 8:06 p.m. UTC
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

Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Matt Roper <matthew.d.roper@intel.com>
Cc: Anusha Srivatsa <Anusha.Srivatsa@intel.com>
Cc: matthew Atwood <matthew.s.atwood@intel.com>

 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(-)

Comments

Jani Nikula July 31, 2023, 10:58 a.m. UTC | #1
On Wed, 26 Jul 2023, Patchwork <patchwork@emeril.freedesktop.org> wrote:
> == 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.

> 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 checked
Jani Nikula Aug. 1, 2023, 1:36 p.m. UTC | #2
On Thu, 27 Jul 2023, Dnyaneshwar Bhadane <dnyaneshwar.bhadane@intel.com> wrote:
> 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

With the checkpatch warnings fixed in the above patch, the series is

Acked-by: Jani Nikula <jani.nikula@intel.com>


>   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
>
> Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> Cc: Jani Nikula <jani.nikula@linux.intel.com>
> Cc: Matt Roper <matthew.d.roper@intel.com>
> Cc: Anusha Srivatsa <Anusha.Srivatsa@intel.com>
> Cc: matthew Atwood <matthew.s.atwood@intel.com>
>
>  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(-)