Commit 148ac1f3 authored by Ville Syrjälä's avatar Ville Syrjälä

drm/i915: Pass dev_priv to i915_pineview_get_mem_freq() and i915_ironlake_get_mem_freq()

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-18-git-send-email-ville.syrjala@linux.intel.comReviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent 9b1e14f4
...@@ -108,9 +108,8 @@ static void bxt_init_clock_gating(struct drm_device *dev) ...@@ -108,9 +108,8 @@ static void bxt_init_clock_gating(struct drm_device *dev)
PWM1_GATING_DIS | PWM2_GATING_DIS); PWM1_GATING_DIS | PWM2_GATING_DIS);
} }
static void i915_pineview_get_mem_freq(struct drm_device *dev) static void i915_pineview_get_mem_freq(struct drm_i915_private *dev_priv)
{ {
struct drm_i915_private *dev_priv = to_i915(dev);
u32 tmp; u32 tmp;
tmp = I915_READ(CLKCFG); tmp = I915_READ(CLKCFG);
...@@ -147,9 +146,8 @@ static void i915_pineview_get_mem_freq(struct drm_device *dev) ...@@ -147,9 +146,8 @@ static void i915_pineview_get_mem_freq(struct drm_device *dev)
dev_priv->is_ddr3 = (tmp & CSHRDDR3CTL_DDR3) ? 1 : 0; dev_priv->is_ddr3 = (tmp & CSHRDDR3CTL_DDR3) ? 1 : 0;
} }
static void i915_ironlake_get_mem_freq(struct drm_device *dev) static void i915_ironlake_get_mem_freq(struct drm_i915_private *dev_priv)
{ {
struct drm_i915_private *dev_priv = to_i915(dev);
u16 ddrpll, csipll; u16 ddrpll, csipll;
ddrpll = I915_READ16(DDRMPLL1); ddrpll = I915_READ16(DDRMPLL1);
...@@ -7744,9 +7742,9 @@ void intel_init_pm(struct drm_device *dev) ...@@ -7744,9 +7742,9 @@ void intel_init_pm(struct drm_device *dev)
/* For cxsr */ /* For cxsr */
if (IS_PINEVIEW(dev_priv)) if (IS_PINEVIEW(dev_priv))
i915_pineview_get_mem_freq(dev); i915_pineview_get_mem_freq(dev_priv);
else if (IS_GEN5(dev_priv)) else if (IS_GEN5(dev_priv))
i915_ironlake_get_mem_freq(dev); i915_ironlake_get_mem_freq(dev_priv);
/* For FIFO watermark updates */ /* For FIFO watermark updates */
if (INTEL_INFO(dev)->gen >= 9) { if (INTEL_INFO(dev)->gen >= 9) {
......
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