]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
drm/i915: Don't try to disable host RPS when this was never enabled.
authorRodrigo Vivi <rodrigo.vivi@intel.com>
Fri, 2 Sep 2022 09:51:25 +0000 (05:51 -0400)
committerRodrigo Vivi <rodrigo.vivi@intel.com>
Tue, 6 Sep 2022 20:34:40 +0000 (16:34 -0400)
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>
Acked-by: Nirmoy Das <nirmoy.das@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220902095126.373036-1-rodrigo.vivi@intel.com
drivers/gpu/drm/i915/gt/intel_rps.c

index 579ae9ac089cbb07f1f1db6b1b3d790c361d9fc4..6fadde4ee7bf76abf317c145c74362b797dadd5c 100644 (file)
@@ -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);