Intel-GFX Archive on 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

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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox