[PATCH v2 18/25] drm/i915: make runtime PM swizzling/ring_freq init platform independent

Imre Deak
2014-04-14T17:26:02Z

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>
---
drivers/gpu/drm/i915/i915_drv.c | 5 +++--
drivers/gpu/drm/i915/intel_display.c | 2 --
2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index afc31e3..b87109c 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -898,8 +898,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)
@@ -968,6 +966,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");
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 596ae69..3e7ad14 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -7087,8 +7087,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)
--
1.8.4