Re: [Intel-gfx] [PATCH 07/11] drm/i915/adlp: s/ADLP/ALDERLAKE_P for display and graphics step
> -Original Message-
> From: Bhadane, Dnyaneshwar
> Sent: Wednesday, June 14, 2023 10:00 PM
> To: intel-gfx@lists.freedesktop.org
> Cc: Atwood, Matthew S ; Srivatsa, Anusha
> ; Bhadane, Dnyaneshwar
>
> Subject: [PATCH 07/11] drm/i915/adlp: s/ADLP/ALDERLAKE_P for display and
> graphics step
>
> From: Anusha Srivatsa
>
> Driver refers to the platfrom Alderlake P as ADLP in places and ALDERLAKE_P in
^^^ noyiced I have made a typo @Bhadane, Dnyaneshwar
You can fix the typo and add you S-O-B too with mine in the next spin.
Anusha
> some. Making the consistent change to avoid confusion of the right naming
> convention for the platform.
>
> Signed-off-by: Anusha Srivatsa
> ---
> 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| 4 ++--
> 5 files changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_cdclk.c
> b/drivers/gpu/drm/i915/display/intel_cdclk.c
> index 2acfa0435675..831d1258ea3f 100644
> --- a/drivers/gpu/drm/i915/display/intel_cdclk.c
> +++ b/drivers/gpu/drm/i915/display/intel_cdclk.c
> @@ -3559,7 +3559,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_DISPLAY_STEP(dev_priv, STEP_A0,
> STEP_B0))
> dev_priv->display.cdclk.table =
> adlp_a_step_cdclk_table;
> dev_priv->display.funcs.cdclk = _cdclk_funcs;
> } else if (IS_ADLP_RPLU(dev_priv)) {
> diff --git a/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
> b/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
> index c6d376d414b8..47fe8311067e 100644
> --- a/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
> +++ b/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
> @@ -3781,7 +3781,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_DISPLAY_STEP(i915, STEP_A0, STEP_B0) ||
> pll->info->id != DPLL_ID_ICL_DPLL0)
> return;
> /*
> diff --git a/drivers/gpu/drm/i915/display/intel_psr.c
> b/drivers/gpu/drm/i915/display/intel_psr.c
> index f61d39d2b0fc..00c98c2b4324 100644
> --- a/drivers/gpu/drm/i915/display/intel_psr.c
> +++ b/drivers/gpu/drm/i915/display/intel_psr.c
> @@ -639,7 +639,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_DISPLAY_STEP(dev_priv, STEP_A0, STEP_E0)) {
> static const u8 map[] = {
> 2, /* 5 lines */
> 1, /* 6 lines */
> @@ -807,7 +807,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_DISPLAY_STEP(dev_priv, STEP_A0, STEP_B0))
> return;
>
> /*
> @@ -975,7 +975,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_DISPLAY_STEP(dev_priv, STEP_A0, STEP_B0)) {
> drm_dbg_kms(_priv->drm, "PSR2 not completely
> functional in this stepping\n");
> return false;
> }
> @@ -1033,7 +1033,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_DISPLAY_STEP(dev_priv, STEP_A0, STEP_B0)) {
> drm_dbg_kms(_priv->drm,
> "PSR2 not enabled, not compatible with HW stepping
> + VRR\n");
> return false;
> diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c
> b/drivers/gpu/drm/i915/display/skl_universal_plane.c
> index 25b06ced9ce7..2458a9ea25ba 100644
> --- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
> +++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
> @@ -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_DISPLAY_STEP(i915, STEP_A0, STEP_B0))
> return false;
>
> if (DISPLAY_VER(i915) >= 11)
> @@ -2200,7
[Intel-gfx] [PATCH 07/11] drm/i915/adlp: s/ADLP/ALDERLAKE_P for display and graphics step
From: Anusha Srivatsa
Driver refers to the platfrom 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.
Signed-off-by: Anusha Srivatsa
---
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| 4 ++--
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_cdclk.c
b/drivers/gpu/drm/i915/display/intel_cdclk.c
index 2acfa0435675..034454233d87 100644
--- a/drivers/gpu/drm/i915/display/intel_cdclk.c
+++ b/drivers/gpu/drm/i915/display/intel_cdclk.c
@@ -3559,7 +3559,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_DISPLAY_STEP(dev_priv, STEP_A0, STEP_B0)) {
dev_priv->display.cdclk.table = adlp_a_step_cdclk_table;
dev_priv->display.funcs.cdclk = _cdclk_funcs;
} else if (IS_ADLP_RPLU(dev_priv)) {
diff --git a/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
b/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
index c6d376d414b8..47fe8311067e 100644
--- a/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
+++ b/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
@@ -3781,7 +3781,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_DISPLAY_STEP(i915, STEP_A0, STEP_B0) ||
pll->info->id != DPLL_ID_ICL_DPLL0)
return;
/*
diff --git a/drivers/gpu/drm/i915/display/intel_psr.c
b/drivers/gpu/drm/i915/display/intel_psr.c
index f61d39d2b0fc..00c98c2b4324 100644
--- a/drivers/gpu/drm/i915/display/intel_psr.c
+++ b/drivers/gpu/drm/i915/display/intel_psr.c
@@ -639,7 +639,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_DISPLAY_STEP(dev_priv, STEP_A0, STEP_E0)) {
static const u8 map[] = {
2, /* 5 lines */
1, /* 6 lines */
@@ -807,7 +807,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_DISPLAY_STEP(dev_priv, STEP_A0, STEP_B0))
return;
/*
@@ -975,7 +975,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_DISPLAY_STEP(dev_priv, STEP_A0, STEP_B0)) {
drm_dbg_kms(_priv->drm, "PSR2 not completely functional in
this stepping\n");
return false;
}
@@ -1033,7 +1033,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_DISPLAY_STEP(dev_priv, STEP_A0, STEP_B0)) {
drm_dbg_kms(_priv->drm,
"PSR2 not enabled, not compatible with HW stepping
+ VRR\n");
return false;
diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c
b/drivers/gpu/drm/i915/display/skl_universal_plane.c
index 25b06ced9ce7..2458a9ea25ba 100644
--- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
+++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
@@ -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_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_DISPLAY_STEP(i915, STEP_A0, STEP_B0))
return false;
/* Wa_14013215631 */
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 3c4a66f1a7ba..08e14cf225b5 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -677,11 +677,11 @@ IS_SUBPLATFORM(const
Re: [Intel-gfx] [PATCH 07/11] drm/i915/adlp: s/ADLP/ALDERLAKE_P for display and graphics step
Hi Dnyaneshwar,
kernel test robot noticed the following build errors:
[auto build test ERROR on drm-tip/drm-tip]
url:
https://github.com/intel-lab-lkp/linux/commits/Dnyaneshwar-Bhadane/drm-i915-TGL-s-TGL-TIGERLAKE-for-platform-subplatform-defines/20230615-130242
base: git://anongit.freedesktop.org/drm/drm-tip drm-tip
patch link:
https://lore.kernel.org/r/20230615050015.3105902-8-dnyaneshwar.bhadane%40intel.com
patch subject: [Intel-gfx] [PATCH 07/11] drm/i915/adlp: s/ADLP/ALDERLAKE_P for
display and graphics step
config: i386-defconfig
(https://download.01.org/0day-ci/archive/20230615/202306151559.ek0s8n5w-...@intel.com/config)
compiler: gcc-12 (Debian 12.2.0-14) 12.2.0
reproduce (this is a W=1 build):
git remote add drm-tip git://anongit.freedesktop.org/drm/drm-tip
git fetch drm-tip drm-tip
git checkout drm-tip/drm-tip
b4 shazam
https://lore.kernel.org/r/20230615050015.3105902-8-dnyaneshwar.bhad...@intel.com
# save the config file
mkdir build_dir && cp config build_dir/.config
make W=1 O=build_dir ARCH=i386 olddefconfig
make W=1 O=build_dir ARCH=i386 SHELL=/bin/bash drivers/gpu/drm/i915/
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot
| Closes:
https://lore.kernel.org/oe-kbuild-all/202306151559.ek0s8n5w-...@intel.com/
All errors (new ones prefixed by >>):
drivers/gpu/drm/i915/display/intel_cdclk.c: In function
'intel_init_cdclk_hooks':
>> drivers/gpu/drm/i915/display/intel_cdclk.c:3562:17: error: this 'if' clause
>> does not guard... [-Werror=misleading-indentation]
3562 | if (IS_ALDERLAKE_P_DISPLAY_STEP(dev_priv, STEP_A0,
STEP_B0))
| ^~
drivers/gpu/drm/i915/display/intel_cdclk.c:3564:25: note: ...this statement,
but the latter is misleadingly indented as if it were guarded by the 'if'
3564 | dev_priv->display.funcs.cdclk =
_cdclk_funcs;
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c: At top level:
>> drivers/gpu/drm/i915/display/intel_cdclk.c:3572:11: error: expected
>> identifier or '(' before 'else'
3572 | } else if (IS_ROCKETLAKE(dev_priv)) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3575:11: error: expected
identifier or '(' before 'else'
3575 | } else if (DISPLAY_VER(dev_priv) >= 12) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3578:11: error: expected
identifier or '(' before 'else'
3578 | } else if (IS_JASPERLAKE_EHL(dev_priv)) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3581:11: error: expected
identifier or '(' before 'else'
3581 | } else if (DISPLAY_VER(dev_priv) >= 11) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3584:11: error: expected
identifier or '(' before 'else'
3584 | } else if (IS_GEMINILAKE(dev_priv) || IS_BROXTON(dev_priv)) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3590:11: error: expected
identifier or '(' before 'else'
3590 | } else if (DISPLAY_VER(dev_priv) == 9) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3592:11: error: expected
identifier or '(' before 'else'
3592 | } else if (IS_BROADWELL(dev_priv)) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3594:11: error: expected
identifier or '(' before 'else'
3594 | } else if (IS_HASWELL(dev_priv)) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3596:11: error: expected
identifier or '(' before 'else'
3596 | } else if (IS_CHERRYVIEW(dev_priv)) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3598:11: error: expected
identifier or '(' before 'else'
3598 | } else if (IS_VALLEYVIEW(dev_priv)) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3600:11: error: expected
identifier or '(' before 'else'
3600 | } else if (IS_SANDYBRIDGE(dev_priv) ||
IS_IVYBRIDGE(dev_priv)) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3602:11: error: expected
identifier or '(' before 'else'
3602 | } else if (IS_IRONLAKE(dev_priv)) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3604:11: error: expected
identifier or '(' before 'else'
3604 | } else if (IS_GM45(dev_priv)) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3606:11: error: expected
identifier or '(' before 'else'
3606 | } else if (IS_G45(dev_priv)) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3608:11: error: expected
identifier or '(' before 'else'
Re: [Intel-gfx] [PATCH 07/11] drm/i915/adlp: s/ADLP/ALDERLAKE_P for display and graphics step
Hi Dnyaneshwar,
kernel test robot noticed the following build errors:
[auto build test ERROR on drm-tip/drm-tip]
url:
https://github.com/intel-lab-lkp/linux/commits/Dnyaneshwar-Bhadane/drm-i915-TGL-s-TGL-TIGERLAKE-for-platform-subplatform-defines/20230615-130242
base: git://anongit.freedesktop.org/drm/drm-tip drm-tip
patch link:
https://lore.kernel.org/r/20230615050015.3105902-8-dnyaneshwar.bhadane%40intel.com
patch subject: [Intel-gfx] [PATCH 07/11] drm/i915/adlp: s/ADLP/ALDERLAKE_P for
display and graphics step
config: x86_64-defconfig
(https://download.01.org/0day-ci/archive/20230615/202306151523.wign4dme-...@intel.com/config)
compiler: gcc-12 (Debian 12.2.0-14) 12.2.0
reproduce (this is a W=1 build):
git remote add drm-tip git://anongit.freedesktop.org/drm/drm-tip
git fetch drm-tip drm-tip
git checkout drm-tip/drm-tip
b4 shazam
https://lore.kernel.org/r/20230615050015.3105902-8-dnyaneshwar.bhad...@intel.com
# save the config file
mkdir build_dir && cp config build_dir/.config
make W=1 O=build_dir ARCH=x86_64 olddefconfig
make W=1 O=build_dir ARCH=x86_64 SHELL=/bin/bash drivers/gpu/drm/i915/
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot
| Closes:
https://lore.kernel.org/oe-kbuild-all/202306151523.wign4dme-...@intel.com/
All errors (new ones prefixed by >>):
drivers/gpu/drm/i915/display/intel_cdclk.c: In function
'intel_init_cdclk_hooks':
>> drivers/gpu/drm/i915/display/intel_cdclk.c:3562:17: error: this 'if' clause
>> does not guard... [-Werror=misleading-indentation]
3562 | if (IS_ALDERLAKE_P_DISPLAY_STEP(dev_priv, STEP_A0,
STEP_B0))
| ^~
drivers/gpu/drm/i915/display/intel_cdclk.c:3564:25: note: ...this statement,
but the latter is misleadingly indented as if it were guarded by the 'if'
3564 | dev_priv->display.funcs.cdclk =
_cdclk_funcs;
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c: At top level:
>> drivers/gpu/drm/i915/display/intel_cdclk.c:3572:11: error: expected
>> identifier or '(' before 'else'
3572 | } else if (IS_ROCKETLAKE(dev_priv)) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3575:11: error: expected
identifier or '(' before 'else'
3575 | } else if (DISPLAY_VER(dev_priv) >= 12) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3578:11: error: expected
identifier or '(' before 'else'
3578 | } else if (IS_JASPERLAKE_EHL(dev_priv)) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3581:11: error: expected
identifier or '(' before 'else'
3581 | } else if (DISPLAY_VER(dev_priv) >= 11) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3584:11: error: expected
identifier or '(' before 'else'
3584 | } else if (IS_GEMINILAKE(dev_priv) || IS_BROXTON(dev_priv)) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3590:11: error: expected
identifier or '(' before 'else'
3590 | } else if (DISPLAY_VER(dev_priv) == 9) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3592:11: error: expected
identifier or '(' before 'else'
3592 | } else if (IS_BROADWELL(dev_priv)) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3594:11: error: expected
identifier or '(' before 'else'
3594 | } else if (IS_HASWELL(dev_priv)) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3596:11: error: expected
identifier or '(' before 'else'
3596 | } else if (IS_CHERRYVIEW(dev_priv)) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3598:11: error: expected
identifier or '(' before 'else'
3598 | } else if (IS_VALLEYVIEW(dev_priv)) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3600:11: error: expected
identifier or '(' before 'else'
3600 | } else if (IS_SANDYBRIDGE(dev_priv) ||
IS_IVYBRIDGE(dev_priv)) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3602:11: error: expected
identifier or '(' before 'else'
3602 | } else if (IS_IRONLAKE(dev_priv)) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3604:11: error: expected
identifier or '(' before 'else'
3604 | } else if (IS_GM45(dev_priv)) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3606:11: error: expected
identifier or '(' before 'else'
3606 | } else if (IS_G45(dev_priv)) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3608:11: error: expected
identifier or '(' before 'else'
Re: [Intel-gfx] [PATCH 07/11] drm/i915/adlp: s/ADLP/ALDERLAKE_P for display and graphics step
Hi Dnyaneshwar,
kernel test robot noticed the following build warnings:
[auto build test WARNING on drm-tip/drm-tip]
url:
https://github.com/intel-lab-lkp/linux/commits/Dnyaneshwar-Bhadane/drm-i915-TGL-s-TGL-TIGERLAKE-for-platform-subplatform-defines/20230615-130242
base: git://anongit.freedesktop.org/drm/drm-tip drm-tip
patch link:
https://lore.kernel.org/r/20230615050015.3105902-8-dnyaneshwar.bhadane%40intel.com
patch subject: [Intel-gfx] [PATCH 07/11] drm/i915/adlp: s/ADLP/ALDERLAKE_P for
display and graphics step
config: i386-debian-10.3
(https://download.01.org/0day-ci/archive/20230615/202306151502.qcazxbok-...@intel.com/config)
compiler: gcc-12 (Debian 12.2.0-14) 12.2.0
reproduce (this is a W=1 build):
git remote add drm-tip git://anongit.freedesktop.org/drm/drm-tip
git fetch drm-tip drm-tip
git checkout drm-tip/drm-tip
b4 shazam
https://lore.kernel.org/r/20230615050015.3105902-8-dnyaneshwar.bhad...@intel.com
# save the config file
mkdir build_dir && cp config build_dir/.config
make W=1 O=build_dir ARCH=i386 olddefconfig
make W=1 O=build_dir ARCH=i386 SHELL=/bin/bash drivers/gpu/drm/i915/
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot
| Closes:
https://lore.kernel.org/oe-kbuild-all/202306151502.qcazxbok-...@intel.com/
All warnings (new ones prefixed by >>):
drivers/gpu/drm/i915/display/intel_cdclk.c: In function
'intel_init_cdclk_hooks':
>> drivers/gpu/drm/i915/display/intel_cdclk.c:3562:17: warning: this 'if'
>> clause does not guard... [-Wmisleading-indentation]
3562 | if (IS_ALDERLAKE_P_DISPLAY_STEP(dev_priv, STEP_A0,
STEP_B0))
| ^~
drivers/gpu/drm/i915/display/intel_cdclk.c:3564:25: note: ...this statement,
but the latter is misleadingly indented as if it were guarded by the 'if'
3564 | dev_priv->display.funcs.cdclk =
_cdclk_funcs;
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c: At top level:
drivers/gpu/drm/i915/display/intel_cdclk.c:3572:11: error: expected
identifier or '(' before 'else'
3572 | } else if (IS_ROCKETLAKE(dev_priv)) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3575:11: error: expected
identifier or '(' before 'else'
3575 | } else if (DISPLAY_VER(dev_priv) >= 12) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3578:11: error: expected
identifier or '(' before 'else'
3578 | } else if (IS_JASPERLAKE_EHL(dev_priv)) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3581:11: error: expected
identifier or '(' before 'else'
3581 | } else if (DISPLAY_VER(dev_priv) >= 11) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3584:11: error: expected
identifier or '(' before 'else'
3584 | } else if (IS_GEMINILAKE(dev_priv) || IS_BROXTON(dev_priv)) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3590:11: error: expected
identifier or '(' before 'else'
3590 | } else if (DISPLAY_VER(dev_priv) == 9) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3592:11: error: expected
identifier or '(' before 'else'
3592 | } else if (IS_BROADWELL(dev_priv)) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3594:11: error: expected
identifier or '(' before 'else'
3594 | } else if (IS_HASWELL(dev_priv)) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3596:11: error: expected
identifier or '(' before 'else'
3596 | } else if (IS_CHERRYVIEW(dev_priv)) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3598:11: error: expected
identifier or '(' before 'else'
3598 | } else if (IS_VALLEYVIEW(dev_priv)) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3600:11: error: expected
identifier or '(' before 'else'
3600 | } else if (IS_SANDYBRIDGE(dev_priv) ||
IS_IVYBRIDGE(dev_priv)) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3602:11: error: expected
identifier or '(' before 'else'
3602 | } else if (IS_IRONLAKE(dev_priv)) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3604:11: error: expected
identifier or '(' before 'else'
3604 | } else if (IS_GM45(dev_priv)) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3606:11: error: expected
identifier or '(' before 'else'
3606 | } else if (IS_G45(dev_priv)) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3608:11: error: expected
identifier or '(' before 'else'
3608 |
[Intel-gfx] [PATCH 07/11] drm/i915/adlp: s/ADLP/ALDERLAKE_P for display and graphics step
From: Anusha Srivatsa
Driver refers to the platfrom 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.
Signed-off-by: Anusha Srivatsa
---
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| 4 ++--
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_cdclk.c
b/drivers/gpu/drm/i915/display/intel_cdclk.c
index 2acfa0435675..831d1258ea3f 100644
--- a/drivers/gpu/drm/i915/display/intel_cdclk.c
+++ b/drivers/gpu/drm/i915/display/intel_cdclk.c
@@ -3559,7 +3559,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_DISPLAY_STEP(dev_priv, STEP_A0, STEP_B0))
dev_priv->display.cdclk.table = adlp_a_step_cdclk_table;
dev_priv->display.funcs.cdclk = _cdclk_funcs;
} else if (IS_ADLP_RPLU(dev_priv)) {
diff --git a/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
b/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
index c6d376d414b8..47fe8311067e 100644
--- a/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
+++ b/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
@@ -3781,7 +3781,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_DISPLAY_STEP(i915, STEP_A0, STEP_B0) ||
pll->info->id != DPLL_ID_ICL_DPLL0)
return;
/*
diff --git a/drivers/gpu/drm/i915/display/intel_psr.c
b/drivers/gpu/drm/i915/display/intel_psr.c
index f61d39d2b0fc..00c98c2b4324 100644
--- a/drivers/gpu/drm/i915/display/intel_psr.c
+++ b/drivers/gpu/drm/i915/display/intel_psr.c
@@ -639,7 +639,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_DISPLAY_STEP(dev_priv, STEP_A0, STEP_E0)) {
static const u8 map[] = {
2, /* 5 lines */
1, /* 6 lines */
@@ -807,7 +807,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_DISPLAY_STEP(dev_priv, STEP_A0, STEP_B0))
return;
/*
@@ -975,7 +975,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_DISPLAY_STEP(dev_priv, STEP_A0, STEP_B0)) {
drm_dbg_kms(_priv->drm, "PSR2 not completely functional in
this stepping\n");
return false;
}
@@ -1033,7 +1033,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_DISPLAY_STEP(dev_priv, STEP_A0, STEP_B0)) {
drm_dbg_kms(_priv->drm,
"PSR2 not enabled, not compatible with HW stepping
+ VRR\n");
return false;
diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c
b/drivers/gpu/drm/i915/display/skl_universal_plane.c
index 25b06ced9ce7..2458a9ea25ba 100644
--- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
+++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
@@ -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_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_DISPLAY_STEP(i915, STEP_A0, STEP_B0))
return false;
/* Wa_14013215631 */
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 3c4a66f1a7ba..08e14cf225b5 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -677,11 +677,11 @@ IS_SUBPLATFORM(const struct
