Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 250848ca authored by Jesse Barnes's avatar Jesse Barnes Committed by Daniel Vetter
Browse files

drm/i915: cancel RPS work before disabling RPS 



Ville noticed this while doing another review; we may as well cancel
this work just to make sure we don't try anything fancy after disabling
the RPS interfaces.

Reported-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 52ceb908

drivers/gpu/drm/i915/intel_pm.c

+1 −0
Original line number Diff line number Diff line
@@ -3657,6 +3657,7 @@ void intel_disable_gt_powersave(struct drm_device *dev) 
		ironlake_disable_rc6(dev);

	} else if (INTEL_INFO(dev)->gen >= 6) {

		cancel_delayed_work_sync(&dev_priv->rps.delayed_resume_work);

		cancel_work_sync(&dev_priv->rps.work);

		if (IS_VALLEYVIEW(dev))

			cancel_delayed_work_sync(&dev_priv->rps.vlv_work);

		mutex_lock(&dev_priv->rps.hw_lock);