* [PATCH] Revert "drm/i915/hwmon: Enable PL1 power limit"
@ 2023-03-19 14:03 Ashutosh Dixit
2023-03-20 10:35 ` Jani Nikula
0 siblings, 1 reply; 5+ messages in thread
From: Ashutosh Dixit @ 2023-03-19 14:03 UTC (permalink / raw)
To: intel-gfx; +Cc: stable, dri-devel, Rodrigo Vivi
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.
Cc: <stable@vger.kernel.org> # v6.2+
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
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@intel.com>
---
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)
--
2.38.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] Revert "drm/i915/hwmon: Enable PL1 power limit"
2023-03-19 14:03 [PATCH] Revert "drm/i915/hwmon: Enable PL1 power limit" Ashutosh Dixit
@ 2023-03-20 10:35 ` Jani Nikula
0 siblings, 0 replies; 5+ messages in thread
From: Jani Nikula @ 2023-03-20 10:35 UTC (permalink / raw)
To: Ashutosh Dixit, intel-gfx; +Cc: dri-devel, Rodrigo Vivi
On Sun, 19 Mar 2023, Ashutosh Dixit <ashutosh.dixit@intel.com> 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@vger.kernel.org> # v6.2+
> Cc: Jani Nikula <jani.nikula@linux.intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> 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@intel.com>
> ---
> 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
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] Revert "drm/i915/hwmon: Enable PL1 power limit"
@ 2023-03-18 14:59 Ashutosh Dixit
0 siblings, 0 replies; 5+ messages in thread
From: Ashutosh Dixit @ 2023-03-18 14:59 UTC (permalink / raw)
To: intel-gfx; +Cc: dri-devel, Rodrigo Vivi
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.
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
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@intel.com>
---
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)
--
2.38.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] Revert "drm/i915/hwmon: Enable PL1 power limit"
2023-02-08 19:03 Ashutosh Dixit
@ 2023-02-08 20:08 ` Rodrigo Vivi
0 siblings, 0 replies; 5+ messages in thread
From: Rodrigo Vivi @ 2023-02-08 20:08 UTC (permalink / raw)
To: Ashutosh Dixit; +Cc: intel-gfx, Matthew Auld, dri-devel, gwan-gyeong.mun
On Wed, Feb 08, 2023 at 11:03:12AM -0800, Ashutosh Dixit wrote:
> This reverts commit 0349c41b05968befaffa5fbb7e73d0ee6004f610.
>
> 0349c41b0596 ("drm/i915/hwmon: Enable PL1 power limit") is incorrect and
> caused a major regression on ATSM. The change enabled the PL1 power limit
> but FW sets the default value of the PL1 limit to 0 which implies HW now
> works at minimum power and therefore the lowest effective frequency. This
> means all workloads now run slower resulting in even GuC FW load operations
> timing out, rendering ATSM unusable.
>
> A different solution to the original issue of the PL1 limit being disabled
> on ATSM is needed but till that is developed, revert 0349c41b0596.
>
> Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/8062
pushed to drm-intel-next and removed from drm-intel-fixes.
Thanks for the quick reaction.
> Signed-off-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
> ---
> 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 4683a5b96eff1..1225bc432f0d5 100644
> --- a/drivers/gpu/drm/i915/i915_hwmon.c
> +++ b/drivers/gpu/drm/i915/i915_hwmon.c
> @@ -687,11 +687,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)
> --
> 2.38.0
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] Revert "drm/i915/hwmon: Enable PL1 power limit"
@ 2023-02-08 19:03 Ashutosh Dixit
2023-02-08 20:08 ` Rodrigo Vivi
0 siblings, 1 reply; 5+ messages in thread
From: Ashutosh Dixit @ 2023-02-08 19:03 UTC (permalink / raw)
To: intel-gfx; +Cc: gwan-gyeong.mun, Matthew Auld, dri-devel, Rodrigo Vivi
This reverts commit 0349c41b05968befaffa5fbb7e73d0ee6004f610.
0349c41b0596 ("drm/i915/hwmon: Enable PL1 power limit") is incorrect and
caused a major regression on ATSM. The change enabled the PL1 power limit
but FW sets the default value of the PL1 limit to 0 which implies HW now
works at minimum power and therefore the lowest effective frequency. This
means all workloads now run slower resulting in even GuC FW load operations
timing out, rendering ATSM unusable.
A different solution to the original issue of the PL1 limit being disabled
on ATSM is needed but till that is developed, revert 0349c41b0596.
Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/8062
Signed-off-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
---
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 4683a5b96eff1..1225bc432f0d5 100644
--- a/drivers/gpu/drm/i915/i915_hwmon.c
+++ b/drivers/gpu/drm/i915/i915_hwmon.c
@@ -687,11 +687,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)
--
2.38.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-03-20 10:35 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-03-19 14:03 [PATCH] Revert "drm/i915/hwmon: Enable PL1 power limit" Ashutosh Dixit
2023-03-20 10:35 ` Jani Nikula
-- strict thread matches above, loose matches on Subject: below --
2023-03-18 14:59 Ashutosh Dixit
2023-02-08 19:03 Ashutosh Dixit
2023-02-08 20:08 ` Rodrigo Vivi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).