diff options
author | Jani Nikula <jani.nikula@intel.com> | 2013-04-29 06:02:54 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-04-30 04:40:31 -0400 |
commit | f49e38dd23d28d4fceea1e84ae444b4c25fc0407 (patch) | |
tree | db7beac6db2833c18e20388e997b6ec71cb7c735 /drivers/gpu/drm/i915/intel_opregion.c | |
parent | f898780ba020696e50c04abf2a55790df37ce384 (diff) |
drm/i915: cleanup opregion asle pipestat enable
Both intel_opregion_enable_asle() and intel_enable_asle() have shrunk
considerably. Merge them together into a static function in i915_irq.c,
and rename to better reflect the purpose and the related platforms.
No functional changes.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_opregion.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_opregion.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/intel_opregion.c index 4e697993a3f2..62b64e4877b8 100644 --- a/drivers/gpu/drm/i915/intel_opregion.c +++ b/drivers/gpu/drm/i915/intel_opregion.c | |||
@@ -232,17 +232,6 @@ void intel_opregion_asle_intr(struct drm_device *dev) | |||
232 | iowrite32(asle_stat, &asle->aslc); | 232 | iowrite32(asle_stat, &asle->aslc); |
233 | } | 233 | } |
234 | 234 | ||
235 | void intel_opregion_enable_asle(struct drm_device *dev) | ||
236 | { | ||
237 | struct drm_i915_private *dev_priv = dev->dev_private; | ||
238 | struct opregion_asle __iomem *asle = dev_priv->opregion.asle; | ||
239 | |||
240 | if (asle) { | ||
241 | if (IS_MOBILE(dev)) | ||
242 | intel_enable_asle(dev); | ||
243 | } | ||
244 | } | ||
245 | |||
246 | #define ACPI_EV_DISPLAY_SWITCH (1<<0) | 235 | #define ACPI_EV_DISPLAY_SWITCH (1<<0) |
247 | #define ACPI_EV_LID (1<<1) | 236 | #define ACPI_EV_LID (1<<1) |
248 | #define ACPI_EV_DOCK (1<<2) | 237 | #define ACPI_EV_DOCK (1<<2) |