aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_runtime_pm.c
diff options
context:
space:
mode:
authorVille Syrjälä <ville.syrjala@linux.intel.com>2015-07-08 16:45:51 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2015-08-26 04:22:37 -0400
commit770effb19fbdcb44c6bdacf4a78571d28393f48f (patch)
treeb182cb5f0f8dfbac1dba72d6bcf5f83dd7ddcc74 /drivers/gpu/drm/i915/intel_runtime_pm.c
parente27f299ec3ddd03373bb07db23dd19747eecef72 (diff)
drm/i915: Add locking around chv_phy_control_init()
dev_priv->chv_phy_control is protected by the power_domains->lock elsewhere, so also grab it when initializing chv_phy_control. Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Reviewed-by: Deepak S <deepak.s@linux.intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_runtime_pm.c')
-rw-r--r--drivers/gpu/drm/i915/intel_runtime_pm.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c
index 821644d1b544..974c4cbf3fdb 100644
--- a/drivers/gpu/drm/i915/intel_runtime_pm.c
+++ b/drivers/gpu/drm/i915/intel_runtime_pm.c
@@ -1685,7 +1685,9 @@ void intel_power_domains_init_hw(struct drm_i915_private *dev_priv)
1685 power_domains->initializing = true; 1685 power_domains->initializing = true;
1686 1686
1687 if (IS_CHERRYVIEW(dev)) { 1687 if (IS_CHERRYVIEW(dev)) {
1688 mutex_lock(&power_domains->lock);
1688 chv_phy_control_init(dev_priv); 1689 chv_phy_control_init(dev_priv);
1690 mutex_unlock(&power_domains->lock);
1689 } else if (IS_VALLEYVIEW(dev)) { 1691 } else if (IS_VALLEYVIEW(dev)) {
1690 mutex_lock(&power_domains->lock); 1692 mutex_lock(&power_domains->lock);
1691 vlv_cmnlane_wa(dev_priv); 1693 vlv_cmnlane_wa(dev_priv);