On Sun, 19 Mar 2023, Ashutosh Dixit <ashutosh.dixit@xxxxxxxxx> wrote:
> This reverts commit ee892ea83d99610fa33bea612de058e0955eec3a.
>
> 0349c41b0596 ("drm/i915/hwmon: Enable PL1 power limit") was reverted in
> 05d5562e401e ("Revert "drm/i915/hwmon: Enable PL1 power limit"") but has
> appeared again as ee892ea83d99 ("drm/i915/hwmon: Enable PL1 power
> limit"). Revert it again.
Thanks, applied to drm-intel-fixes with the commit message reduced to be
about this commit being picked up accidentally.
Sorry for the trouble.
BR,
Jani.
>
> Cc: <stable@xxxxxxxxxxxxxxx> # v6.2+
> Cc: Jani Nikula <jani.nikula@xxxxxxxxxxxxxxx>
> Cc: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx>
> Bug: https://gitlab.freedesktop.org/drm/intel/-/issues/8062
> Fixes: ee892ea83d99 ("drm/i915/hwmon: Enable PL1 power limit")
> Signed-off-by: Ashutosh Dixit <ashutosh.dixit@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/i915_hwmon.c | 5 -----
> 1 file changed, 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_hwmon.c b/drivers/gpu/drm/i915/i915_hwmon.c
> index ee63a8fd88fc1..596dd2c070106 100644
> --- a/drivers/gpu/drm/i915/i915_hwmon.c
> +++ b/drivers/gpu/drm/i915/i915_hwmon.c
> @@ -688,11 +688,6 @@ hwm_get_preregistration_info(struct drm_i915_private *i915)
> for_each_gt(gt, i915, i)
> hwm_energy(&hwmon->ddat_gt[i], &energy);
> }
> -
> - /* Enable PL1 power limit */
> - if (i915_mmio_reg_valid(hwmon->rg.pkg_rapl_limit))
> - hwm_locked_with_pm_intel_uncore_rmw(ddat, hwmon->rg.pkg_rapl_limit,
> - PKG_PWR_LIM_1_EN, PKG_PWR_LIM_1_EN);
> }
>
> void i915_hwmon_register(struct drm_i915_private *i915)
--
Jani Nikula, Intel Open Source Graphics Center
