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: Imre Deak <imre.deak@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 8c26000..114598d 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -926,8 +926,6 @@
struct drm_device *dev = dev_priv->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)
@@ -996,6 +994,9 @@
else
WARN_ON(1);
+ i915_gem_init_swizzling(dev);
+ gen6_update_ring_freq(dev);
+
intel_runtime_pm_restore_interrupts(dev);
DRM_DEBUG_KMS("Device resumed\n");