Commit d2dee86c authored by Paulo Zanoni's avatar Paulo Zanoni Committed by Daniel Vetter

drm/i915: extract intel_init_fbc()

Because I plan to expand it a little bit.
Signed-off-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent b680c37a
...@@ -7358,21 +7358,20 @@ void intel_fini_runtime_pm(struct drm_i915_private *dev_priv) ...@@ -7358,21 +7358,20 @@ void intel_fini_runtime_pm(struct drm_i915_private *dev_priv)
pm_runtime_disable(device); pm_runtime_disable(device);
} }
/* Set up chip specific power management-related functions */ static void intel_init_fbc(struct drm_i915_private *dev_priv)
void intel_init_pm(struct drm_device *dev)
{ {
struct drm_i915_private *dev_priv = dev->dev_private; if (!HAS_FBC(dev_priv))
return;
if (HAS_FBC(dev)) { if (INTEL_INFO(dev_priv)->gen >= 7) {
if (INTEL_INFO(dev)->gen >= 7) {
dev_priv->display.fbc_enabled = ironlake_fbc_enabled; dev_priv->display.fbc_enabled = ironlake_fbc_enabled;
dev_priv->display.enable_fbc = gen7_enable_fbc; dev_priv->display.enable_fbc = gen7_enable_fbc;
dev_priv->display.disable_fbc = ironlake_disable_fbc; dev_priv->display.disable_fbc = ironlake_disable_fbc;
} else if (INTEL_INFO(dev)->gen >= 5) { } else if (INTEL_INFO(dev_priv)->gen >= 5) {
dev_priv->display.fbc_enabled = ironlake_fbc_enabled; dev_priv->display.fbc_enabled = ironlake_fbc_enabled;
dev_priv->display.enable_fbc = ironlake_enable_fbc; dev_priv->display.enable_fbc = ironlake_enable_fbc;
dev_priv->display.disable_fbc = ironlake_disable_fbc; dev_priv->display.disable_fbc = ironlake_disable_fbc;
} else if (IS_GM45(dev)) { } else if (IS_GM45(dev_priv)) {
dev_priv->display.fbc_enabled = g4x_fbc_enabled; dev_priv->display.fbc_enabled = g4x_fbc_enabled;
dev_priv->display.enable_fbc = g4x_enable_fbc; dev_priv->display.enable_fbc = g4x_enable_fbc;
dev_priv->display.disable_fbc = g4x_disable_fbc; dev_priv->display.disable_fbc = g4x_disable_fbc;
...@@ -7384,7 +7383,14 @@ void intel_init_pm(struct drm_device *dev) ...@@ -7384,7 +7383,14 @@ void intel_init_pm(struct drm_device *dev)
/* This value was pulled out of someone's hat */ /* This value was pulled out of someone's hat */
I915_WRITE(FBC_CONTROL, 500 << FBC_CTL_INTERVAL_SHIFT); I915_WRITE(FBC_CONTROL, 500 << FBC_CTL_INTERVAL_SHIFT);
} }
} }
/* Set up chip specific power management-related functions */
void intel_init_pm(struct drm_device *dev)
{
struct drm_i915_private *dev_priv = dev->dev_private;
intel_init_fbc(dev_priv);
/* For cxsr */ /* For cxsr */
if (IS_PINEVIEW(dev)) if (IS_PINEVIEW(dev))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment