diff options
| -rw-r--r-- | linux-core/i915_drv.c | 4 | ||||
| -rw-r--r-- | shared-core/i915_irq.c | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/linux-core/i915_drv.c b/linux-core/i915_drv.c index abb45de7..cf8016c0 100644 --- a/linux-core/i915_drv.c +++ b/linux-core/i915_drv.c @@ -80,7 +80,9 @@ static int i915_suspend(struct drm_device *dev, pm_message_t state) i915_save_state(dev); +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,25) intel_opregion_free(dev); +#endif if (state.event == PM_EVENT_SUSPEND) { /* Shut down the device */ @@ -101,7 +103,9 @@ static int i915_resume(struct drm_device *dev) i915_restore_state(dev); +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,25) intel_opregion_init(dev); +#endif return 0; } diff --git a/shared-core/i915_irq.c b/shared-core/i915_irq.c index 135d6159..d507d76e 100644 --- a/shared-core/i915_irq.c +++ b/shared-core/i915_irq.c @@ -443,16 +443,20 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS) } #ifdef __linux__ +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,25) if (pipeb_stats & I915_LEGACY_BLC_EVENT_ENABLE) opregion_asle_intr(dev); #endif +#endif I915_WRITE(PIPEBSTAT, pipeb_stats); } #ifdef __linux__ +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,25) if (iir & I915_ASLE_INTERRUPT) opregion_asle_intr(dev); #endif +#endif if (dev_priv->sarea_priv) dev_priv->sarea_priv->last_dispatch = READ_BREADCRUMB(dev_priv); @@ -675,8 +679,10 @@ void i915_enable_interrupt (struct drm_device *dev) dev_priv->irq_enable_reg |= I915_USER_INTERRUPT; #ifdef __linux__ +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,25) opregion_enable_asle(dev); #endif +#endif I915_WRITE(IER, dev_priv->irq_enable_reg); dev_priv->irq_enabled = 1; |