提交 92b806d3 编写于 作者: I Imre Deak 提交者: Daniel Vetter

drm/i915: make runtime PM swizzling/ring_freq init platform independent

We need to re-init sizzling on all platforms so move it to the
platform independent runtime resume callback. The ring frequency reinit
is also needed everywhere except on VLV, but gen6_update_ring_freq()
will be a noop on VLV, so we can move this function too to platform
independent code.
Signed-off-by: NImre Deak <imre.deak@intel.com>
Reviewed-by: NVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
上级 c2bc2fc5
...@@ -926,8 +926,6 @@ static void snb_runtime_resume(struct drm_i915_private *dev_priv) ...@@ -926,8 +926,6 @@ static void snb_runtime_resume(struct drm_i915_private *dev_priv)
struct drm_device *dev = dev_priv->dev; struct drm_device *dev = dev_priv->dev;
intel_init_pch_refclk(dev); intel_init_pch_refclk(dev);
i915_gem_init_swizzling(dev);
gen6_update_ring_freq(dev);
} }
static void hsw_runtime_resume(struct drm_i915_private *dev_priv) static void hsw_runtime_resume(struct drm_i915_private *dev_priv)
...@@ -996,6 +994,9 @@ static int intel_runtime_resume(struct device *device) ...@@ -996,6 +994,9 @@ static int intel_runtime_resume(struct device *device)
else else
WARN_ON(1); WARN_ON(1);
i915_gem_init_swizzling(dev);
gen6_update_ring_freq(dev);
intel_runtime_pm_restore_interrupts(dev); intel_runtime_pm_restore_interrupts(dev);
DRM_DEBUG_KMS("Device resumed\n"); DRM_DEBUG_KMS("Device resumed\n");
......
...@@ -7056,8 +7056,6 @@ void hsw_disable_pc8(struct drm_i915_private *dev_priv) ...@@ -7056,8 +7056,6 @@ void hsw_disable_pc8(struct drm_i915_private *dev_priv)
} }
intel_prepare_ddi(dev); intel_prepare_ddi(dev);
i915_gem_init_swizzling(dev);
gen6_update_ring_freq(dev);
} }
static void snb_modeset_global_resources(struct drm_device *dev) static void snb_modeset_global_resources(struct drm_device *dev)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册