Commit 712bf364 authored by Ville Syrjälä's avatar Ville Syrjälä

drm/i915: Pass dev_priv to intel_suspend_hw()

Unify our approach to things by passing around dev_priv instead of dev.
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1477946245-14134-25-git-send-email-ville.syrjala@linux.intel.comReviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent 46f16e63
...@@ -1435,7 +1435,7 @@ static int i915_drm_suspend(struct drm_device *dev) ...@@ -1435,7 +1435,7 @@ static int i915_drm_suspend(struct drm_device *dev)
intel_suspend_encoders(dev_priv); intel_suspend_encoders(dev_priv);
intel_suspend_hw(dev); intel_suspend_hw(dev_priv);
i915_gem_suspend_gtt_mappings(dev); i915_gem_suspend_gtt_mappings(dev);
......
...@@ -1704,7 +1704,7 @@ bool chv_phy_powergate_ch(struct drm_i915_private *dev_priv, enum dpio_phy phy, ...@@ -1704,7 +1704,7 @@ bool chv_phy_powergate_ch(struct drm_i915_private *dev_priv, enum dpio_phy phy,
/* intel_pm.c */ /* intel_pm.c */
void intel_init_clock_gating(struct drm_i915_private *dev_priv); void intel_init_clock_gating(struct drm_i915_private *dev_priv);
void intel_suspend_hw(struct drm_device *dev); void intel_suspend_hw(struct drm_i915_private *dev_priv);
int ilk_wm_max_level(const struct drm_i915_private *dev_priv); int ilk_wm_max_level(const struct drm_i915_private *dev_priv);
void intel_update_watermarks(struct intel_crtc *crtc); void intel_update_watermarks(struct intel_crtc *crtc);
void intel_init_pm(struct drm_device *dev); void intel_init_pm(struct drm_device *dev);
......
...@@ -7139,10 +7139,8 @@ static void lpt_init_clock_gating(struct drm_i915_private *dev_priv) ...@@ -7139,10 +7139,8 @@ static void lpt_init_clock_gating(struct drm_i915_private *dev_priv)
TRANS_CHICKEN1_DP0UNIT_GC_DISABLE); TRANS_CHICKEN1_DP0UNIT_GC_DISABLE);
} }
static void lpt_suspend_hw(struct drm_device *dev) static void lpt_suspend_hw(struct drm_i915_private *dev_priv)
{ {
struct drm_i915_private *dev_priv = to_i915(dev);
if (HAS_PCH_LPT_LP(dev_priv)) { if (HAS_PCH_LPT_LP(dev_priv)) {
uint32_t val = I915_READ(SOUTH_DSPCLK_GATE_D); uint32_t val = I915_READ(SOUTH_DSPCLK_GATE_D);
...@@ -7626,10 +7624,10 @@ void intel_init_clock_gating(struct drm_i915_private *dev_priv) ...@@ -7626,10 +7624,10 @@ void intel_init_clock_gating(struct drm_i915_private *dev_priv)
dev_priv->display.init_clock_gating(dev_priv); dev_priv->display.init_clock_gating(dev_priv);
} }
void intel_suspend_hw(struct drm_device *dev) void intel_suspend_hw(struct drm_i915_private *dev_priv)
{ {
if (HAS_PCH_LPT(to_i915(dev))) if (HAS_PCH_LPT(dev_priv))
lpt_suspend_hw(dev); lpt_suspend_hw(dev_priv);
} }
static void nop_init_clock_gating(struct drm_i915_private *dev_priv) static void nop_init_clock_gating(struct drm_i915_private *dev_priv)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment