aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaulo Zanoni <paulo.r.zanoni@intel.com>2013-11-21 10:47:23 -0500
committerDaniel Vetter <daniel.vetter@ffwll.ch>2013-12-10 16:50:42 -0500
commite9cb81a22841908b1c075156b409a538d09c8466 (patch)
treee904f4237d047a9e3dbdc8e4d1c3b4df9b7fa327
parentc8c8fb33b37766acf6474784b0d5245dab9a1690 (diff)
drm/i915: get a runtime PM reference when the panel VDD is on
And put it when it's off. Otherwise, when you run pm_pc8 from intel-gpu-tools, and the delayed function that disables VDD runs, we'll get some messages saying we're touching registers while the HW is suspended. Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@gmail.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r--drivers/gpu/drm/i915/intel_dp.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index a01264234bf0..ba5a59c9129f 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -1094,6 +1094,8 @@ void ironlake_edp_panel_vdd_on(struct intel_dp *intel_dp)
1094 if (ironlake_edp_have_panel_vdd(intel_dp)) 1094 if (ironlake_edp_have_panel_vdd(intel_dp))
1095 return; 1095 return;
1096 1096
1097 intel_runtime_pm_get(dev_priv);
1098
1097 DRM_DEBUG_KMS("Turning eDP VDD on\n"); 1099 DRM_DEBUG_KMS("Turning eDP VDD on\n");
1098 1100
1099 if (!ironlake_edp_have_panel_power(intel_dp)) 1101 if (!ironlake_edp_have_panel_power(intel_dp))
@@ -1143,6 +1145,8 @@ static void ironlake_panel_vdd_off_sync(struct intel_dp *intel_dp)
1143 DRM_DEBUG_KMS("PP_STATUS: 0x%08x PP_CONTROL: 0x%08x\n", 1145 DRM_DEBUG_KMS("PP_STATUS: 0x%08x PP_CONTROL: 0x%08x\n",
1144 I915_READ(pp_stat_reg), I915_READ(pp_ctrl_reg)); 1146 I915_READ(pp_stat_reg), I915_READ(pp_ctrl_reg));
1145 msleep(intel_dp->panel_power_down_delay); 1147 msleep(intel_dp->panel_power_down_delay);
1148
1149 intel_runtime_pm_put(dev_priv);
1146 } 1150 }
1147} 1151}
1148 1152
@@ -1250,6 +1254,9 @@ void ironlake_edp_panel_off(struct intel_dp *intel_dp)
1250 intel_dp->want_panel_vdd = false; 1254 intel_dp->want_panel_vdd = false;
1251 1255
1252 ironlake_wait_panel_off(intel_dp); 1256 ironlake_wait_panel_off(intel_dp);
1257
1258 /* We got a reference when we enabled the VDD. */
1259 intel_runtime_pm_put(dev_priv);
1253} 1260}
1254 1261
1255void ironlake_edp_backlight_on(struct intel_dp *intel_dp) 1262void ironlake_edp_backlight_on(struct intel_dp *intel_dp)