aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/gpu/drm/i915/intel_uncore.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c
index 20e3c65c0999..cb48c8b92aa3 100644
--- a/drivers/gpu/drm/i915/intel_uncore.c
+++ b/drivers/gpu/drm/i915/intel_uncore.c
@@ -1240,8 +1240,15 @@ static int i915_pmic_bus_access_notifier(struct notifier_block *nb,
1240 * bus, which will be busy after this notification, leading to: 1240 * bus, which will be busy after this notification, leading to:
1241 * "render: timed out waiting for forcewake ack request." 1241 * "render: timed out waiting for forcewake ack request."
1242 * errors. 1242 * errors.
1243 *
1244 * The notifier is unregistered during intel_runtime_suspend(),
1245 * so it's ok to access the HW here without holding a RPM
1246 * wake reference -> disable wakeref asserts for the time of
1247 * the access.
1243 */ 1248 */
1249 disable_rpm_wakeref_asserts(dev_priv);
1244 intel_uncore_forcewake_get(dev_priv, FORCEWAKE_ALL); 1250 intel_uncore_forcewake_get(dev_priv, FORCEWAKE_ALL);
1251 enable_rpm_wakeref_asserts(dev_priv);
1245 break; 1252 break;
1246 case MBI_PMIC_BUS_ACCESS_END: 1253 case MBI_PMIC_BUS_ACCESS_END:
1247 intel_uncore_forcewake_put(dev_priv, FORCEWAKE_ALL); 1254 intel_uncore_forcewake_put(dev_priv, FORCEWAKE_ALL);