| Message ID | 20230615050015.3105902-8-dnyaneshwar.bhadane@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Replace acronym with full platform name in defines. | expand |
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-lkp@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.bhadane@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 <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202306151559.EK0S8n5W-lkp@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 = &tgl_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 | } else if (IS_I965GM(dev_priv)) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3610:11: error: expected identifier or '(' before 'else'
3610 | } else if (IS_I965G(dev_priv)) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3612:11: error: expected identifier or '(' before 'else'
3612 | } else if (IS_PINEVIEW(dev_priv)) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3614:11: error: expected identifier or '(' before 'else'
3614 | } else if (IS_G33(dev_priv)) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3616:11: error: expected identifier or '(' before 'else'
3616 | } else if (IS_I945GM(dev_priv)) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3618:11: error: expected identifier or '(' before 'else'
3618 | } else if (IS_I945G(dev_priv)) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3620:11: error: expected identifier or '(' before 'else'
3620 | } else if (IS_I915GM(dev_priv)) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3622:11: error: expected identifier or '(' before 'else'
3622 | } else if (IS_I915G(dev_priv)) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3624:11: error: expected identifier or '(' before 'else'
3624 | } else if (IS_I865G(dev_priv)) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3626:11: error: expected identifier or '(' before 'else'
3626 | } else if (IS_I85X(dev_priv)) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3628:11: error: expected identifier or '(' before 'else'
3628 | } else if (IS_I845G(dev_priv)) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3630:11: error: expected identifier or '(' before 'else'
3630 | } else if (IS_I830(dev_priv)) {
| ^~~~
>> drivers/gpu/drm/i915/display/intel_cdclk.c:3634:9: error: expected identifier or '(' before 'if'
3634 | if (drm_WARN(&dev_priv->drm, !dev_priv->display.funcs.cdclk,
| ^~
In file included from arch/x86/include/asm/bug.h:87,
from include/linux/bug.h:5,
from include/linux/cpumask.h:14,
from arch/x86/include/asm/cpumask.h:5,
from arch/x86/include/asm/msr.h:11,
from arch/x86/include/asm/processor.h:23,
from arch/x86/include/asm/timex.h:5,
from include/linux/timex.h:67,
from include/linux/time32.h:13,
from include/linux/time.h:60,
from drivers/gpu/drm/i915/display/intel_cdclk.c:24:
>> include/asm-generic/bug.h:135:2: error: expected identifier or '(' before ')' token
135 | })
| ^
include/drm/drm_print.h:620:9: note: in expansion of macro 'WARN'
620 | WARN(condition, "%s %s: " format, \
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3634:13: note: in expansion of macro 'drm_WARN'
3634 | if (drm_WARN(&dev_priv->drm, !dev_priv->display.funcs.cdclk,
| ^~~~~~~~
>> drivers/gpu/drm/i915/display/intel_cdclk.c:3637:1: error: expected identifier or '(' before '}' token
3637 | }
| ^
>> drivers/gpu/drm/i915/display/intel_cdclk.c:3543:39: error: 'i830_cdclk_funcs' defined but not used [-Werror=unused-const-variable=]
3543 | static const struct intel_cdclk_funcs i830_cdclk_funcs = {
| ^~~~~~~~~~~~~~~~
>> drivers/gpu/drm/i915/display/intel_cdclk.c:3538:39: error: 'i845g_cdclk_funcs' defined but not used [-Werror=unused-const-variable=]
3538 | static const struct intel_cdclk_funcs i845g_cdclk_funcs = {
| ^~~~~~~~~~~~~~~~~
>> drivers/gpu/drm/i915/display/intel_cdclk.c:3533:39: error: 'i85x_cdclk_funcs' defined but not used [-Werror=unused-const-variable=]
3533 | static const struct intel_cdclk_funcs i85x_cdclk_funcs = {
| ^~~~~~~~~~~~~~~~
>> drivers/gpu/drm/i915/display/intel_cdclk.c:3528:39: error: 'i865g_cdclk_funcs' defined but not used [-Werror=unused-const-variable=]
3528 | static const struct intel_cdclk_funcs i865g_cdclk_funcs = {
| ^~~~~~~~~~~~~~~~~
>> drivers/gpu/drm/i915/display/intel_cdclk.c:3523:39: error: 'i915g_cdclk_funcs' defined but not used [-Werror=unused-const-variable=]
3523 | static const struct intel_cdclk_funcs i915g_cdclk_funcs = {
| ^~~~~~~~~~~~~~~~~
>> drivers/gpu/drm/i915/display/intel_cdclk.c:3518:39: error: 'i915gm_cdclk_funcs' defined but not used [-Werror=unused-const-variable=]
3518 | static const struct intel_cdclk_funcs i915gm_cdclk_funcs = {
| ^~~~~~~~~~~~~~~~~~
>> drivers/gpu/drm/i915/display/intel_cdclk.c:3511:39: error: 'i945gm_cdclk_funcs' defined but not used [-Werror=unused-const-variable=]
3511 | static const struct intel_cdclk_funcs i945gm_cdclk_funcs = {
| ^~~~~~~~~~~~~~~~~~
>> drivers/gpu/drm/i915/display/intel_cdclk.c:3506:39: error: 'g33_cdclk_funcs' defined but not used [-Werror=unused-const-variable=]
3506 | static const struct intel_cdclk_funcs g33_cdclk_funcs = {
| ^~~~~~~~~~~~~~~
>> drivers/gpu/drm/i915/display/intel_cdclk.c:3501:39: error: 'pnv_cdclk_funcs' defined but not used [-Werror=unused-const-variable=]
3501 | static const struct intel_cdclk_funcs pnv_cdclk_funcs = {
| ^~~~~~~~~~~~~~~
>> drivers/gpu/drm/i915/display/intel_cdclk.c:3494:39: error: 'i965gm_cdclk_funcs' defined but not used [-Werror=unused-const-variable=]
3494 | static const struct intel_cdclk_funcs i965gm_cdclk_funcs = {
| ^~~~~~~~~~~~~~~~~~
>> drivers/gpu/drm/i915/display/intel_cdclk.c:3487:39: error: 'gm45_cdclk_funcs' defined but not used [-Werror=unused-const-variable=]
3487 | static const struct intel_cdclk_funcs gm45_cdclk_funcs = {
| ^~~~~~~~~~~~~~~~
>> drivers/gpu/drm/i915/display/intel_cdclk.c:3482:39: error: 'ilk_cdclk_funcs' defined but not used [-Werror=unused-const-variable=]
3482 | static const struct intel_cdclk_funcs ilk_cdclk_funcs = {
| ^~~~~~~~~~~~~~~
>> drivers/gpu/drm/i915/display/intel_cdclk.c:3477:39: error: 'fixed_400mhz_cdclk_funcs' defined but not used [-Werror=unused-const-variable=]
3477 | static const struct intel_cdclk_funcs fixed_400mhz_cdclk_funcs = {
| ^~~~~~~~~~~~~~~~~~~~~~~~
>> drivers/gpu/drm/i915/display/intel_cdclk.c:3471:39: error: 'hsw_cdclk_funcs' defined but not used [-Werror=unused-const-variable=]
3471 | static const struct intel_cdclk_funcs hsw_cdclk_funcs = {
| ^~~~~~~~~~~~~~~
>> drivers/gpu/drm/i915/display/intel_cdclk.c:3465:39: error: 'vlv_cdclk_funcs' defined but not used [-Werror=unused-const-variable=]
3465 | static const struct intel_cdclk_funcs vlv_cdclk_funcs = {
| ^~~~~~~~~~~~~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3459:39: error: 'chv_cdclk_funcs' defined but not used [-Werror=unused-const-variable=]
3459 | static const struct intel_cdclk_funcs chv_cdclk_funcs = {
| ^~~~~~~~~~~~~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3453:39: error: 'bdw_cdclk_funcs' defined but not used [-Werror=unused-const-variable=]
3453 | static const struct intel_cdclk_funcs bdw_cdclk_funcs = {
| ^~~~~~~~~~~~~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3447:39: error: 'skl_cdclk_funcs' defined but not used [-Werror=unused-const-variable=]
3447 | static const struct intel_cdclk_funcs skl_cdclk_funcs = {
| ^~~~~~~~~~~~~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3440:39: error: 'bxt_cdclk_funcs' defined but not used [-Werror=unused-const-variable=]
3440 | static const struct intel_cdclk_funcs bxt_cdclk_funcs = {
| ^~~~~~~~~~~~~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3433:39: error: 'icl_cdclk_funcs' defined but not used [-Werror=unused-const-variable=]
3433 | static const struct intel_cdclk_funcs icl_cdclk_funcs = {
| ^~~~~~~~~~~~~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3426:39: error: 'ehl_cdclk_funcs' defined but not used [-Werror=unused-const-variable=]
3426 | static const struct intel_cdclk_funcs ehl_cdclk_funcs = {
| ^~~~~~~~~~~~~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:1272:38: error: 'rkl_cdclk_table' defined but not used [-Werror=unused-const-variable=]
1272 | static const struct intel_cdclk_vals rkl_cdclk_table[] = {
| ^~~~~~~~~~~~~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:1248:38: error: 'icl_cdclk_table' defined but not used [-Werror=unused-const-variable=]
1248 | static const struct intel_cdclk_vals icl_cdclk_table[] = {
| ^~~~~~~~~~~~~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:1241:38: error: 'glk_cdclk_table' defined but not used [-Werror=unused-const-variable=]
1241 | static const struct intel_cdclk_vals glk_cdclk_table[] = {
| ^~~~~~~~~~~~~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:1232:38: error: 'bxt_cdclk_table' defined but not used [-Werror=unused-const-variable=]
1232 | static const struct intel_cdclk_vals bxt_cdclk_table[] = {
| ^~~~~~~~~~~~~~~
cc1: all warnings being treated as errors
vim +/if +3562 drivers/gpu/drm/i915/display/intel_cdclk.c
3425
> 3426 static const struct intel_cdclk_funcs ehl_cdclk_funcs = {
3427 .get_cdclk = bxt_get_cdclk,
3428 .set_cdclk = bxt_set_cdclk,
3429 .modeset_calc_cdclk = bxt_modeset_calc_cdclk,
3430 .calc_voltage_level = ehl_calc_voltage_level,
3431 };
3432
> 3433 static const struct intel_cdclk_funcs icl_cdclk_funcs = {
3434 .get_cdclk = bxt_get_cdclk,
3435 .set_cdclk = bxt_set_cdclk,
3436 .modeset_calc_cdclk = bxt_modeset_calc_cdclk,
3437 .calc_voltage_level = icl_calc_voltage_level,
3438 };
3439
> 3440 static const struct intel_cdclk_funcs bxt_cdclk_funcs = {
3441 .get_cdclk = bxt_get_cdclk,
3442 .set_cdclk = bxt_set_cdclk,
3443 .modeset_calc_cdclk = bxt_modeset_calc_cdclk,
3444 .calc_voltage_level = bxt_calc_voltage_level,
3445 };
3446
> 3447 static const struct intel_cdclk_funcs skl_cdclk_funcs = {
3448 .get_cdclk = skl_get_cdclk,
3449 .set_cdclk = skl_set_cdclk,
3450 .modeset_calc_cdclk = skl_modeset_calc_cdclk,
3451 };
3452
> 3453 static const struct intel_cdclk_funcs bdw_cdclk_funcs = {
3454 .get_cdclk = bdw_get_cdclk,
3455 .set_cdclk = bdw_set_cdclk,
3456 .modeset_calc_cdclk = bdw_modeset_calc_cdclk,
3457 };
3458
> 3459 static const struct intel_cdclk_funcs chv_cdclk_funcs = {
3460 .get_cdclk = vlv_get_cdclk,
3461 .set_cdclk = chv_set_cdclk,
3462 .modeset_calc_cdclk = vlv_modeset_calc_cdclk,
3463 };
3464
> 3465 static const struct intel_cdclk_funcs vlv_cdclk_funcs = {
3466 .get_cdclk = vlv_get_cdclk,
3467 .set_cdclk = vlv_set_cdclk,
3468 .modeset_calc_cdclk = vlv_modeset_calc_cdclk,
3469 };
3470
> 3471 static const struct intel_cdclk_funcs hsw_cdclk_funcs = {
3472 .get_cdclk = hsw_get_cdclk,
3473 .modeset_calc_cdclk = fixed_modeset_calc_cdclk,
3474 };
3475
3476 /* SNB, IVB, 965G, 945G */
> 3477 static const struct intel_cdclk_funcs fixed_400mhz_cdclk_funcs = {
3478 .get_cdclk = fixed_400mhz_get_cdclk,
3479 .modeset_calc_cdclk = fixed_modeset_calc_cdclk,
3480 };
3481
> 3482 static const struct intel_cdclk_funcs ilk_cdclk_funcs = {
3483 .get_cdclk = fixed_450mhz_get_cdclk,
3484 .modeset_calc_cdclk = fixed_modeset_calc_cdclk,
3485 };
3486
> 3487 static const struct intel_cdclk_funcs gm45_cdclk_funcs = {
3488 .get_cdclk = gm45_get_cdclk,
3489 .modeset_calc_cdclk = fixed_modeset_calc_cdclk,
3490 };
3491
3492 /* G45 uses G33 */
3493
> 3494 static const struct intel_cdclk_funcs i965gm_cdclk_funcs = {
3495 .get_cdclk = i965gm_get_cdclk,
3496 .modeset_calc_cdclk = fixed_modeset_calc_cdclk,
3497 };
3498
3499 /* i965G uses fixed 400 */
3500
> 3501 static const struct intel_cdclk_funcs pnv_cdclk_funcs = {
3502 .get_cdclk = pnv_get_cdclk,
3503 .modeset_calc_cdclk = fixed_modeset_calc_cdclk,
3504 };
3505
> 3506 static const struct intel_cdclk_funcs g33_cdclk_funcs = {
3507 .get_cdclk = g33_get_cdclk,
3508 .modeset_calc_cdclk = fixed_modeset_calc_cdclk,
3509 };
3510
> 3511 static const struct intel_cdclk_funcs i945gm_cdclk_funcs = {
3512 .get_cdclk = i945gm_get_cdclk,
3513 .modeset_calc_cdclk = fixed_modeset_calc_cdclk,
3514 };
3515
3516 /* i945G uses fixed 400 */
3517
> 3518 static const struct intel_cdclk_funcs i915gm_cdclk_funcs = {
3519 .get_cdclk = i915gm_get_cdclk,
3520 .modeset_calc_cdclk = fixed_modeset_calc_cdclk,
3521 };
3522
> 3523 static const struct intel_cdclk_funcs i915g_cdclk_funcs = {
3524 .get_cdclk = fixed_333mhz_get_cdclk,
3525 .modeset_calc_cdclk = fixed_modeset_calc_cdclk,
3526 };
3527
> 3528 static const struct intel_cdclk_funcs i865g_cdclk_funcs = {
3529 .get_cdclk = fixed_266mhz_get_cdclk,
3530 .modeset_calc_cdclk = fixed_modeset_calc_cdclk,
3531 };
3532
> 3533 static const struct intel_cdclk_funcs i85x_cdclk_funcs = {
3534 .get_cdclk = i85x_get_cdclk,
3535 .modeset_calc_cdclk = fixed_modeset_calc_cdclk,
3536 };
3537
> 3538 static const struct intel_cdclk_funcs i845g_cdclk_funcs = {
3539 .get_cdclk = fixed_200mhz_get_cdclk,
3540 .modeset_calc_cdclk = fixed_modeset_calc_cdclk,
3541 };
3542
> 3543 static const struct intel_cdclk_funcs i830_cdclk_funcs = {
3544 .get_cdclk = fixed_133mhz_get_cdclk,
3545 .modeset_calc_cdclk = fixed_modeset_calc_cdclk,
3546 };
3547
3548 /**
3549 * intel_init_cdclk_hooks - Initialize CDCLK related modesetting hooks
3550 * @dev_priv: i915 device
3551 */
3552 void intel_init_cdclk_hooks(struct drm_i915_private *dev_priv)
3553 {
3554 if (IS_METEORLAKE(dev_priv)) {
3555 dev_priv->display.funcs.cdclk = &mtl_cdclk_funcs;
3556 dev_priv->display.cdclk.table = mtl_cdclk_table;
3557 } else if (IS_DG2(dev_priv)) {
3558 dev_priv->display.funcs.cdclk = &tgl_cdclk_funcs;
3559 dev_priv->display.cdclk.table = dg2_cdclk_table;
3560 } else if (IS_ALDERLAKE_P(dev_priv)) {
3561 /* Wa_22011320316:adl-p[a0] */
> 3562 if (IS_ALDERLAKE_P_DISPLAY_STEP(dev_priv, STEP_A0, STEP_B0))
3563 dev_priv->display.cdclk.table = adlp_a_step_cdclk_table;
3564 dev_priv->display.funcs.cdclk = &tgl_cdclk_funcs;
3565 } else if (IS_ADLP_RPLU(dev_priv)) {
3566 dev_priv->display.cdclk.table = rplu_cdclk_table;
3567 dev_priv->display.funcs.cdclk = &rplu_cdclk_funcs;
3568 } else {
3569 dev_priv->display.cdclk.table = adlp_cdclk_table;
3570 dev_priv->display.funcs.cdclk = &tgl_cdclk_funcs;
3571 }
> 3572 } else if (IS_ROCKETLAKE(dev_priv)) {
3573 dev_priv->display.funcs.cdclk = &tgl_cdclk_funcs;
3574 dev_priv->display.cdclk.table = rkl_cdclk_table;
3575 } else if (DISPLAY_VER(dev_priv) >= 12) {
3576 dev_priv->display.funcs.cdclk = &tgl_cdclk_funcs;
3577 dev_priv->display.cdclk.table = icl_cdclk_table;
3578 } else if (IS_JASPERLAKE_EHL(dev_priv)) {
3579 dev_priv->display.funcs.cdclk = &ehl_cdclk_funcs;
3580 dev_priv->display.cdclk.table = icl_cdclk_table;
3581 } else if (DISPLAY_VER(dev_priv) >= 11) {
3582 dev_priv->display.funcs.cdclk = &icl_cdclk_funcs;
3583 dev_priv->display.cdclk.table = icl_cdclk_table;
3584 } else if (IS_GEMINILAKE(dev_priv) || IS_BROXTON(dev_priv)) {
3585 dev_priv->display.funcs.cdclk = &bxt_cdclk_funcs;
3586 if (IS_GEMINILAKE(dev_priv))
3587 dev_priv->display.cdclk.table = glk_cdclk_table;
3588 else
3589 dev_priv->display.cdclk.table = bxt_cdclk_table;
3590 } else if (DISPLAY_VER(dev_priv) == 9) {
3591 dev_priv->display.funcs.cdclk = &skl_cdclk_funcs;
3592 } else if (IS_BROADWELL(dev_priv)) {
3593 dev_priv->display.funcs.cdclk = &bdw_cdclk_funcs;
3594 } else if (IS_HASWELL(dev_priv)) {
3595 dev_priv->display.funcs.cdclk = &hsw_cdclk_funcs;
3596 } else if (IS_CHERRYVIEW(dev_priv)) {
3597 dev_priv->display.funcs.cdclk = &chv_cdclk_funcs;
3598 } else if (IS_VALLEYVIEW(dev_priv)) {
3599 dev_priv->display.funcs.cdclk = &vlv_cdclk_funcs;
3600 } else if (IS_SANDYBRIDGE(dev_priv) || IS_IVYBRIDGE(dev_priv)) {
3601 dev_priv->display.funcs.cdclk = &fixed_400mhz_cdclk_funcs;
3602 } else if (IS_IRONLAKE(dev_priv)) {
3603 dev_priv->display.funcs.cdclk = &ilk_cdclk_funcs;
3604 } else if (IS_GM45(dev_priv)) {
3605 dev_priv->display.funcs.cdclk = &gm45_cdclk_funcs;
3606 } else if (IS_G45(dev_priv)) {
3607 dev_priv->display.funcs.cdclk = &g33_cdclk_funcs;
3608 } else if (IS_I965GM(dev_priv)) {
3609 dev_priv->display.funcs.cdclk = &i965gm_cdclk_funcs;
3610 } else if (IS_I965G(dev_priv)) {
3611 dev_priv->display.funcs.cdclk = &fixed_400mhz_cdclk_funcs;
3612 } else if (IS_PINEVIEW(dev_priv)) {
3613 dev_priv->display.funcs.cdclk = &pnv_cdclk_funcs;
3614 } else if (IS_G33(dev_priv)) {
3615 dev_priv->display.funcs.cdclk = &g33_cdclk_funcs;
3616 } else if (IS_I945GM(dev_priv)) {
3617 dev_priv->display.funcs.cdclk = &i945gm_cdclk_funcs;
3618 } else if (IS_I945G(dev_priv)) {
3619 dev_priv->display.funcs.cdclk = &fixed_400mhz_cdclk_funcs;
3620 } else if (IS_I915GM(dev_priv)) {
3621 dev_priv->display.funcs.cdclk = &i915gm_cdclk_funcs;
3622 } else if (IS_I915G(dev_priv)) {
3623 dev_priv->display.funcs.cdclk = &i915g_cdclk_funcs;
3624 } else if (IS_I865G(dev_priv)) {
3625 dev_priv->display.funcs.cdclk = &i865g_cdclk_funcs;
3626 } else if (IS_I85X(dev_priv)) {
3627 dev_priv->display.funcs.cdclk = &i85x_cdclk_funcs;
3628 } else if (IS_I845G(dev_priv)) {
3629 dev_priv->display.funcs.cdclk = &i845g_cdclk_funcs;
3630 } else if (IS_I830(dev_priv)) {
3631 dev_priv->display.funcs.cdclk = &i830_cdclk_funcs;
3632 }
3633
> 3634 if (drm_WARN(&dev_priv->drm, !dev_priv->display.funcs.cdclk,
3635 "Unknown platform. Assuming i830\n"))
3636 dev_priv->display.funcs.cdclk = &i830_cdclk_funcs;
> 3637 }
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-lkp@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.bhadane@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 <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202306151523.wIGn4dME-lkp@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 = &tgl_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 | } else if (IS_I965GM(dev_priv)) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3610:11: error: expected identifier or '(' before 'else'
3610 | } else if (IS_I965G(dev_priv)) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3612:11: error: expected identifier or '(' before 'else'
3612 | } else if (IS_PINEVIEW(dev_priv)) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3614:11: error: expected identifier or '(' before 'else'
3614 | } else if (IS_G33(dev_priv)) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3616:11: error: expected identifier or '(' before 'else'
3616 | } else if (IS_I945GM(dev_priv)) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3618:11: error: expected identifier or '(' before 'else'
3618 | } else if (IS_I945G(dev_priv)) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3620:11: error: expected identifier or '(' before 'else'
3620 | } else if (IS_I915GM(dev_priv)) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3622:11: error: expected identifier or '(' before 'else'
3622 | } else if (IS_I915G(dev_priv)) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3624:11: error: expected identifier or '(' before 'else'
3624 | } else if (IS_I865G(dev_priv)) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3626:11: error: expected identifier or '(' before 'else'
3626 | } else if (IS_I85X(dev_priv)) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3628:11: error: expected identifier or '(' before 'else'
3628 | } else if (IS_I845G(dev_priv)) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3630:11: error: expected identifier or '(' before 'else'
3630 | } else if (IS_I830(dev_priv)) {
| ^~~~
>> drivers/gpu/drm/i915/display/intel_cdclk.c:3634:9: error: expected identifier or '(' before 'if'
3634 | if (drm_WARN(&dev_priv->drm, !dev_priv->display.funcs.cdclk,
| ^~
In file included from arch/x86/include/asm/bug.h:87,
from include/linux/bug.h:5,
from include/linux/cpumask.h:14,
from arch/x86/include/asm/cpumask.h:5,
from arch/x86/include/asm/msr.h:11,
from arch/x86/include/asm/processor.h:23,
from arch/x86/include/asm/timex.h:5,
from include/linux/timex.h:67,
from include/linux/time32.h:13,
from include/linux/time.h:60,
from drivers/gpu/drm/i915/display/intel_cdclk.c:24:
>> include/asm-generic/bug.h:135:2: error: expected identifier or '(' before ')' token
135 | })
| ^
include/drm/drm_print.h:620:9: note: in expansion of macro 'WARN'
620 | WARN(condition, "%s %s: " format, \
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3634:13: note: in expansion of macro 'drm_WARN'
3634 | if (drm_WARN(&dev_priv->drm, !dev_priv->display.funcs.cdclk,
| ^~~~~~~~
>> drivers/gpu/drm/i915/display/intel_cdclk.c:3637:1: error: expected identifier or '(' before '}' token
3637 | }
| ^
>> drivers/gpu/drm/i915/display/intel_cdclk.c:3543:39: error: 'i830_cdclk_funcs' defined but not used [-Werror=unused-const-variable=]
3543 | static const struct intel_cdclk_funcs i830_cdclk_funcs = {
| ^~~~~~~~~~~~~~~~
>> drivers/gpu/drm/i915/display/intel_cdclk.c:3538:39: error: 'i845g_cdclk_funcs' defined but not used [-Werror=unused-const-variable=]
3538 | static const struct intel_cdclk_funcs i845g_cdclk_funcs = {
| ^~~~~~~~~~~~~~~~~
>> drivers/gpu/drm/i915/display/intel_cdclk.c:3533:39: error: 'i85x_cdclk_funcs' defined but not used [-Werror=unused-const-variable=]
3533 | static const struct intel_cdclk_funcs i85x_cdclk_funcs = {
| ^~~~~~~~~~~~~~~~
>> drivers/gpu/drm/i915/display/intel_cdclk.c:3528:39: error: 'i865g_cdclk_funcs' defined but not used [-Werror=unused-const-variable=]
3528 | static const struct intel_cdclk_funcs i865g_cdclk_funcs = {
| ^~~~~~~~~~~~~~~~~
>> drivers/gpu/drm/i915/display/intel_cdclk.c:3523:39: error: 'i915g_cdclk_funcs' defined but not used [-Werror=unused-const-variable=]
3523 | static const struct intel_cdclk_funcs i915g_cdclk_funcs = {
| ^~~~~~~~~~~~~~~~~
>> drivers/gpu/drm/i915/display/intel_cdclk.c:3518:39: error: 'i915gm_cdclk_funcs' defined but not used [-Werror=unused-const-variable=]
3518 | static const struct intel_cdclk_funcs i915gm_cdclk_funcs = {
| ^~~~~~~~~~~~~~~~~~
>> drivers/gpu/drm/i915/display/intel_cdclk.c:3511:39: error: 'i945gm_cdclk_funcs' defined but not used [-Werror=unused-const-variable=]
3511 | static const struct intel_cdclk_funcs i945gm_cdclk_funcs = {
| ^~~~~~~~~~~~~~~~~~
>> drivers/gpu/drm/i915/display/intel_cdclk.c:3506:39: error: 'g33_cdclk_funcs' defined but not used [-Werror=unused-const-variable=]
3506 | static const struct intel_cdclk_funcs g33_cdclk_funcs = {
| ^~~~~~~~~~~~~~~
>> drivers/gpu/drm/i915/display/intel_cdclk.c:3501:39: error: 'pnv_cdclk_funcs' defined but not used [-Werror=unused-const-variable=]
3501 | static const struct intel_cdclk_funcs pnv_cdclk_funcs = {
| ^~~~~~~~~~~~~~~
>> drivers/gpu/drm/i915/display/intel_cdclk.c:3494:39: error: 'i965gm_cdclk_funcs' defined but not used [-Werror=unused-const-variable=]
3494 | static const struct intel_cdclk_funcs i965gm_cdclk_funcs = {
| ^~~~~~~~~~~~~~~~~~
>> drivers/gpu/drm/i915/display/intel_cdclk.c:3487:39: error: 'gm45_cdclk_funcs' defined but not used [-Werror=unused-const-variable=]
3487 | static const struct intel_cdclk_funcs gm45_cdclk_funcs = {
| ^~~~~~~~~~~~~~~~
>> drivers/gpu/drm/i915/display/intel_cdclk.c:3482:39: error: 'ilk_cdclk_funcs' defined but not used [-Werror=unused-const-variable=]
3482 | static const struct intel_cdclk_funcs ilk_cdclk_funcs = {
| ^~~~~~~~~~~~~~~
>> drivers/gpu/drm/i915/display/intel_cdclk.c:3477:39: error: 'fixed_400mhz_cdclk_funcs' defined but not used [-Werror=unused-const-variable=]
3477 | static const struct intel_cdclk_funcs fixed_400mhz_cdclk_funcs = {
| ^~~~~~~~~~~~~~~~~~~~~~~~
>> drivers/gpu/drm/i915/display/intel_cdclk.c:3471:39: error: 'hsw_cdclk_funcs' defined but not used [-Werror=unused-const-variable=]
3471 | static const struct intel_cdclk_funcs hsw_cdclk_funcs = {
| ^~~~~~~~~~~~~~~
>> drivers/gpu/drm/i915/display/intel_cdclk.c:3465:39: error: 'vlv_cdclk_funcs' defined but not used [-Werror=unused-const-variable=]
3465 | static const struct intel_cdclk_funcs vlv_cdclk_funcs = {
| ^~~~~~~~~~~~~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3459:39: error: 'chv_cdclk_funcs' defined but not used [-Werror=unused-const-variable=]
3459 | static const struct intel_cdclk_funcs chv_cdclk_funcs = {
| ^~~~~~~~~~~~~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3453:39: error: 'bdw_cdclk_funcs' defined but not used [-Werror=unused-const-variable=]
3453 | static const struct intel_cdclk_funcs bdw_cdclk_funcs = {
| ^~~~~~~~~~~~~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3447:39: error: 'skl_cdclk_funcs' defined but not used [-Werror=unused-const-variable=]
3447 | static const struct intel_cdclk_funcs skl_cdclk_funcs = {
| ^~~~~~~~~~~~~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3440:39: error: 'bxt_cdclk_funcs' defined but not used [-Werror=unused-const-variable=]
3440 | static const struct intel_cdclk_funcs bxt_cdclk_funcs = {
| ^~~~~~~~~~~~~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3433:39: error: 'icl_cdclk_funcs' defined but not used [-Werror=unused-const-variable=]
3433 | static const struct intel_cdclk_funcs icl_cdclk_funcs = {
| ^~~~~~~~~~~~~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3426:39: error: 'ehl_cdclk_funcs' defined but not used [-Werror=unused-const-variable=]
3426 | static const struct intel_cdclk_funcs ehl_cdclk_funcs = {
| ^~~~~~~~~~~~~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:1272:38: error: 'rkl_cdclk_table' defined but not used [-Werror=unused-const-variable=]
1272 | static const struct intel_cdclk_vals rkl_cdclk_table[] = {
| ^~~~~~~~~~~~~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:1248:38: error: 'icl_cdclk_table' defined but not used [-Werror=unused-const-variable=]
1248 | static const struct intel_cdclk_vals icl_cdclk_table[] = {
| ^~~~~~~~~~~~~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:1241:38: error: 'glk_cdclk_table' defined but not used [-Werror=unused-const-variable=]
1241 | static const struct intel_cdclk_vals glk_cdclk_table[] = {
| ^~~~~~~~~~~~~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:1232:38: error: 'bxt_cdclk_table' defined but not used [-Werror=unused-const-variable=]
1232 | static const struct intel_cdclk_vals bxt_cdclk_table[] = {
| ^~~~~~~~~~~~~~~
cc1: all warnings being treated as errors
vim +/if +3562 drivers/gpu/drm/i915/display/intel_cdclk.c
3425
> 3426 static const struct intel_cdclk_funcs ehl_cdclk_funcs = {
3427 .get_cdclk = bxt_get_cdclk,
3428 .set_cdclk = bxt_set_cdclk,
3429 .modeset_calc_cdclk = bxt_modeset_calc_cdclk,
3430 .calc_voltage_level = ehl_calc_voltage_level,
3431 };
3432
> 3433 static const struct intel_cdclk_funcs icl_cdclk_funcs = {
3434 .get_cdclk = bxt_get_cdclk,
3435 .set_cdclk = bxt_set_cdclk,
3436 .modeset_calc_cdclk = bxt_modeset_calc_cdclk,
3437 .calc_voltage_level = icl_calc_voltage_level,
3438 };
3439
> 3440 static const struct intel_cdclk_funcs bxt_cdclk_funcs = {
3441 .get_cdclk = bxt_get_cdclk,
3442 .set_cdclk = bxt_set_cdclk,
3443 .modeset_calc_cdclk = bxt_modeset_calc_cdclk,
3444 .calc_voltage_level = bxt_calc_voltage_level,
3445 };
3446
> 3447 static const struct intel_cdclk_funcs skl_cdclk_funcs = {
3448 .get_cdclk = skl_get_cdclk,
3449 .set_cdclk = skl_set_cdclk,
3450 .modeset_calc_cdclk = skl_modeset_calc_cdclk,
3451 };
3452
> 3453 static const struct intel_cdclk_funcs bdw_cdclk_funcs = {
3454 .get_cdclk = bdw_get_cdclk,
3455 .set_cdclk = bdw_set_cdclk,
3456 .modeset_calc_cdclk = bdw_modeset_calc_cdclk,
3457 };
3458
> 3459 static const struct intel_cdclk_funcs chv_cdclk_funcs = {
3460 .get_cdclk = vlv_get_cdclk,
3461 .set_cdclk = chv_set_cdclk,
3462 .modeset_calc_cdclk = vlv_modeset_calc_cdclk,
3463 };
3464
> 3465 static const struct intel_cdclk_funcs vlv_cdclk_funcs = {
3466 .get_cdclk = vlv_get_cdclk,
3467 .set_cdclk = vlv_set_cdclk,
3468 .modeset_calc_cdclk = vlv_modeset_calc_cdclk,
3469 };
3470
> 3471 static const struct intel_cdclk_funcs hsw_cdclk_funcs = {
3472 .get_cdclk = hsw_get_cdclk,
3473 .modeset_calc_cdclk = fixed_modeset_calc_cdclk,
3474 };
3475
3476 /* SNB, IVB, 965G, 945G */
> 3477 static const struct intel_cdclk_funcs fixed_400mhz_cdclk_funcs = {
3478 .get_cdclk = fixed_400mhz_get_cdclk,
3479 .modeset_calc_cdclk = fixed_modeset_calc_cdclk,
3480 };
3481
> 3482 static const struct intel_cdclk_funcs ilk_cdclk_funcs = {
3483 .get_cdclk = fixed_450mhz_get_cdclk,
3484 .modeset_calc_cdclk = fixed_modeset_calc_cdclk,
3485 };
3486
> 3487 static const struct intel_cdclk_funcs gm45_cdclk_funcs = {
3488 .get_cdclk = gm45_get_cdclk,
3489 .modeset_calc_cdclk = fixed_modeset_calc_cdclk,
3490 };
3491
3492 /* G45 uses G33 */
3493
> 3494 static const struct intel_cdclk_funcs i965gm_cdclk_funcs = {
3495 .get_cdclk = i965gm_get_cdclk,
3496 .modeset_calc_cdclk = fixed_modeset_calc_cdclk,
3497 };
3498
3499 /* i965G uses fixed 400 */
3500
> 3501 static const struct intel_cdclk_funcs pnv_cdclk_funcs = {
3502 .get_cdclk = pnv_get_cdclk,
3503 .modeset_calc_cdclk = fixed_modeset_calc_cdclk,
3504 };
3505
> 3506 static const struct intel_cdclk_funcs g33_cdclk_funcs = {
3507 .get_cdclk = g33_get_cdclk,
3508 .modeset_calc_cdclk = fixed_modeset_calc_cdclk,
3509 };
3510
> 3511 static const struct intel_cdclk_funcs i945gm_cdclk_funcs = {
3512 .get_cdclk = i945gm_get_cdclk,
3513 .modeset_calc_cdclk = fixed_modeset_calc_cdclk,
3514 };
3515
3516 /* i945G uses fixed 400 */
3517
> 3518 static const struct intel_cdclk_funcs i915gm_cdclk_funcs = {
3519 .get_cdclk = i915gm_get_cdclk,
3520 .modeset_calc_cdclk = fixed_modeset_calc_cdclk,
3521 };
3522
> 3523 static const struct intel_cdclk_funcs i915g_cdclk_funcs = {
3524 .get_cdclk = fixed_333mhz_get_cdclk,
3525 .modeset_calc_cdclk = fixed_modeset_calc_cdclk,
3526 };
3527
> 3528 static const struct intel_cdclk_funcs i865g_cdclk_funcs = {
3529 .get_cdclk = fixed_266mhz_get_cdclk,
3530 .modeset_calc_cdclk = fixed_modeset_calc_cdclk,
3531 };
3532
> 3533 static const struct intel_cdclk_funcs i85x_cdclk_funcs = {
3534 .get_cdclk = i85x_get_cdclk,
3535 .modeset_calc_cdclk = fixed_modeset_calc_cdclk,
3536 };
3537
> 3538 static const struct intel_cdclk_funcs i845g_cdclk_funcs = {
3539 .get_cdclk = fixed_200mhz_get_cdclk,
3540 .modeset_calc_cdclk = fixed_modeset_calc_cdclk,
3541 };
3542
> 3543 static const struct intel_cdclk_funcs i830_cdclk_funcs = {
3544 .get_cdclk = fixed_133mhz_get_cdclk,
3545 .modeset_calc_cdclk = fixed_modeset_calc_cdclk,
3546 };
3547
3548 /**
3549 * intel_init_cdclk_hooks - Initialize CDCLK related modesetting hooks
3550 * @dev_priv: i915 device
3551 */
3552 void intel_init_cdclk_hooks(struct drm_i915_private *dev_priv)
3553 {
3554 if (IS_METEORLAKE(dev_priv)) {
3555 dev_priv->display.funcs.cdclk = &mtl_cdclk_funcs;
3556 dev_priv->display.cdclk.table = mtl_cdclk_table;
3557 } else if (IS_DG2(dev_priv)) {
3558 dev_priv->display.funcs.cdclk = &tgl_cdclk_funcs;
3559 dev_priv->display.cdclk.table = dg2_cdclk_table;
3560 } else if (IS_ALDERLAKE_P(dev_priv)) {
3561 /* Wa_22011320316:adl-p[a0] */
> 3562 if (IS_ALDERLAKE_P_DISPLAY_STEP(dev_priv, STEP_A0, STEP_B0))
3563 dev_priv->display.cdclk.table = adlp_a_step_cdclk_table;
3564 dev_priv->display.funcs.cdclk = &tgl_cdclk_funcs;
3565 } else if (IS_ADLP_RPLU(dev_priv)) {
3566 dev_priv->display.cdclk.table = rplu_cdclk_table;
3567 dev_priv->display.funcs.cdclk = &rplu_cdclk_funcs;
3568 } else {
3569 dev_priv->display.cdclk.table = adlp_cdclk_table;
3570 dev_priv->display.funcs.cdclk = &tgl_cdclk_funcs;
3571 }
> 3572 } else if (IS_ROCKETLAKE(dev_priv)) {
3573 dev_priv->display.funcs.cdclk = &tgl_cdclk_funcs;
3574 dev_priv->display.cdclk.table = rkl_cdclk_table;
3575 } else if (DISPLAY_VER(dev_priv) >= 12) {
3576 dev_priv->display.funcs.cdclk = &tgl_cdclk_funcs;
3577 dev_priv->display.cdclk.table = icl_cdclk_table;
3578 } else if (IS_JASPERLAKE_EHL(dev_priv)) {
3579 dev_priv->display.funcs.cdclk = &ehl_cdclk_funcs;
3580 dev_priv->display.cdclk.table = icl_cdclk_table;
3581 } else if (DISPLAY_VER(dev_priv) >= 11) {
3582 dev_priv->display.funcs.cdclk = &icl_cdclk_funcs;
3583 dev_priv->display.cdclk.table = icl_cdclk_table;
3584 } else if (IS_GEMINILAKE(dev_priv) || IS_BROXTON(dev_priv)) {
3585 dev_priv->display.funcs.cdclk = &bxt_cdclk_funcs;
3586 if (IS_GEMINILAKE(dev_priv))
3587 dev_priv->display.cdclk.table = glk_cdclk_table;
3588 else
3589 dev_priv->display.cdclk.table = bxt_cdclk_table;
3590 } else if (DISPLAY_VER(dev_priv) == 9) {
3591 dev_priv->display.funcs.cdclk = &skl_cdclk_funcs;
3592 } else if (IS_BROADWELL(dev_priv)) {
3593 dev_priv->display.funcs.cdclk = &bdw_cdclk_funcs;
3594 } else if (IS_HASWELL(dev_priv)) {
3595 dev_priv->display.funcs.cdclk = &hsw_cdclk_funcs;
3596 } else if (IS_CHERRYVIEW(dev_priv)) {
3597 dev_priv->display.funcs.cdclk = &chv_cdclk_funcs;
3598 } else if (IS_VALLEYVIEW(dev_priv)) {
3599 dev_priv->display.funcs.cdclk = &vlv_cdclk_funcs;
3600 } else if (IS_SANDYBRIDGE(dev_priv) || IS_IVYBRIDGE(dev_priv)) {
3601 dev_priv->display.funcs.cdclk = &fixed_400mhz_cdclk_funcs;
3602 } else if (IS_IRONLAKE(dev_priv)) {
3603 dev_priv->display.funcs.cdclk = &ilk_cdclk_funcs;
3604 } else if (IS_GM45(dev_priv)) {
3605 dev_priv->display.funcs.cdclk = &gm45_cdclk_funcs;
3606 } else if (IS_G45(dev_priv)) {
3607 dev_priv->display.funcs.cdclk = &g33_cdclk_funcs;
3608 } else if (IS_I965GM(dev_priv)) {
3609 dev_priv->display.funcs.cdclk = &i965gm_cdclk_funcs;
3610 } else if (IS_I965G(dev_priv)) {
3611 dev_priv->display.funcs.cdclk = &fixed_400mhz_cdclk_funcs;
3612 } else if (IS_PINEVIEW(dev_priv)) {
3613 dev_priv->display.funcs.cdclk = &pnv_cdclk_funcs;
3614 } else if (IS_G33(dev_priv)) {
3615 dev_priv->display.funcs.cdclk = &g33_cdclk_funcs;
3616 } else if (IS_I945GM(dev_priv)) {
3617 dev_priv->display.funcs.cdclk = &i945gm_cdclk_funcs;
3618 } else if (IS_I945G(dev_priv)) {
3619 dev_priv->display.funcs.cdclk = &fixed_400mhz_cdclk_funcs;
3620 } else if (IS_I915GM(dev_priv)) {
3621 dev_priv->display.funcs.cdclk = &i915gm_cdclk_funcs;
3622 } else if (IS_I915G(dev_priv)) {
3623 dev_priv->display.funcs.cdclk = &i915g_cdclk_funcs;
3624 } else if (IS_I865G(dev_priv)) {
3625 dev_priv->display.funcs.cdclk = &i865g_cdclk_funcs;
3626 } else if (IS_I85X(dev_priv)) {
3627 dev_priv->display.funcs.cdclk = &i85x_cdclk_funcs;
3628 } else if (IS_I845G(dev_priv)) {
3629 dev_priv->display.funcs.cdclk = &i845g_cdclk_funcs;
3630 } else if (IS_I830(dev_priv)) {
3631 dev_priv->display.funcs.cdclk = &i830_cdclk_funcs;
3632 }
3633
> 3634 if (drm_WARN(&dev_priv->drm, !dev_priv->display.funcs.cdclk,
3635 "Unknown platform. Assuming i830\n"))
3636 dev_priv->display.funcs.cdclk = &i830_cdclk_funcs;
> 3637 }
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-lkp@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.bhadane@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 <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202306151502.QcAZXboK-lkp@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 = &tgl_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 | } else if (IS_I965GM(dev_priv)) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3610:11: error: expected identifier or '(' before 'else'
3610 | } else if (IS_I965G(dev_priv)) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3612:11: error: expected identifier or '(' before 'else'
3612 | } else if (IS_PINEVIEW(dev_priv)) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3614:11: error: expected identifier or '(' before 'else'
3614 | } else if (IS_G33(dev_priv)) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3616:11: error: expected identifier or '(' before 'else'
3616 | } else if (IS_I945GM(dev_priv)) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3618:11: error: expected identifier or '(' before 'else'
3618 | } else if (IS_I945G(dev_priv)) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3620:11: error: expected identifier or '(' before 'else'
3620 | } else if (IS_I915GM(dev_priv)) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3622:11: error: expected identifier or '(' before 'else'
3622 | } else if (IS_I915G(dev_priv)) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3624:11: error: expected identifier or '(' before 'else'
3624 | } else if (IS_I865G(dev_priv)) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3626:11: error: expected identifier or '(' before 'else'
3626 | } else if (IS_I85X(dev_priv)) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3628:11: error: expected identifier or '(' before 'else'
3628 | } else if (IS_I845G(dev_priv)) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3630:11: error: expected identifier or '(' before 'else'
3630 | } else if (IS_I830(dev_priv)) {
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3634:9: error: expected identifier or '(' before 'if'
3634 | if (drm_WARN(&dev_priv->drm, !dev_priv->display.funcs.cdclk,
| ^~
In file included from arch/x86/include/asm/bug.h:87,
from include/linux/bug.h:5,
from include/linux/fortify-string.h:5,
from include/linux/string.h:254,
from arch/x86/include/asm/page_32.h:18,
from arch/x86/include/asm/page.h:14,
from arch/x86/include/asm/processor.h:20,
from arch/x86/include/asm/timex.h:5,
from include/linux/timex.h:67,
from include/linux/time32.h:13,
from include/linux/time.h:60,
from drivers/gpu/drm/i915/display/intel_cdclk.c:24:
include/asm-generic/bug.h:135:2: error: expected identifier or '(' before ')' token
135 | })
| ^
include/drm/drm_print.h:620:9: note: in expansion of macro 'WARN'
620 | WARN(condition, "%s %s: " format, \
| ^~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3634:13: note: in expansion of macro 'drm_WARN'
3634 | if (drm_WARN(&dev_priv->drm, !dev_priv->display.funcs.cdclk,
| ^~~~~~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3637:1: error: expected identifier or '(' before '}' token
3637 | }
| ^
>> drivers/gpu/drm/i915/display/intel_cdclk.c:3543:39: warning: 'i830_cdclk_funcs' defined but not used [-Wunused-const-variable=]
3543 | static const struct intel_cdclk_funcs i830_cdclk_funcs = {
| ^~~~~~~~~~~~~~~~
>> drivers/gpu/drm/i915/display/intel_cdclk.c:3538:39: warning: 'i845g_cdclk_funcs' defined but not used [-Wunused-const-variable=]
3538 | static const struct intel_cdclk_funcs i845g_cdclk_funcs = {
| ^~~~~~~~~~~~~~~~~
>> drivers/gpu/drm/i915/display/intel_cdclk.c:3533:39: warning: 'i85x_cdclk_funcs' defined but not used [-Wunused-const-variable=]
3533 | static const struct intel_cdclk_funcs i85x_cdclk_funcs = {
| ^~~~~~~~~~~~~~~~
>> drivers/gpu/drm/i915/display/intel_cdclk.c:3528:39: warning: 'i865g_cdclk_funcs' defined but not used [-Wunused-const-variable=]
3528 | static const struct intel_cdclk_funcs i865g_cdclk_funcs = {
| ^~~~~~~~~~~~~~~~~
>> drivers/gpu/drm/i915/display/intel_cdclk.c:3523:39: warning: 'i915g_cdclk_funcs' defined but not used [-Wunused-const-variable=]
3523 | static const struct intel_cdclk_funcs i915g_cdclk_funcs = {
| ^~~~~~~~~~~~~~~~~
>> drivers/gpu/drm/i915/display/intel_cdclk.c:3518:39: warning: 'i915gm_cdclk_funcs' defined but not used [-Wunused-const-variable=]
3518 | static const struct intel_cdclk_funcs i915gm_cdclk_funcs = {
| ^~~~~~~~~~~~~~~~~~
>> drivers/gpu/drm/i915/display/intel_cdclk.c:3511:39: warning: 'i945gm_cdclk_funcs' defined but not used [-Wunused-const-variable=]
3511 | static const struct intel_cdclk_funcs i945gm_cdclk_funcs = {
| ^~~~~~~~~~~~~~~~~~
>> drivers/gpu/drm/i915/display/intel_cdclk.c:3506:39: warning: 'g33_cdclk_funcs' defined but not used [-Wunused-const-variable=]
3506 | static const struct intel_cdclk_funcs g33_cdclk_funcs = {
| ^~~~~~~~~~~~~~~
>> drivers/gpu/drm/i915/display/intel_cdclk.c:3501:39: warning: 'pnv_cdclk_funcs' defined but not used [-Wunused-const-variable=]
3501 | static const struct intel_cdclk_funcs pnv_cdclk_funcs = {
| ^~~~~~~~~~~~~~~
>> drivers/gpu/drm/i915/display/intel_cdclk.c:3494:39: warning: 'i965gm_cdclk_funcs' defined but not used [-Wunused-const-variable=]
3494 | static const struct intel_cdclk_funcs i965gm_cdclk_funcs = {
| ^~~~~~~~~~~~~~~~~~
>> drivers/gpu/drm/i915/display/intel_cdclk.c:3487:39: warning: 'gm45_cdclk_funcs' defined but not used [-Wunused-const-variable=]
3487 | static const struct intel_cdclk_funcs gm45_cdclk_funcs = {
| ^~~~~~~~~~~~~~~~
>> drivers/gpu/drm/i915/display/intel_cdclk.c:3482:39: warning: 'ilk_cdclk_funcs' defined but not used [-Wunused-const-variable=]
3482 | static const struct intel_cdclk_funcs ilk_cdclk_funcs = {
| ^~~~~~~~~~~~~~~
>> drivers/gpu/drm/i915/display/intel_cdclk.c:3477:39: warning: 'fixed_400mhz_cdclk_funcs' defined but not used [-Wunused-const-variable=]
3477 | static const struct intel_cdclk_funcs fixed_400mhz_cdclk_funcs = {
| ^~~~~~~~~~~~~~~~~~~~~~~~
>> drivers/gpu/drm/i915/display/intel_cdclk.c:3471:39: warning: 'hsw_cdclk_funcs' defined but not used [-Wunused-const-variable=]
3471 | static const struct intel_cdclk_funcs hsw_cdclk_funcs = {
| ^~~~~~~~~~~~~~~
>> drivers/gpu/drm/i915/display/intel_cdclk.c:3465:39: warning: 'vlv_cdclk_funcs' defined but not used [-Wunused-const-variable=]
3465 | static const struct intel_cdclk_funcs vlv_cdclk_funcs = {
| ^~~~~~~~~~~~~~~
>> drivers/gpu/drm/i915/display/intel_cdclk.c:3459:39: warning: 'chv_cdclk_funcs' defined but not used [-Wunused-const-variable=]
3459 | static const struct intel_cdclk_funcs chv_cdclk_funcs = {
| ^~~~~~~~~~~~~~~
>> drivers/gpu/drm/i915/display/intel_cdclk.c:3453:39: warning: 'bdw_cdclk_funcs' defined but not used [-Wunused-const-variable=]
3453 | static const struct intel_cdclk_funcs bdw_cdclk_funcs = {
| ^~~~~~~~~~~~~~~
>> drivers/gpu/drm/i915/display/intel_cdclk.c:3447:39: warning: 'skl_cdclk_funcs' defined but not used [-Wunused-const-variable=]
3447 | static const struct intel_cdclk_funcs skl_cdclk_funcs = {
| ^~~~~~~~~~~~~~~
>> drivers/gpu/drm/i915/display/intel_cdclk.c:3440:39: warning: 'bxt_cdclk_funcs' defined but not used [-Wunused-const-variable=]
3440 | static const struct intel_cdclk_funcs bxt_cdclk_funcs = {
| ^~~~~~~~~~~~~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3433:39: warning: 'icl_cdclk_funcs' defined but not used [-Wunused-const-variable=]
3433 | static const struct intel_cdclk_funcs icl_cdclk_funcs = {
| ^~~~~~~~~~~~~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:3426:39: warning: 'ehl_cdclk_funcs' defined but not used [-Wunused-const-variable=]
3426 | static const struct intel_cdclk_funcs ehl_cdclk_funcs = {
| ^~~~~~~~~~~~~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:1272:38: warning: 'rkl_cdclk_table' defined but not used [-Wunused-const-variable=]
1272 | static const struct intel_cdclk_vals rkl_cdclk_table[] = {
| ^~~~~~~~~~~~~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:1248:38: warning: 'icl_cdclk_table' defined but not used [-Wunused-const-variable=]
1248 | static const struct intel_cdclk_vals icl_cdclk_table[] = {
| ^~~~~~~~~~~~~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:1241:38: warning: 'glk_cdclk_table' defined but not used [-Wunused-const-variable=]
1241 | static const struct intel_cdclk_vals glk_cdclk_table[] = {
| ^~~~~~~~~~~~~~~
drivers/gpu/drm/i915/display/intel_cdclk.c:1232:38: warning: 'bxt_cdclk_table' defined but not used [-Wunused-const-variable=]
1232 | static const struct intel_cdclk_vals bxt_cdclk_table[] = {
| ^~~~~~~~~~~~~~~
vim +/if +3562 drivers/gpu/drm/i915/display/intel_cdclk.c
3425
> 3426 static const struct intel_cdclk_funcs ehl_cdclk_funcs = {
3427 .get_cdclk = bxt_get_cdclk,
3428 .set_cdclk = bxt_set_cdclk,
3429 .modeset_calc_cdclk = bxt_modeset_calc_cdclk,
3430 .calc_voltage_level = ehl_calc_voltage_level,
3431 };
3432
> 3433 static const struct intel_cdclk_funcs icl_cdclk_funcs = {
3434 .get_cdclk = bxt_get_cdclk,
3435 .set_cdclk = bxt_set_cdclk,
3436 .modeset_calc_cdclk = bxt_modeset_calc_cdclk,
3437 .calc_voltage_level = icl_calc_voltage_level,
3438 };
3439
> 3440 static const struct intel_cdclk_funcs bxt_cdclk_funcs = {
3441 .get_cdclk = bxt_get_cdclk,
3442 .set_cdclk = bxt_set_cdclk,
3443 .modeset_calc_cdclk = bxt_modeset_calc_cdclk,
3444 .calc_voltage_level = bxt_calc_voltage_level,
3445 };
3446
> 3447 static const struct intel_cdclk_funcs skl_cdclk_funcs = {
3448 .get_cdclk = skl_get_cdclk,
3449 .set_cdclk = skl_set_cdclk,
3450 .modeset_calc_cdclk = skl_modeset_calc_cdclk,
3451 };
3452
> 3453 static const struct intel_cdclk_funcs bdw_cdclk_funcs = {
3454 .get_cdclk = bdw_get_cdclk,
3455 .set_cdclk = bdw_set_cdclk,
3456 .modeset_calc_cdclk = bdw_modeset_calc_cdclk,
3457 };
3458
> 3459 static const struct intel_cdclk_funcs chv_cdclk_funcs = {
3460 .get_cdclk = vlv_get_cdclk,
3461 .set_cdclk = chv_set_cdclk,
3462 .modeset_calc_cdclk = vlv_modeset_calc_cdclk,
3463 };
3464
> 3465 static const struct intel_cdclk_funcs vlv_cdclk_funcs = {
3466 .get_cdclk = vlv_get_cdclk,
3467 .set_cdclk = vlv_set_cdclk,
3468 .modeset_calc_cdclk = vlv_modeset_calc_cdclk,
3469 };
3470
> 3471 static const struct intel_cdclk_funcs hsw_cdclk_funcs = {
3472 .get_cdclk = hsw_get_cdclk,
3473 .modeset_calc_cdclk = fixed_modeset_calc_cdclk,
3474 };
3475
3476 /* SNB, IVB, 965G, 945G */
> 3477 static const struct intel_cdclk_funcs fixed_400mhz_cdclk_funcs = {
3478 .get_cdclk = fixed_400mhz_get_cdclk,
3479 .modeset_calc_cdclk = fixed_modeset_calc_cdclk,
3480 };
3481
> 3482 static const struct intel_cdclk_funcs ilk_cdclk_funcs = {
3483 .get_cdclk = fixed_450mhz_get_cdclk,
3484 .modeset_calc_cdclk = fixed_modeset_calc_cdclk,
3485 };
3486
> 3487 static const struct intel_cdclk_funcs gm45_cdclk_funcs = {
3488 .get_cdclk = gm45_get_cdclk,
3489 .modeset_calc_cdclk = fixed_modeset_calc_cdclk,
3490 };
3491
3492 /* G45 uses G33 */
3493
> 3494 static const struct intel_cdclk_funcs i965gm_cdclk_funcs = {
3495 .get_cdclk = i965gm_get_cdclk,
3496 .modeset_calc_cdclk = fixed_modeset_calc_cdclk,
3497 };
3498
3499 /* i965G uses fixed 400 */
3500
> 3501 static const struct intel_cdclk_funcs pnv_cdclk_funcs = {
3502 .get_cdclk = pnv_get_cdclk,
3503 .modeset_calc_cdclk = fixed_modeset_calc_cdclk,
3504 };
3505
> 3506 static const struct intel_cdclk_funcs g33_cdclk_funcs = {
3507 .get_cdclk = g33_get_cdclk,
3508 .modeset_calc_cdclk = fixed_modeset_calc_cdclk,
3509 };
3510
> 3511 static const struct intel_cdclk_funcs i945gm_cdclk_funcs = {
3512 .get_cdclk = i945gm_get_cdclk,
3513 .modeset_calc_cdclk = fixed_modeset_calc_cdclk,
3514 };
3515
3516 /* i945G uses fixed 400 */
3517
> 3518 static const struct intel_cdclk_funcs i915gm_cdclk_funcs = {
3519 .get_cdclk = i915gm_get_cdclk,
3520 .modeset_calc_cdclk = fixed_modeset_calc_cdclk,
3521 };
3522
> 3523 static const struct intel_cdclk_funcs i915g_cdclk_funcs = {
3524 .get_cdclk = fixed_333mhz_get_cdclk,
3525 .modeset_calc_cdclk = fixed_modeset_calc_cdclk,
3526 };
3527
> 3528 static const struct intel_cdclk_funcs i865g_cdclk_funcs = {
3529 .get_cdclk = fixed_266mhz_get_cdclk,
3530 .modeset_calc_cdclk = fixed_modeset_calc_cdclk,
3531 };
3532
> 3533 static const struct intel_cdclk_funcs i85x_cdclk_funcs = {
3534 .get_cdclk = i85x_get_cdclk,
3535 .modeset_calc_cdclk = fixed_modeset_calc_cdclk,
3536 };
3537
> 3538 static const struct intel_cdclk_funcs i845g_cdclk_funcs = {
3539 .get_cdclk = fixed_200mhz_get_cdclk,
3540 .modeset_calc_cdclk = fixed_modeset_calc_cdclk,
3541 };
3542
> 3543 static const struct intel_cdclk_funcs i830_cdclk_funcs = {
3544 .get_cdclk = fixed_133mhz_get_cdclk,
3545 .modeset_calc_cdclk = fixed_modeset_calc_cdclk,
3546 };
3547
3548 /**
3549 * intel_init_cdclk_hooks - Initialize CDCLK related modesetting hooks
3550 * @dev_priv: i915 device
3551 */
3552 void intel_init_cdclk_hooks(struct drm_i915_private *dev_priv)
3553 {
3554 if (IS_METEORLAKE(dev_priv)) {
3555 dev_priv->display.funcs.cdclk = &mtl_cdclk_funcs;
3556 dev_priv->display.cdclk.table = mtl_cdclk_table;
3557 } else if (IS_DG2(dev_priv)) {
3558 dev_priv->display.funcs.cdclk = &tgl_cdclk_funcs;
3559 dev_priv->display.cdclk.table = dg2_cdclk_table;
3560 } else if (IS_ALDERLAKE_P(dev_priv)) {
3561 /* Wa_22011320316:adl-p[a0] */
> 3562 if (IS_ALDERLAKE_P_DISPLAY_STEP(dev_priv, STEP_A0, STEP_B0))
3563 dev_priv->display.cdclk.table = adlp_a_step_cdclk_table;
3564 dev_priv->display.funcs.cdclk = &tgl_cdclk_funcs;
3565 } else if (IS_ADLP_RPLU(dev_priv)) {
3566 dev_priv->display.cdclk.table = rplu_cdclk_table;
3567 dev_priv->display.funcs.cdclk = &rplu_cdclk_funcs;
3568 } else {
3569 dev_priv->display.cdclk.table = adlp_cdclk_table;
3570 dev_priv->display.funcs.cdclk = &tgl_cdclk_funcs;
3571 }
3572 } else if (IS_ROCKETLAKE(dev_priv)) {
3573 dev_priv->display.funcs.cdclk = &tgl_cdclk_funcs;
3574 dev_priv->display.cdclk.table = rkl_cdclk_table;
3575 } else if (DISPLAY_VER(dev_priv) >= 12) {
3576 dev_priv->display.funcs.cdclk = &tgl_cdclk_funcs;
3577 dev_priv->display.cdclk.table = icl_cdclk_table;
3578 } else if (IS_JASPERLAKE_EHL(dev_priv)) {
3579 dev_priv->display.funcs.cdclk = &ehl_cdclk_funcs;
3580 dev_priv->display.cdclk.table = icl_cdclk_table;
3581 } else if (DISPLAY_VER(dev_priv) >= 11) {
3582 dev_priv->display.funcs.cdclk = &icl_cdclk_funcs;
3583 dev_priv->display.cdclk.table = icl_cdclk_table;
3584 } else if (IS_GEMINILAKE(dev_priv) || IS_BROXTON(dev_priv)) {
3585 dev_priv->display.funcs.cdclk = &bxt_cdclk_funcs;
3586 if (IS_GEMINILAKE(dev_priv))
3587 dev_priv->display.cdclk.table = glk_cdclk_table;
3588 else
3589 dev_priv->display.cdclk.table = bxt_cdclk_table;
3590 } else if (DISPLAY_VER(dev_priv) == 9) {
3591 dev_priv->display.funcs.cdclk = &skl_cdclk_funcs;
3592 } else if (IS_BROADWELL(dev_priv)) {
3593 dev_priv->display.funcs.cdclk = &bdw_cdclk_funcs;
3594 } else if (IS_HASWELL(dev_priv)) {
3595 dev_priv->display.funcs.cdclk = &hsw_cdclk_funcs;
3596 } else if (IS_CHERRYVIEW(dev_priv)) {
3597 dev_priv->display.funcs.cdclk = &chv_cdclk_funcs;
3598 } else if (IS_VALLEYVIEW(dev_priv)) {
3599 dev_priv->display.funcs.cdclk = &vlv_cdclk_funcs;
3600 } else if (IS_SANDYBRIDGE(dev_priv) || IS_IVYBRIDGE(dev_priv)) {
3601 dev_priv->display.funcs.cdclk = &fixed_400mhz_cdclk_funcs;
3602 } else if (IS_IRONLAKE(dev_priv)) {
3603 dev_priv->display.funcs.cdclk = &ilk_cdclk_funcs;
3604 } else if (IS_GM45(dev_priv)) {
3605 dev_priv->display.funcs.cdclk = &gm45_cdclk_funcs;
3606 } else if (IS_G45(dev_priv)) {
3607 dev_priv->display.funcs.cdclk = &g33_cdclk_funcs;
3608 } else if (IS_I965GM(dev_priv)) {
3609 dev_priv->display.funcs.cdclk = &i965gm_cdclk_funcs;
3610 } else if (IS_I965G(dev_priv)) {
3611 dev_priv->display.funcs.cdclk = &fixed_400mhz_cdclk_funcs;
3612 } else if (IS_PINEVIEW(dev_priv)) {
3613 dev_priv->display.funcs.cdclk = &pnv_cdclk_funcs;
3614 } else if (IS_G33(dev_priv)) {
3615 dev_priv->display.funcs.cdclk = &g33_cdclk_funcs;
3616 } else if (IS_I945GM(dev_priv)) {
3617 dev_priv->display.funcs.cdclk = &i945gm_cdclk_funcs;
3618 } else if (IS_I945G(dev_priv)) {
3619 dev_priv->display.funcs.cdclk = &fixed_400mhz_cdclk_funcs;
3620 } else if (IS_I915GM(dev_priv)) {
3621 dev_priv->display.funcs.cdclk = &i915gm_cdclk_funcs;
3622 } else if (IS_I915G(dev_priv)) {
3623 dev_priv->display.funcs.cdclk = &i915g_cdclk_funcs;
3624 } else if (IS_I865G(dev_priv)) {
3625 dev_priv->display.funcs.cdclk = &i865g_cdclk_funcs;
3626 } else if (IS_I85X(dev_priv)) {
3627 dev_priv->display.funcs.cdclk = &i85x_cdclk_funcs;
3628 } else if (IS_I845G(dev_priv)) {
3629 dev_priv->display.funcs.cdclk = &i845g_cdclk_funcs;
3630 } else if (IS_I830(dev_priv)) {
3631 dev_priv->display.funcs.cdclk = &i830_cdclk_funcs;
3632 }
3633
> 3634 if (drm_WARN(&dev_priv->drm, !dev_priv->display.funcs.cdclk,
3635 "Unknown platform. Assuming i830\n"))
3636 dev_priv->display.funcs.cdclk = &i830_cdclk_funcs;
> 3637 }
> -----Original Message----- > From: Bhadane, Dnyaneshwar <dnyaneshwar.bhadane@intel.com> > Sent: Wednesday, June 14, 2023 10:00 PM > To: intel-gfx@lists.freedesktop.org > Cc: Atwood, Matthew S <matthew.s.atwood@intel.com>; Srivatsa, Anusha > <anusha.srivatsa@intel.com>; Bhadane, Dnyaneshwar > <dnyaneshwar.bhadane@intel.com> > Subject: [PATCH 07/11] drm/i915/adlp: s/ADLP/ALDERLAKE_P for display and > graphics step > > From: Anusha Srivatsa <anusha.srivatsa@intel.com> > > Driver refers to the platfrom Alderlake P as ADLP in places and ALDERLAKE_P in ^^^ noyiced I have made a typo
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 = &tgl_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(&dev_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(&dev_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 drm_i915_private *i915, (IS_ALDERLAKE_S(__i915) && \ IS_GRAPHICS_STEP(__i915, since, until)) -#define IS_ADLP_DISPLAY_STEP(__i915, since, until) \ +#define IS_ALDERLAKE_P_DISPLAY_STEP(__i915, since, until) \ (IS_ALDERLAKE_P(__i915) && \ IS_DISPLAY_STEP(__i915, since, until)) -#define IS_ADLP_GRAPHICS_STEP(__i915, since, until) \ +#define IS_ALDERLAKE_P_GRAPHICS_STEP(__i915, since, until) \ (IS_ALDERLAKE_P(__i915) && \ IS_GRAPHICS_STEP(__i915, since, until))