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>
This commit is contained in:
Родитель
c2bc2fc541
Коммит
92b806d368
|
@ -926,8 +926,6 @@ static void snb_runtime_resume(struct drm_i915_private *dev_priv)
|
|||
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 @@ static int intel_runtime_resume(struct device *device)
|
|||
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");
|
||||
|
|
|
@ -7056,8 +7056,6 @@ void hsw_disable_pc8(struct drm_i915_private *dev_priv)
|
|||
}
|
||||
|
||||
intel_prepare_ddi(dev);
|
||||
i915_gem_init_swizzling(dev);
|
||||
gen6_update_ring_freq(dev);
|
||||
}
|
||||
|
||||
static void snb_modeset_global_resources(struct drm_device *dev)
|
||||
|
|
Загрузка…
Ссылка в новой задаче