Skip to contentSkip to conversation

drm/i915: Avoid setting ring freq on invalid rps freqs

PATCH In review Mika Kuoppala 3 participants 7 messages Mar 20, 2018 – Mar 23, 2018

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 drm/i915: Avoid setting ring freq on invalid rps freqs

Looping through rps frequencies when both min and max are zero ends up into an endless loop. This can happen during hardware enablement.

Bail out early if rps frequencies are not correctly set yet.

---
 drivers/gpu/drm/i915/intel_pm.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +6 -3
index dd5ddb77b306..19e82aaa9863 100644
@@ -6890,15 +6890,18 @@ static void gen6_enable_rps(struct drm_i915_private *dev_priv)
 static void gen6_update_ring_freq(struct drm_i915_private *dev_priv)
 {
 	struct intel_rps *rps = &dev_priv->gt_pm.rps;
-	int min_freq = 15;
+	const int min_freq = 15;
+	const int scaling_factor = 180;
 	unsigned int gpu_freq;
 	unsigned int max_ia_freq, min_ring_freq;
 	unsigned int max_gpu_freq, min_gpu_freq;
-	int scaling_factor = 180;
 	struct cpufreq_policy *policy;
 
 	WARN_ON(!mutex_is_locked(&dev_priv->pcu_lock));
 
+	if (rps->max_freq <= rps->min_freq)
+		return;
+
 	policy = cpufreq_cpu_get(0);
 	if (policy) {
 		max_ia_freq = policy->cpuinfo.max_freq;
@@ -6932,7 +6935,7 @@ static void gen6_update_ring_freq(struct drm_i915_private *dev_priv)
 	 * the PCU should use as a reference to determine the ring frequency.
 	 */
 	for (gpu_freq = max_gpu_freq; gpu_freq >= min_gpu_freq; gpu_freq--) {
-		int diff = max_gpu_freq - gpu_freq;
+		const int diff = max_gpu_freq - gpu_freq;
 		unsigned int ia_freq = 0, ring_freq = 0;
 
 		if (IS_GEN9_BC(dev_priv) || IS_CANNONLAKE(dev_priv)) {
Signature · 6 lines
2.14.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

PATCH 2/2 drm/i915: Warn if rps max frequency is not set

Warn on enabling rps when our hw max is invalid.

---
 drivers/gpu/drm/i915/intel_pm.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/gpu/drm/i915/intel_pm.c +2 -0
index 19e82aaa9863..bc335c52a17a 100644
@@ -8157,6 +8157,8 @@ static void intel_enable_rps(struct drm_i915_private *dev_priv)
 		intel_init_emon(dev_priv);
 	}
 
+	WARN_ON(rps->max_freq == 0);
+
 	WARN_ON(rps->max_freq < rps->min_freq);
 	WARN_ON(rps->idle_freq > rps->max_freq);
 
Signature · 6 lines
2.14.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#2 lore raw

Re: [PATCH 2/2] drm/i915: Warn if rps max frequency is not set

Quoted 13 lines · Mika Kuoppala

Warn on enabling rps when our hw max is invalid.

---
 drivers/gpu/drm/i915/intel_pm.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/gpu/drm/i915/intel_pm.c +0 -0
index 19e82aaa9863..bc335c52a17a 100644

drivers/gpu/drm/i915/intel_pm.c static void intel_enable_rps(struct drm_i915_private *dev_priv) · line 8161

Quoted 5 lines
drivers/gpu/drm/i915/intel_pm.c +2 -0
@@ -8157,6 +8157,8 @@ static void intel_enable_rps(struct drm_i915_private *dev_priv)
 		intel_init_emon(dev_priv);
 	}
 
+	WARN_ON(rps->max_freq == 0);
+

Ok, this wont fly with gen < 6
-Mika

Quoted 5 lines
drivers/gpu/drm/i915/intel_pm.c +0 -0
 	WARN_ON(rps->max_freq < rps->min_freq);
 	WARN_ON(rps->idle_freq > rps->max_freq);
 
Signature · 1 line
2.14.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#3 lore raw

Re: [PATCH 2/2] drm/i915: Warn if rps max frequency is not set

Quoting Mika Kuoppala (2018-03-20 16:28:20)

Quoted 18 lines
Quoted 16 lines · Mika Kuoppala

Warn on enabling rps when our hw max is invalid.

---
 drivers/gpu/drm/i915/intel_pm.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/gpu/drm/i915/intel_pm.c +0 -0
index 19e82aaa9863..bc335c52a17a 100644
@@ -8157,6 +8157,8 @@ static void intel_enable_rps(struct drm_i915_private *dev_priv)
              intel_init_emon(dev_priv);
      }
 
Quoted 3 lines

drivers/gpu/drm/i915/intel_pm.c static void intel_enable_rps(struct drm_i915_private *dev_priv) · line 8161

Quoted 2 lines
drivers/gpu/drm/i915/intel_pm.c +2 -0
+     WARN_ON(rps->max_freq == 0);
+

Ok, this wont fly with gen < 6

Close, we can just guard these by HAS_RPS. I think there's a series you might want to review...
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#4 lore raw

✗ Fi.CI.BAT: warning for series starting with [1/2] drm/i915: Avoid setting ring freq on invalid rps freqs

In reply to Mika Kuoppala
== Series Details ==

== Series Details ==

Series: series starting with [1/2] drm/i915: Avoid setting ring freq on invalid rps freqs
URL : https://patchwork.freedesktop.org/series/40289/
State : warning

== Summary ==

Series 40289v1 series starting with [1/2] drm/i915: Avoid setting ring freq on invalid rps freqs
https://patchwork.freedesktop.org/api/1.0/series/40289/revisions/1/mbox/

---- Possible new issues:

Test drv_hangman:

        Subgroup error-state-basic:
                pass       -> DMESG-WARN (fi-blb-e6850)
                pass       -> DMESG-WARN (fi-bwr-2160)
                pass       -> DMESG-WARN (fi-elk-e7500)
                pass       -> DMESG-WARN (fi-gdg-551)
                pass       -> DMESG-WARN (fi-ilk-650)
                pass       -> DMESG-WARN (fi-pnv-d510)
Test drv_module_reload:
        Subgroup basic-no-display:
                pass       -> DMESG-WARN (fi-blb-e6850)
                pass       -> DMESG-WARN (fi-elk-e7500)
                pass       -> DMESG-WARN (fi-gdg-551)
                pass       -> DMESG-WARN (fi-ilk-650)
                pass       -> DMESG-WARN (fi-pnv-d510)
        Subgroup basic-reload:
                pass       -> DMESG-WARN (fi-blb-e6850)
                pass       -> DMESG-WARN (fi-bwr-2160)
                pass       -> DMESG-WARN (fi-elk-e7500)
                pass       -> DMESG-WARN (fi-gdg-551)
                pass       -> DMESG-WARN (fi-ilk-650)
                pass       -> DMESG-WARN (fi-pnv-d510)
        Subgroup basic-reload-inject:
                pass       -> DMESG-WARN (fi-blb-e6850)
                pass       -> DMESG-WARN (fi-elk-e7500)
                pass       -> DMESG-WARN (fi-gdg-551)
                pass       -> DMESG-WARN (fi-ilk-650)
                pass       -> DMESG-WARN (fi-pnv-d510)
Test gem_busy:
        Subgroup basic-hang-default:
                pass       -> DMESG-WARN (fi-blb-e6850)
                pass       -> DMESG-WARN (fi-elk-e7500)
                pass       -> DMESG-WARN (fi-ilk-650)
                pass       -> DMESG-WARN (fi-pnv-d510)
Test gem_exec_fence:
        Subgroup await-hang-default:
                pass       -> DMESG-WARN (fi-blb-e6850)
                pass       -> DMESG-WARN (fi-elk-e7500)
                pass       -> DMESG-WARN (fi-ilk-650)
                pass       -> DMESG-WARN (fi-pnv-d510)
Test gem_exec_suspend:
        Subgroup basic-s3:
                pass       -> DMESG-WARN (fi-blb-e6850)
                pass       -> DMESG-WARN (fi-ilk-650)
                pass       -> DMESG-WARN (fi-pnv-d510)
        Subgroup basic-s4-devices:
                pass       -> DMESG-WARN (fi-blb-e6850)
                pass       -> DMESG-WARN (fi-ilk-650)
                pass       -> DMESG-WARN (fi-pnv-d510)
Test gem_ringfill:
        Subgroup basic-default-hang:
                pass       -> DMESG-WARN (fi-ilk-650)
Test kms_pipe_crc_basic:
        Subgroup hang-read-crc-pipe-a:
                pass       -> DMESG-WARN (fi-blb-e6850)
                pass       -> DMESG-WARN (fi-bwr-2160)
                pass       -> DMESG-WARN (fi-gdg-551)
                pass       -> DMESG-WARN (fi-ilk-650)
                pass       -> DMESG-WARN (fi-pnv-d510)
        Subgroup hang-read-crc-pipe-b:
                pass       -> DMESG-WARN (fi-blb-e6850)
                pass       -> DMESG-WARN (fi-bwr-2160)
                pass       -> DMESG-WARN (fi-gdg-551)
                pass       -> DMESG-WARN (fi-ilk-650)
                pass       -> DMESG-WARN (fi-pnv-d510)
        Subgroup suspend-read-crc-pipe-a:
                pass       -> DMESG-WARN (fi-blb-e6850)
                pass       -> DMESG-WARN (fi-bwr-2160)
                incomplete -> PASS       (fi-cfl-s2)
                pass       -> DMESG-WARN (fi-elk-e7500)
                pass       -> DMESG-WARN (fi-gdg-551)
                pass       -> DMESG-WARN (fi-ilk-650)
                pass       -> DMESG-WARN (fi-pnv-d510)
        Subgroup suspend-read-crc-pipe-b:
                pass       -> DMESG-WARN (fi-blb-e6850)
                pass       -> DMESG-WARN (fi-bwr-2160)
                pass       -> DMESG-WARN (fi-elk-e7500)
                pass       -> DMESG-WARN (fi-gdg-551)
                pass       -> DMESG-WARN (fi-ilk-650)
                pass       -> DMESG-WARN (fi-pnv-d510)

---- Known issues:

Test drv_module_reload:

        Subgroup basic-no-display:
                pass       -> DMESG-WARN (fi-bwr-2160) fdo#105268 +1
Test gem_exec_suspend:
        Subgroup basic-s4-devices:
                pass       -> DMESG-WARN (fi-elk-e7500) fdo#103989 +1
Test gem_ringfill:
        Subgroup basic-default-hang:
                pass       -> DMESG-WARN (fi-elk-e7500) fdo#104058
Test kms_pipe_crc_basic:
        Subgroup hang-read-crc-pipe-b:
                pass       -> DMESG-WARN (fi-elk-e7500) fdo#105552

WARNING: Long output truncated

9d737cebc219c821989021a3115424165ff7b052 drm-tip: 2018y-03m-20d-14h-56m-05s UTC integration manifest bb0439e3e798 drm/i915: Warn if rps max frequency is not set
771d861ab5fe drm/i915: Avoid setting ring freq on invalid rps freqs

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8416/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reviewed-by on v1 1/2
#5 lore raw
In reply to Mika Kuoppala

Quoting Mika Kuoppala (2018-03-20 15:17:33)

Quoted 8 lines

Looping through rps frequencies when both min and max are zero ends up into an endless loop. This can happen during hardware enablement.

Bail out early if rps frequencies are not correctly set yet.

-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#6 lore raw
Quoted 10 lines · Chris Wilson

Quoting Mika Kuoppala (2018-03-20 15:17:33)

Quoted 8 lines

Looping through rps frequencies when both min and max are zero ends up into an endless loop. This can happen during hardware enablement.

Bail out early if rps frequencies are not correctly set yet.

Pushed. Thanks for review.
-Mika

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx