|
@@ -1535,8 +1535,7 @@ static void vlv_enable_pll(struct intel_crtc *crtc,
|
|
assert_pipe_disabled(dev_priv, pipe);
|
|
assert_pipe_disabled(dev_priv, pipe);
|
|
|
|
|
|
/* PLL is protected by panel, make sure we can write it */
|
|
/* PLL is protected by panel, make sure we can write it */
|
|
- if (IS_MOBILE(dev_priv->dev))
|
|
|
|
- assert_panel_unlocked(dev_priv, pipe);
|
|
|
|
|
|
+ assert_panel_unlocked(dev_priv, pipe);
|
|
|
|
|
|
I915_WRITE(reg, dpll);
|
|
I915_WRITE(reg, dpll);
|
|
POSTING_READ(reg);
|
|
POSTING_READ(reg);
|
|
@@ -1571,6 +1570,9 @@ static void chv_enable_pll(struct intel_crtc *crtc,
|
|
|
|
|
|
assert_pipe_disabled(dev_priv, pipe);
|
|
assert_pipe_disabled(dev_priv, pipe);
|
|
|
|
|
|
|
|
+ /* PLL is protected by panel, make sure we can write it */
|
|
|
|
+ assert_panel_unlocked(dev_priv, pipe);
|
|
|
|
+
|
|
mutex_lock(&dev_priv->sb_lock);
|
|
mutex_lock(&dev_priv->sb_lock);
|
|
|
|
|
|
/* Enable back the 10bit clock to display controller */
|
|
/* Enable back the 10bit clock to display controller */
|