diff options
| author | Hans de Goede <j.w.r.degoede@gmail.com> | 2017-11-14 14:55:17 +0100 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2017-11-21 11:39:31 +0200 |
| commit | 294cf1af8cf2eb0d1eced377fdfb9a2d3f0e8b42 (patch) | |
| tree | 6f44f2e3c9b5763d3e0ec4b7a51eff5c38d89632 /drivers/gpu/drm/i915/i915_drv.c | |
| parent | f4359cedfb43b934f38c50d1604db21333abe57b (diff) | |
| download | op-kernel-dev-294cf1af8cf2eb0d1eced377fdfb9a2d3f0e8b42.zip op-kernel-dev-294cf1af8cf2eb0d1eced377fdfb9a2d3f0e8b42.tar.gz | |
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
(cherry picked from commit bedf4d79c3654921839b62246b0965ddb308b201)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 3db5851..3419102 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -2618,6 +2618,8 @@ static int intel_runtime_resume(struct device *kdev) ret = vlv_resume_prepare(dev_priv, true); } + intel_uncore_runtime_resume(dev_priv); + /* * No point of rolling back things in case of an error, as the best * we can do is to hope that things will still work (and disable RPM). |
