All of lore.kernel.org
 help / color / mirror / Atom feed
* [Intel-gfx] [PATCH 1/2] drm/i915: Don't try to disable host RPS when this was never enabled.
@ 2022-09-02  9:51 Rodrigo Vivi
  2022-09-02  9:51 ` [Intel-gfx] [PATCH 2/2] drm/i915: Let's avoid even early init if SLPC is used Rodrigo Vivi
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Rodrigo Vivi @ 2022-09-02  9:51 UTC (permalink / raw)
  To: intel-gfx; +Cc: Rodrigo Vivi

Specially in GT reset case this could be triggered and try
to disable things that had never been enabled. Let's add
some protection here.

Cc: Ashutosh Dixit <ashutosh.dixit@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
---
 drivers/gpu/drm/i915/gt/intel_rps.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/gpu/drm/i915/gt/intel_rps.c b/drivers/gpu/drm/i915/gt/intel_rps.c
index 579ae9ac089c..6fadde4ee7bf 100644
--- a/drivers/gpu/drm/i915/gt/intel_rps.c
+++ b/drivers/gpu/drm/i915/gt/intel_rps.c
@@ -1551,6 +1551,9 @@ void intel_rps_disable(struct intel_rps *rps)
 {
 	struct drm_i915_private *i915 = rps_to_i915(rps);
 
+	if (!intel_rps_is_enabled(rps))
+		return;
+
 	intel_rps_clear_enabled(rps);
 	intel_rps_clear_interrupts(rps);
 	intel_rps_clear_timer(rps);
-- 
2.37.2


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

* [Intel-gfx] [PATCH 2/2] drm/i915: Let's avoid even early init if SLPC is used.
  2022-09-02  9:51 [Intel-gfx] [PATCH 1/2] drm/i915: Don't try to disable host RPS when this was never enabled Rodrigo Vivi
@ 2022-09-02  9:51 ` Rodrigo Vivi
  2022-09-02 14:16   ` Dixit, Ashutosh
  2022-09-02 10:20 ` [Intel-gfx] ✗ Fi.CI.BAT: failure for series starting with [1/2] drm/i915: Don't try to disable host RPS when this was never enabled Patchwork
  2022-09-02 10:48 ` [Intel-gfx] [PATCH 1/2] " Das, Nirmoy
  2 siblings, 1 reply; 6+ messages in thread
From: Rodrigo Vivi @ 2022-09-02  9:51 UTC (permalink / raw)
  To: intel-gfx; +Cc: Rodrigo Vivi

SLPC has its own waiboost variables and lock mechanism.
No need for these extra stuff, in special no need for the
timer.

Cc: Ashutosh Dixit <ashutosh.dixit@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
 drivers/gpu/drm/i915/gt/intel_rps.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/gpu/drm/i915/gt/intel_rps.c b/drivers/gpu/drm/i915/gt/intel_rps.c
index 6fadde4ee7bf..c29652281f2e 100644
--- a/drivers/gpu/drm/i915/gt/intel_rps.c
+++ b/drivers/gpu/drm/i915/gt/intel_rps.c
@@ -1960,6 +1960,9 @@ void gen5_rps_irq_handler(struct intel_rps *rps)
 
 void intel_rps_init_early(struct intel_rps *rps)
 {
+	if (rps_uses_slpc(rps))
+		return;
+
 	mutex_init(&rps->lock);
 	mutex_init(&rps->power.mutex);
 
-- 
2.37.2


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

* [Intel-gfx] ✗ Fi.CI.BAT: failure for series starting with [1/2] drm/i915: Don't try to disable host RPS when this was never enabled.
  2022-09-02  9:51 [Intel-gfx] [PATCH 1/2] drm/i915: Don't try to disable host RPS when this was never enabled Rodrigo Vivi
  2022-09-02  9:51 ` [Intel-gfx] [PATCH 2/2] drm/i915: Let's avoid even early init if SLPC is used Rodrigo Vivi
@ 2022-09-02 10:20 ` Patchwork
  2022-09-02 10:48 ` [Intel-gfx] [PATCH 1/2] " Das, Nirmoy
  2 siblings, 0 replies; 6+ messages in thread
From: Patchwork @ 2022-09-02 10:20 UTC (permalink / raw)
  To: Vivi, Rodrigo; +Cc: intel-gfx

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

== Series Details ==

Series: series starting with [1/2] drm/i915: Don't try to disable host RPS when this was never enabled.
URL   : https://patchwork.freedesktop.org/series/108075/
State : failure

== Summary ==

CI Bug Log - changes from CI_DRM_12064 -> Patchwork_108075v1
====================================================

Summary
-------

  **FAILURE**

  Serious unknown changes coming with Patchwork_108075v1 absolutely need to be
  verified manually.
  
  If you think the reported changes have nothing to do with the changes
  introduced in Patchwork_108075v1, 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_108075v1/index.html

Participating hosts (32 -> 32)
------------------------------

  Additional (2): fi-rkl-11600 bat-dg1-5 
  Missing    (2): fi-bdw-samus bat-jsl-3 

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

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

### IGT changes ###

#### Possible regressions ####

  * igt@i915_module_load@load:
    - bat-dg1-5:          NOTRUN -> [INCOMPLETE][1]
   [1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108075v1/bat-dg1-5/igt@i915_module_load@load.html
    - fi-rkl-guc:         [PASS][2] -> [INCOMPLETE][3]
   [2]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12064/fi-rkl-guc/igt@i915_module_load@load.html
   [3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108075v1/fi-rkl-guc/igt@i915_module_load@load.html
    - fi-cfl-guc:         [PASS][4] -> [INCOMPLETE][5]
   [4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12064/fi-cfl-guc/igt@i915_module_load@load.html
   [5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108075v1/fi-cfl-guc/igt@i915_module_load@load.html

  
#### Suppressed ####

  The following results come from untrusted machines, tests, or statuses.
  They do not affect the overall result.

  * igt@i915_module_load@load:
    - {bat-rpls-1}:       [PASS][6] -> [INCOMPLETE][7]
   [6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12064/bat-rpls-1/igt@i915_module_load@load.html
   [7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108075v1/bat-rpls-1/igt@i915_module_load@load.html
    - {bat-dg2-11}:       [PASS][8] -> [INCOMPLETE][9]
   [8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12064/bat-dg2-11/igt@i915_module_load@load.html
   [9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108075v1/bat-dg2-11/igt@i915_module_load@load.html
    - {bat-adln-1}:       [PASS][10] -> [INCOMPLETE][11]
   [10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12064/bat-adln-1/igt@i915_module_load@load.html
   [11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108075v1/bat-adln-1/igt@i915_module_load@load.html
    - {bat-dg2-9}:        [PASS][12] -> [INCOMPLETE][13]
   [12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12064/bat-dg2-9/igt@i915_module_load@load.html
   [13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108075v1/bat-dg2-9/igt@i915_module_load@load.html
    - {bat-dg2-8}:        [PASS][14] -> [INCOMPLETE][15]
   [14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12064/bat-dg2-8/igt@i915_module_load@load.html
   [15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108075v1/bat-dg2-8/igt@i915_module_load@load.html

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

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

### IGT changes ###

#### Issues hit ####

  * igt@gem_huc_copy@huc-copy:
    - fi-rkl-11600:       NOTRUN -> [SKIP][16] ([i915#2190])
   [16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108075v1/fi-rkl-11600/igt@gem_huc_copy@huc-copy.html

  * igt@gem_lmem_swapping@parallel-random-engines:
    - fi-rkl-11600:       NOTRUN -> [SKIP][17] ([i915#4613]) +3 similar issues
   [17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108075v1/fi-rkl-11600/igt@gem_lmem_swapping@parallel-random-engines.html

  * igt@gem_tiled_pread_basic:
    - fi-rkl-11600:       NOTRUN -> [SKIP][18] ([i915#3282])
   [18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108075v1/fi-rkl-11600/igt@gem_tiled_pread_basic.html

  * igt@i915_module_load@load:
    - fi-bdw-gvtdvm:      [PASS][19] -> [DMESG-WARN][20] ([i915#6540])
   [19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12064/fi-bdw-gvtdvm/igt@i915_module_load@load.html
   [20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108075v1/fi-bdw-gvtdvm/igt@i915_module_load@load.html

  * igt@i915_pm_backlight@basic-brightness:
    - fi-rkl-11600:       NOTRUN -> [SKIP][21] ([i915#3012])
   [21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108075v1/fi-rkl-11600/igt@i915_pm_backlight@basic-brightness.html

  * igt@i915_selftest@live@gem:
    - fi-pnv-d510:        NOTRUN -> [DMESG-FAIL][22] ([i915#4528])
   [22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108075v1/fi-pnv-d510/igt@i915_selftest@live@gem.html

  * igt@i915_suspend@basic-s3-without-i915:
    - fi-rkl-11600:       NOTRUN -> [INCOMPLETE][23] ([i915#5982])
   [23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108075v1/fi-rkl-11600/igt@i915_suspend@basic-s3-without-i915.html

  * igt@kms_chamelium@hdmi-hpd-fast:
    - fi-rkl-11600:       NOTRUN -> [SKIP][24] ([fdo#111827]) +7 similar issues
   [24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108075v1/fi-rkl-11600/igt@kms_chamelium@hdmi-hpd-fast.html

  * igt@kms_cursor_legacy@basic-busy-flip-before-cursor:
    - fi-rkl-11600:       NOTRUN -> [SKIP][25] ([i915#4103])
   [25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108075v1/fi-rkl-11600/igt@kms_cursor_legacy@basic-busy-flip-before-cursor.html

  * igt@kms_force_connector_basic@force-connector-state:
    - fi-bdw-gvtdvm:      [PASS][26] -> [DMESG-WARN][27] ([i915#5922])
   [26]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12064/fi-bdw-gvtdvm/igt@kms_force_connector_basic@force-connector-state.html
   [27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108075v1/fi-bdw-gvtdvm/igt@kms_force_connector_basic@force-connector-state.html

  * igt@kms_force_connector_basic@force-load-detect:
    - fi-rkl-11600:       NOTRUN -> [SKIP][28] ([fdo#109285] / [i915#4098])
   [28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108075v1/fi-rkl-11600/igt@kms_force_connector_basic@force-load-detect.html

  * igt@kms_pipe_crc_basic@suspend-read-crc:
    - fi-ivb-3770:        NOTRUN -> [SKIP][29] ([fdo#109271])
   [29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108075v1/fi-ivb-3770/igt@kms_pipe_crc_basic@suspend-read-crc.html

  * igt@kms_psr@sprite_plane_onoff:
    - fi-rkl-11600:       NOTRUN -> [SKIP][30] ([i915#1072]) +3 similar issues
   [30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108075v1/fi-rkl-11600/igt@kms_psr@sprite_plane_onoff.html

  * igt@kms_setmode@basic-clone-single-crtc:
    - fi-rkl-11600:       NOTRUN -> [SKIP][31] ([i915#3555] / [i915#4098])
   [31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108075v1/fi-rkl-11600/igt@kms_setmode@basic-clone-single-crtc.html

  * igt@prime_vgem@basic-read:
    - fi-rkl-11600:       NOTRUN -> [SKIP][32] ([fdo#109295] / [i915#3291] / [i915#3708]) +2 similar issues
   [32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108075v1/fi-rkl-11600/igt@prime_vgem@basic-read.html

  * igt@prime_vgem@basic-userptr:
    - fi-rkl-11600:       NOTRUN -> [SKIP][33] ([fdo#109295] / [i915#3301] / [i915#3708])
   [33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108075v1/fi-rkl-11600/igt@prime_vgem@basic-userptr.html

  * igt@runner@aborted:
    - bat-dg1-5:          NOTRUN -> [FAIL][34] ([i915#4312])
   [34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108075v1/bat-dg1-5/igt@runner@aborted.html
    - fi-rkl-guc:         NOTRUN -> [FAIL][35] ([i915#4312] / [i915#6599])
   [35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108075v1/fi-rkl-guc/igt@runner@aborted.html
    - fi-bdw-gvtdvm:      NOTRUN -> [FAIL][36] ([i915#4312])
   [36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108075v1/fi-bdw-gvtdvm/igt@runner@aborted.html
    - fi-cfl-guc:         NOTRUN -> [FAIL][37] ([i915#4312] / [i915#6599])
   [37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108075v1/fi-cfl-guc/igt@runner@aborted.html

  
#### Possible fixes ####

  * igt@i915_selftest@live@hangcheck:
    - {fi-jsl-1}:         [INCOMPLETE][38] ([i915#5153]) -> [PASS][39]
   [38]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12064/fi-jsl-1/igt@i915_selftest@live@hangcheck.html
   [39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108075v1/fi-jsl-1/igt@i915_selftest@live@hangcheck.html

  * igt@i915_selftest@live@requests:
    - fi-pnv-d510:        [DMESG-FAIL][40] ([i915#4528]) -> [PASS][41]
   [40]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12064/fi-pnv-d510/igt@i915_selftest@live@requests.html
   [41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108075v1/fi-pnv-d510/igt@i915_selftest@live@requests.html

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

  [fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
  [fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
  [fdo#109295]: https://bugs.freedesktop.org/show_bug.cgi?id=109295
  [fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
  [i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
  [i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
  [i915#3012]: https://gitlab.freedesktop.org/drm/intel/issues/3012
  [i915#3282]: https://gitlab.freedesktop.org/drm/intel/issues/3282
  [i915#3291]: https://gitlab.freedesktop.org/drm/intel/issues/3291
  [i915#3301]: https://gitlab.freedesktop.org/drm/intel/issues/3301
  [i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
  [i915#3708]: https://gitlab.freedesktop.org/drm/intel/issues/3708
  [i915#4098]: https://gitlab.freedesktop.org/drm/intel/issues/4098
  [i915#4103]: https://gitlab.freedesktop.org/drm/intel/issues/4103
  [i915#4312]: https://gitlab.freedesktop.org/drm/intel/issues/4312
  [i915#4528]: https://gitlab.freedesktop.org/drm/intel/issues/4528
  [i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
  [i915#5153]: https://gitlab.freedesktop.org/drm/intel/issues/5153
  [i915#5922]: https://gitlab.freedesktop.org/drm/intel/issues/5922
  [i915#5982]: https://gitlab.freedesktop.org/drm/intel/issues/5982
  [i915#6540]: https://gitlab.freedesktop.org/drm/intel/issues/6540
  [i915#6599]: https://gitlab.freedesktop.org/drm/intel/issues/6599


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

  * Linux: CI_DRM_12064 -> Patchwork_108075v1

  CI-20190529: 20190529
  CI_DRM_12064: deda08d41aef283357a629e7ddb9a7f5e3616d74 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_6642: c018ce1d1ab8e570f665cf5d58c9802a44d66cc1 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
  Patchwork_108075v1: deda08d41aef283357a629e7ddb9a7f5e3616d74 @ git://anongit.freedesktop.org/gfx-ci/linux


### Linux commits

12f36617dc93 drm/i915: Let's avoid even early init if SLPC is used.
16d7d58950ee drm/i915: Don't try to disable host RPS when this was never enabled.

== Logs ==

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

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

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

* Re: [Intel-gfx] [PATCH 1/2] drm/i915: Don't try to disable host RPS when this was never enabled.
  2022-09-02  9:51 [Intel-gfx] [PATCH 1/2] drm/i915: Don't try to disable host RPS when this was never enabled Rodrigo Vivi
  2022-09-02  9:51 ` [Intel-gfx] [PATCH 2/2] drm/i915: Let's avoid even early init if SLPC is used Rodrigo Vivi
  2022-09-02 10:20 ` [Intel-gfx] ✗ Fi.CI.BAT: failure for series starting with [1/2] drm/i915: Don't try to disable host RPS when this was never enabled Patchwork
@ 2022-09-02 10:48 ` Das, Nirmoy
  2 siblings, 0 replies; 6+ messages in thread
From: Das, Nirmoy @ 2022-09-02 10:48 UTC (permalink / raw)
  To: Rodrigo Vivi, intel-gfx

LGTM the series is:

Acked-by: Nirmoy Das <nirmoy.das@intel.com>

On 9/2/2022 11:51 AM, Rodrigo Vivi wrote:
> Specially in GT reset case this could be triggered and try
> to disable things that had never been enabled. Let's add
> some protection here.
>
> Cc: Ashutosh Dixit <ashutosh.dixit@intel.com>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Reviewed-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
> ---
>   drivers/gpu/drm/i915/gt/intel_rps.c | 3 +++
>   1 file changed, 3 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/gt/intel_rps.c b/drivers/gpu/drm/i915/gt/intel_rps.c
> index 579ae9ac089c..6fadde4ee7bf 100644
> --- a/drivers/gpu/drm/i915/gt/intel_rps.c
> +++ b/drivers/gpu/drm/i915/gt/intel_rps.c
> @@ -1551,6 +1551,9 @@ void intel_rps_disable(struct intel_rps *rps)
>   {
>   	struct drm_i915_private *i915 = rps_to_i915(rps);
>   
> +	if (!intel_rps_is_enabled(rps))
> +		return;
> +
>   	intel_rps_clear_enabled(rps);
>   	intel_rps_clear_interrupts(rps);
>   	intel_rps_clear_timer(rps);

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

* Re: [Intel-gfx] [PATCH 2/2] drm/i915: Let's avoid even early init if SLPC is used.
  2022-09-02  9:51 ` [Intel-gfx] [PATCH 2/2] drm/i915: Let's avoid even early init if SLPC is used Rodrigo Vivi
@ 2022-09-02 14:16   ` Dixit, Ashutosh
  2022-09-02 14:41     ` Vivi, Rodrigo
  0 siblings, 1 reply; 6+ messages in thread
From: Dixit, Ashutosh @ 2022-09-02 14:16 UTC (permalink / raw)
  To: Rodrigo Vivi; +Cc: intel-gfx

On Fri, 02 Sep 2022 02:51:26 -0700, Rodrigo Vivi wrote:
>
> diff --git a/drivers/gpu/drm/i915/gt/intel_rps.c b/drivers/gpu/drm/i915/gt/intel_rps.c
> index 6fadde4ee7bf..c29652281f2e 100644
> --- a/drivers/gpu/drm/i915/gt/intel_rps.c
> +++ b/drivers/gpu/drm/i915/gt/intel_rps.c
> @@ -1960,6 +1960,9 @@ void gen5_rps_irq_handler(struct intel_rps *rps)
>
>  void intel_rps_init_early(struct intel_rps *rps)
>  {
> +	if (rps_uses_slpc(rps))
> +		return;
> +

Hi Rodrigo, Let me double check with you, this works correctly at this
place, correct? Looks like things to make this work should get initialized
in intel_uc_init_early() which is called just before intel_rps_init_early()
so looks ok (can't tell for sure with all those uc macros :/):

Reviewed-by: Ashutosh Dixit <ashutosh.dixit@intel.com>

>	mutex_init(&rps->lock);
>	mutex_init(&rps->power.mutex);
>
> --
> 2.37.2
>

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

* Re: [Intel-gfx] [PATCH 2/2] drm/i915: Let's avoid even early init if SLPC is used.
  2022-09-02 14:16   ` Dixit, Ashutosh
@ 2022-09-02 14:41     ` Vivi, Rodrigo
  0 siblings, 0 replies; 6+ messages in thread
From: Vivi, Rodrigo @ 2022-09-02 14:41 UTC (permalink / raw)
  To: Dixit, Ashutosh; +Cc: intel-gfx

On Fri, 2022-09-02 at 07:16 -0700, Dixit, Ashutosh wrote:
> On Fri, 02 Sep 2022 02:51:26 -0700, Rodrigo Vivi wrote:
> > 
> > diff --git a/drivers/gpu/drm/i915/gt/intel_rps.c
> > b/drivers/gpu/drm/i915/gt/intel_rps.c
> > index 6fadde4ee7bf..c29652281f2e 100644
> > --- a/drivers/gpu/drm/i915/gt/intel_rps.c
> > +++ b/drivers/gpu/drm/i915/gt/intel_rps.c
> > @@ -1960,6 +1960,9 @@ void gen5_rps_irq_handler(struct intel_rps
> > *rps)
> > 
> >  void intel_rps_init_early(struct intel_rps *rps)
> >  {
> > +       if (rps_uses_slpc(rps))
> > +               return;
> > +
> 
> Hi Rodrigo, Let me double check with you, this works correctly at
> this
> place, correct? Looks like things to make this work should get
> initialized
> in intel_uc_init_early() which is called just before
> intel_rps_init_early()
> so looks ok (can't tell for sure with all those uc macros :/):

yeap, I hate those uc macros as well!

In theory it should work well since

@ static void __intel_gt_init_early(struct intel_gt *gt)
      intel_uc_init_early(&gt->uc);                                   
      intel_rps_init_early(&gt->rps);                                 
}                    

And it works well when slpc is enabled...
But our CI showed this is a disaster when SLPC is not used.

I will have to fix that.


> Reviewed-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
> 
> >         mutex_init(&rps->lock);
> >         mutex_init(&rps->power.mutex);
> > 
> > --
> > 2.37.2
> > 


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

end of thread, other threads:[~2022-09-02 14:41 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-02  9:51 [Intel-gfx] [PATCH 1/2] drm/i915: Don't try to disable host RPS when this was never enabled Rodrigo Vivi
2022-09-02  9:51 ` [Intel-gfx] [PATCH 2/2] drm/i915: Let's avoid even early init if SLPC is used Rodrigo Vivi
2022-09-02 14:16   ` Dixit, Ashutosh
2022-09-02 14:41     ` Vivi, Rodrigo
2022-09-02 10:20 ` [Intel-gfx] ✗ Fi.CI.BAT: failure for series starting with [1/2] drm/i915: Don't try to disable host RPS when this was never enabled Patchwork
2022-09-02 10:48 ` [Intel-gfx] [PATCH 1/2] " Das, Nirmoy

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.