redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

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

Browse source 
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:
Imre Deak 2014-04-14 20:24:39 +03:00 committed by Daniel Vetter
parent c2bc2fc541
commit 92b806d368
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/gpu/drm/i915/i915_drv.c
View file

@ -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");

2
drivers/gpu/drm/i915/intel_display.c
View file

@ -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)