diff options
| author | Hans de Goede <j.w.r.degoede@gmail.com> | 2017-11-14 14:55:17 +0100 |
|---|---|---|
| committer | Hans de Goede <hdegoede@redhat.com> | 2017-11-15 09:55:12 +0100 |
| commit | bedf4d79c3654921839b62246b0965ddb308b201 (patch) | |
| tree | 10c67624c106a42619eeef5809aa9807f4b1f8a6 /drivers/gpu/drm/i915/intel_uncore.c | |
| parent | ce30560c80dead91e98a03d90fb8791e57a9b69d (diff) | |
| download | linux-stable-bedf4d79c3654921839b62246b0965ddb308b201.tar.gz linux-stable-bedf4d79c3654921839b62246b0965ddb308b201.tar.bz2 linux-stable-bedf4d79c3654921839b62246b0965ddb308b201.zip | |
drm/i915: Re-register PMIC bus access notifier on runtime resume
intel_uncore_suspend() unregisters the uncore code's PMIC bus access
notifier and gets called on both normal and runtime suspend.
intel_uncore_resume_early() re-registers the notifier, but only on
normal resume. Add a new intel_uncore_runtime_resume() function which
only re-registers the notifier and call that on runtime resume.
Cc: stable@vger.kernel.org
Reported-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171114135518.15981-2-hdegoede@redhat.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_uncore.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_uncore.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c index 6e01c1898aea..b4621271e7a2 100644 --- a/drivers/gpu/drm/i915/intel_uncore.c +++ b/drivers/gpu/drm/i915/intel_uncore.c @@ -557,6 +557,12 @@ void intel_uncore_resume_early(struct drm_i915_private *dev_priv) i915_check_and_clear_faults(dev_priv); } +void intel_uncore_runtime_resume(struct drm_i915_private *dev_priv) +{ + iosf_mbi_register_pmic_bus_access_notifier( + &dev_priv->uncore.pmic_bus_access_nb); +} + void intel_uncore_sanitize(struct drm_i915_private *dev_priv) { i915_modparams.enable_rc6 = |