aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_drv.h
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2014-09-30 04:56:40 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2014-10-01 04:52:59 -0400
commitd9bc89d9e39c2c1a76cd37b5e8cc1592a7898848 (patch)
tree84c69fd299466537c743f2938f40d8f89696a0fd /drivers/gpu/drm/i915/intel_drv.h
parentf458ebbc3329a6f064e0f40ed5909fe3a7133238 (diff)
drm/i915: Move intel_display_set_init_power to intel_runtime_pm.c
I've decided to not move intel_display_port_power_domain because that's just a hack in our design ... Reviewed-by: Imre Deak <imre.deak@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_drv.h')
-rw-r--r--drivers/gpu/drm/i915/intel_drv.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index dc0c6d55c8fa..64fe05e3d1a5 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -934,7 +934,6 @@ ironlake_check_encoder_dotclock(const struct intel_crtc_config *pipe_config,
934bool intel_crtc_active(struct drm_crtc *crtc); 934bool intel_crtc_active(struct drm_crtc *crtc);
935void hsw_enable_ips(struct intel_crtc *crtc); 935void hsw_enable_ips(struct intel_crtc *crtc);
936void hsw_disable_ips(struct intel_crtc *crtc); 936void hsw_disable_ips(struct intel_crtc *crtc);
937void intel_display_set_init_power(struct drm_i915_private *dev, bool enable);
938enum intel_display_power_domain 937enum intel_display_power_domain
939intel_display_port_power_domain(struct intel_encoder *intel_encoder); 938intel_display_port_power_domain(struct intel_encoder *intel_encoder);
940void intel_mode_from_pipe_config(struct drm_display_mode *mode, 939void intel_mode_from_pipe_config(struct drm_display_mode *mode,
@@ -1102,6 +1101,8 @@ void intel_runtime_pm_get(struct drm_i915_private *dev_priv);
1102void intel_runtime_pm_get_noresume(struct drm_i915_private *dev_priv); 1101void intel_runtime_pm_get_noresume(struct drm_i915_private *dev_priv);
1103void intel_runtime_pm_put(struct drm_i915_private *dev_priv); 1102void intel_runtime_pm_put(struct drm_i915_private *dev_priv);
1104 1103
1104void intel_display_set_init_power(struct drm_i915_private *dev, bool enable);
1105
1105/* intel_pm.c */ 1106/* intel_pm.c */
1106void intel_init_clock_gating(struct drm_device *dev); 1107void intel_init_clock_gating(struct drm_device *dev);
1107void intel_suspend_hw(struct drm_device *dev); 1108void intel_suspend_hw(struct drm_device *dev);