intel-gfx.lists.freedesktop.org archive mirror
 help / color / mirror / Atom feed
* [Intel-gfx] [PATCH] Revert "drm/i915/hwmon: Enable PL1 power limit"
@ 2023-02-08 19:03 Ashutosh Dixit
  2023-02-08 20:08 ` Rodrigo Vivi
                   ` (2 more replies)
  0 siblings, 3 replies; 9+ messages in thread
From: Ashutosh Dixit @ 2023-02-08 19:03 UTC (permalink / raw)
  To: intel-gfx; +Cc: 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] 9+ messages in thread

* Re: [Intel-gfx] [PATCH] Revert "drm/i915/hwmon: Enable PL1 power limit"
  2023-02-08 19:03 [Intel-gfx] [PATCH] Revert "drm/i915/hwmon: Enable PL1 power limit" Ashutosh Dixit
@ 2023-02-08 20:08 ` Rodrigo Vivi
  2023-02-15 15:37   ` Jani Nikula
  2023-02-08 21:52 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for Revert "drm/i915/hwmon: Enable PL1 power limit" Patchwork
  2023-02-08 22:17 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork
  2 siblings, 1 reply; 9+ messages in thread
From: Rodrigo Vivi @ 2023-02-08 20:08 UTC (permalink / raw)
  To: Ashutosh Dixit; +Cc: intel-gfx, Matthew Auld, dri-devel

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] 9+ messages in thread

* [Intel-gfx] ✗ Fi.CI.SPARSE: warning for Revert "drm/i915/hwmon: Enable PL1 power limit"
  2023-02-08 19:03 [Intel-gfx] [PATCH] Revert "drm/i915/hwmon: Enable PL1 power limit" Ashutosh Dixit
  2023-02-08 20:08 ` Rodrigo Vivi
@ 2023-02-08 21:52 ` Patchwork
  2023-02-08 22:17 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork
  2 siblings, 0 replies; 9+ messages in thread
From: Patchwork @ 2023-02-08 21:52 UTC (permalink / raw)
  To: Ashutosh Dixit; +Cc: intel-gfx

== Series Details ==

Series: Revert "drm/i915/hwmon: Enable PL1 power limit"
URL   : https://patchwork.freedesktop.org/series/113793/
State : warning

== Summary ==

Error: dim sparse failed
Sparse version: v0.6.2



^ permalink raw reply	[flat|nested] 9+ messages in thread

* [Intel-gfx] ✗ Fi.CI.BAT: failure for Revert "drm/i915/hwmon: Enable PL1 power limit"
  2023-02-08 19:03 [Intel-gfx] [PATCH] Revert "drm/i915/hwmon: Enable PL1 power limit" Ashutosh Dixit
  2023-02-08 20:08 ` Rodrigo Vivi
  2023-02-08 21:52 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for Revert "drm/i915/hwmon: Enable PL1 power limit" Patchwork
@ 2023-02-08 22:17 ` Patchwork
  2 siblings, 0 replies; 9+ messages in thread
From: Patchwork @ 2023-02-08 22:17 UTC (permalink / raw)
  To: Ashutosh Dixit; +Cc: intel-gfx

[-- Attachment #1: Type: text/plain, Size: 5595 bytes --]

== Series Details ==

Series: Revert "drm/i915/hwmon: Enable PL1 power limit"
URL   : https://patchwork.freedesktop.org/series/113793/
State : failure

== Summary ==

CI Bug Log - changes from CI_DRM_12716 -> Patchwork_113793v1
====================================================

Summary
-------

  **FAILURE**

  Serious unknown changes coming with Patchwork_113793v1 absolutely need to be
  verified manually.
  
  If you think the reported changes have nothing to do with the changes
  introduced in Patchwork_113793v1, please notify your bug team to allow them
  to document this new failure mode, which will reduce false positives in CI.

  External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113793v1/index.html

Participating hosts (36 -> 35)
------------------------------

  Missing    (1): fi-snb-2520m 

Possible new issues
-------------------

  Here are the unknown changes that may have been introduced in Patchwork_113793v1:

### IGT changes ###

#### Possible regressions ####

  * igt@i915_suspend@basic-s2idle-without-i915:
    - fi-rkl-11600:       [PASS][1] -> [ABORT][2]
   [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12716/fi-rkl-11600/igt@i915_suspend@basic-s2idle-without-i915.html
   [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113793v1/fi-rkl-11600/igt@i915_suspend@basic-s2idle-without-i915.html

  
Known issues
------------

  Here are the changes found in Patchwork_113793v1 that come from known issues:

### IGT changes ###

#### Issues hit ####

  * igt@gem_exec_gttfill@basic:
    - fi-pnv-d510:        [PASS][3] -> [FAIL][4] ([i915#7229])
   [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12716/fi-pnv-d510/igt@gem_exec_gttfill@basic.html
   [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113793v1/fi-pnv-d510/igt@gem_exec_gttfill@basic.html

  
#### Possible fixes ####

  * igt@gem_exec_suspend@basic-s0@smem:
    - {bat-rpls-1}:       [ABORT][5] ([i915#5251] / [i915#6311] / [i915#7359]) -> [PASS][6]
   [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12716/bat-rpls-1/igt@gem_exec_suspend@basic-s0@smem.html
   [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113793v1/bat-rpls-1/igt@gem_exec_suspend@basic-s0@smem.html

  * igt@i915_selftest@live@gt_heartbeat:
    - fi-glk-j4005:       [DMESG-FAIL][7] ([i915#5334]) -> [PASS][8]
   [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12716/fi-glk-j4005/igt@i915_selftest@live@gt_heartbeat.html
   [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113793v1/fi-glk-j4005/igt@i915_selftest@live@gt_heartbeat.html

  * igt@i915_selftest@live@migrate:
    - {bat-adlp-6}:       [DMESG-FAIL][9] ([i915#7699]) -> [PASS][10]
   [9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12716/bat-adlp-6/igt@i915_selftest@live@migrate.html
   [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113793v1/bat-adlp-6/igt@i915_selftest@live@migrate.html

  * igt@i915_selftest@live@requests:
    - {bat-rpls-2}:       [ABORT][11] ([i915#7982]) -> [PASS][12]
   [11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12716/bat-rpls-2/igt@i915_selftest@live@requests.html
   [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113793v1/bat-rpls-2/igt@i915_selftest@live@requests.html

  * igt@kms_flip@basic-flip-vs-wf_vblank@b-vga1:
    - fi-pnv-d510:        [FAIL][13] ([i915#2122]) -> [PASS][14]
   [13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12716/fi-pnv-d510/igt@kms_flip@basic-flip-vs-wf_vblank@b-vga1.html
   [14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113793v1/fi-pnv-d510/igt@kms_flip@basic-flip-vs-wf_vblank@b-vga1.html

  
  {name}: This element is suppressed. This means it is ignored when computing
          the status of the difference (SUCCESS, WARNING, or FAILURE).

  [i915#1845]: https://gitlab.freedesktop.org/drm/intel/issues/1845
  [i915#2122]: https://gitlab.freedesktop.org/drm/intel/issues/2122
  [i915#4258]: https://gitlab.freedesktop.org/drm/intel/issues/4258
  [i915#4983]: https://gitlab.freedesktop.org/drm/intel/issues/4983
  [i915#5251]: https://gitlab.freedesktop.org/drm/intel/issues/5251
  [i915#5334]: https://gitlab.freedesktop.org/drm/intel/issues/5334
  [i915#5354]: https://gitlab.freedesktop.org/drm/intel/issues/5354
  [i915#6311]: https://gitlab.freedesktop.org/drm/intel/issues/6311
  [i915#6367]: https://gitlab.freedesktop.org/drm/intel/issues/6367
  [i915#6687]: https://gitlab.freedesktop.org/drm/intel/issues/6687
  [i915#7229]: https://gitlab.freedesktop.org/drm/intel/issues/7229
  [i915#7359]: https://gitlab.freedesktop.org/drm/intel/issues/7359
  [i915#7609]: https://gitlab.freedesktop.org/drm/intel/issues/7609
  [i915#7699]: https://gitlab.freedesktop.org/drm/intel/issues/7699
  [i915#7828]: https://gitlab.freedesktop.org/drm/intel/issues/7828
  [i915#7913]: https://gitlab.freedesktop.org/drm/intel/issues/7913
  [i915#7978]: https://gitlab.freedesktop.org/drm/intel/issues/7978
  [i915#7982]: https://gitlab.freedesktop.org/drm/intel/issues/7982
  [i915#7996]: https://gitlab.freedesktop.org/drm/intel/issues/7996


Build changes
-------------

  * Linux: CI_DRM_12716 -> Patchwork_113793v1

  CI-20190529: 20190529
  CI_DRM_12716: c1d382b53c093bd2aa035e962bfc081711f056b3 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_7153: f47f859f13376958a2bd199423b1f0ff53dddbe0 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
  Patchwork_113793v1: c1d382b53c093bd2aa035e962bfc081711f056b3 @ git://anongit.freedesktop.org/gfx-ci/linux


### Linux commits

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113793v1/index.html

[-- Attachment #2: Type: text/html, Size: 5632 bytes --]

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [Intel-gfx] [PATCH] Revert "drm/i915/hwmon: Enable PL1 power limit"
  2023-02-08 20:08 ` Rodrigo Vivi
@ 2023-02-15 15:37   ` Jani Nikula
  2023-02-15 16:24     ` Dixit, Ashutosh
  0 siblings, 1 reply; 9+ messages in thread
From: Jani Nikula @ 2023-02-15 15:37 UTC (permalink / raw)
  To: Rodrigo Vivi, Ashutosh Dixit; +Cc: intel-gfx, Matthew Auld, dri-devel

On Wed, 08 Feb 2023, Rodrigo Vivi <rodrigo.vivi@intel.com> wrote:
> 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.

Please always add Fixes: tags also to reverts.

I suppose we should fix dim to also detect reverts, but I ended up
cherry-picking and pushing the original commit out to
drm-intel-next-fixes before realizing it's been reverted.


BR,
Jani.


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

-- 
Jani Nikula, Intel Open Source Graphics Center

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [Intel-gfx] [PATCH] Revert "drm/i915/hwmon: Enable PL1 power limit"
  2023-02-15 15:37   ` Jani Nikula
@ 2023-02-15 16:24     ` Dixit, Ashutosh
  2023-02-15 17:19       ` Rodrigo Vivi
  0 siblings, 1 reply; 9+ messages in thread
From: Dixit, Ashutosh @ 2023-02-15 16:24 UTC (permalink / raw)
  To: Jani Nikula; +Cc: intel-gfx, Matthew Auld, dri-devel, Rodrigo Vivi

On Wed, 15 Feb 2023 07:37:30 -0800, Jani Nikula wrote:
>
> On Wed, 08 Feb 2023, Rodrigo Vivi <rodrigo.vivi@intel.com> wrote:
> > 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.
>
> Please always add Fixes: tags also to reverts.
>
> I suppose we should fix dim to also detect reverts, but I ended up
> cherry-picking and pushing the original commit out to
> drm-intel-next-fixes before realizing it's been reverted.

Oops, sorry!

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [Intel-gfx] [PATCH] Revert "drm/i915/hwmon: Enable PL1 power limit"
  2023-02-15 16:24     ` Dixit, Ashutosh
@ 2023-02-15 17:19       ` Rodrigo Vivi
  2023-03-18  3:28         ` [Intel-gfx] Reverted patch reappears! Dixit, Ashutosh
  0 siblings, 1 reply; 9+ messages in thread
From: Rodrigo Vivi @ 2023-02-15 17:19 UTC (permalink / raw)
  To: Dixit, Ashutosh; +Cc: dri-devel, intel-gfx, Matthew Auld

On Wed, Feb 15, 2023 at 08:24:51AM -0800, Dixit, Ashutosh wrote:
> On Wed, 15 Feb 2023 07:37:30 -0800, Jani Nikula wrote:
> >
> > On Wed, 08 Feb 2023, Rodrigo Vivi <rodrigo.vivi@intel.com> wrote:
> > > 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.
> >
> > Please always add Fixes: tags also to reverts.
> >
> > I suppose we should fix dim to also detect reverts, but I ended up
> > cherry-picking and pushing the original commit out to
> > drm-intel-next-fixes before realizing it's been reverted.
> 
> Oops, sorry!

That's my mistake. I should had thought about this when pushing
and removing from the fixes. I just realized yet, when this patch
showed up in my -fixes cherry-pick again, but without the revert.

I'm sorry.

^ permalink raw reply	[flat|nested] 9+ messages in thread

* [Intel-gfx] Reverted patch reappears!
  2023-02-15 17:19       ` Rodrigo Vivi
@ 2023-03-18  3:28         ` Dixit, Ashutosh
  2023-03-18 15:10           ` Dixit, Ashutosh
  0 siblings, 1 reply; 9+ messages in thread
From: Dixit, Ashutosh @ 2023-03-18  3:28 UTC (permalink / raw)
  To: Jani Nikula, Rodrigo Vivi; +Cc: intel-gfx, dri-devel

Jani/Rodrigo,

Original Subject: Re: [Intel-gfx] [PATCH] Revert "drm/i915/hwmon: Enable PL1 power limit"

On Wed, 15 Feb 2023 09:19:07 -0800, Rodrigo Vivi wrote:
>
> On Wed, Feb 15, 2023 at 08:24:51AM -0800, Dixit, Ashutosh wrote:
> > On Wed, 15 Feb 2023 07:37:30 -0800, Jani Nikula wrote:
> > >
> > > On Wed, 08 Feb 2023, Rodrigo Vivi <rodrigo.vivi@intel.com> wrote:
> > > > 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.
> > >
> > > Please always add Fixes: tags also to reverts.
> > >
> > > I suppose we should fix dim to also detect reverts, but I ended up
> > > cherry-picking and pushing the original commit out to
> > > drm-intel-next-fixes before realizing it's been reverted.
> >
> > Oops, sorry!
>
> That's my mistake. I should had thought about this when pushing
> and removing from the fixes. I just realized yet, when this patch
> showed up in my -fixes cherry-pick again, but without the revert.
>
> I'm sorry.

Not sure if it's related to this, but the reverted patch below has
reappeared on drm-tip. Newest on top:

ee892ea83d996 drm/i915/hwmon: Enable PL1 power limit
05d5562e401eb Revert "drm/i915/hwmon: Enable PL1 power limit"
0349c41b05968 drm/i915/hwmon: Enable PL1 power limit

The new patch is:

commit ee892ea83d99610fa33bea612de058e0955eec3a
Author:     Ashutosh Dixit <ashutosh.dixit@intel.com>
AuthorDate: Fri Feb 3 07:53:09 2023 -0800
Commit:     Jani Nikula <jani.nikula@intel.com>
CommitDate: Mon Mar 13 11:38:05 2023 +0200

    drm/i915/hwmon: Enable PL1 power limit

Sorry I couldn't track which branch did this new patch come from (looks
like drm-tip itself?).

This is breaking ATSM again:

https://intel-gfx-ci.01.org/tree/drm-tip/bat-atsm-1.html

so needs to be reverted again and stay reverted. I could send a revert or
any of you can also do it.

Thanks.
--
Ashutosh

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [Intel-gfx] Reverted patch reappears!
  2023-03-18  3:28         ` [Intel-gfx] Reverted patch reappears! Dixit, Ashutosh
@ 2023-03-18 15:10           ` Dixit, Ashutosh
  0 siblings, 0 replies; 9+ messages in thread
From: Dixit, Ashutosh @ 2023-03-18 15:10 UTC (permalink / raw)
  To: Jani Nikula, Rodrigo Vivi; +Cc: intel-gfx, dri-devel

On Fri, 17 Mar 2023 20:28:58 -0700, Dixit, Ashutosh wrote:
>
> Jani/Rodrigo,
>
> Original Subject: Re: [Intel-gfx] [PATCH] Revert "drm/i915/hwmon: Enable PL1 power limit"
>
> On Wed, 15 Feb 2023 09:19:07 -0800, Rodrigo Vivi wrote:
> >
> > On Wed, Feb 15, 2023 at 08:24:51AM -0800, Dixit, Ashutosh wrote:
> > > On Wed, 15 Feb 2023 07:37:30 -0800, Jani Nikula wrote:
> > > >
> > > > On Wed, 08 Feb 2023, Rodrigo Vivi <rodrigo.vivi@intel.com> wrote:
> > > > > 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.
> > > >
> > > > Please always add Fixes: tags also to reverts.
> > > >
> > > > I suppose we should fix dim to also detect reverts, but I ended up
> > > > cherry-picking and pushing the original commit out to
> > > > drm-intel-next-fixes before realizing it's been reverted.
> > >
> > > Oops, sorry!
> >
> > That's my mistake. I should had thought about this when pushing
> > and removing from the fixes. I just realized yet, when this patch
> > showed up in my -fixes cherry-pick again, but without the revert.
> >
> > I'm sorry.
>
> Not sure if it's related to this, but the reverted patch below has
> reappeared on drm-tip. Newest on top:
>
> ee892ea83d996 drm/i915/hwmon: Enable PL1 power limit
> 05d5562e401eb Revert "drm/i915/hwmon: Enable PL1 power limit"
> 0349c41b05968 drm/i915/hwmon: Enable PL1 power limit
>
> The new patch is:
>
> commit ee892ea83d99610fa33bea612de058e0955eec3a
> Author:     Ashutosh Dixit <ashutosh.dixit@intel.com>
> AuthorDate: Fri Feb 3 07:53:09 2023 -0800
> Commit:     Jani Nikula <jani.nikula@intel.com>
> CommitDate: Mon Mar 13 11:38:05 2023 +0200
>
>     drm/i915/hwmon: Enable PL1 power limit
>
> Sorry I couldn't track which branch did this new patch come from (looks
> like drm-tip itself?).
>
> This is breaking ATSM again:
>
> https://intel-gfx-ci.01.org/tree/drm-tip/bat-atsm-1.html
>
> so needs to be reverted again and stay reverted. I could send a revert or
> any of you can also do it.

I have sent out the revert of ee892ea83d996:

https://patchwork.freedesktop.org/series/113793/

ee892ea83d996 is also present in Linus' tree (in v6.3-rc2) so will need to
be reverted there too. The previous two commits (the original commit and
its revert) are not present in Linus' tree, at least yet.

Thanks.
--
Ashutosh

^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2023-03-18 15:10 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-02-08 19:03 [Intel-gfx] [PATCH] Revert "drm/i915/hwmon: Enable PL1 power limit" Ashutosh Dixit
2023-02-08 20:08 ` Rodrigo Vivi
2023-02-15 15:37   ` Jani Nikula
2023-02-15 16:24     ` Dixit, Ashutosh
2023-02-15 17:19       ` Rodrigo Vivi
2023-03-18  3:28         ` [Intel-gfx] Reverted patch reappears! Dixit, Ashutosh
2023-03-18 15:10           ` Dixit, Ashutosh
2023-02-08 21:52 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for Revert "drm/i915/hwmon: Enable PL1 power limit" Patchwork
2023-02-08 22:17 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork

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