[PATCH 2/3] drm/i915: Grab rpm ref when changing cdclk on VLV/CHV

ville.syrjala
2014-10-07T14:42:13Z

From: Ville Syrjälä <ville.syrjala@linux.intel.com>

We need to access the gunit mailbox when changing the cdclk frequency.
Currently we update the power wells only after chancing cdclk, so the
device might be suspended when we have to frob it. Grab a runtime PM
reference to make sure it's awake.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/i915/intel_display.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index d83a7f1..149310b 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -4812,10 +4812,12 @@ static void valleyview_modeset_global_resources(struct drm_device *dev)
int req_cdclk = valleyview_calc_cdclk(dev_priv, max_pixclk);

if (req_cdclk != dev_priv->vlv_cdclk_freq) {
+ intel_runtime_pm_get(dev_priv);
if (IS_CHERRYVIEW(dev))
cherryview_set_cdclk(dev, req_cdclk);
else
valleyview_set_cdclk(dev, req_cdclk);
+ intel_runtime_pm_put(dev_priv);
}

modeset_update_crtc_power_domains(dev);
--
2.0.4