i915: add version checks for opregion on old kernels

This commit is contained in:
Dave Airlie 2008-07-30 16:26:51 +10:00
parent 90b90c65dc
commit 02b09d271c
2 changed files with 6 additions and 0 deletions

View file

@ -32,6 +32,7 @@
#include "i915_drm.h" #include "i915_drm.h"
#include "i915_drv.h" #include "i915_drv.h"
#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,25)
#define PCI_ASLE 0xe4 #define PCI_ASLE 0xe4
#define PCI_ASLS 0xfc #define PCI_ASLS 0xfc
@ -384,3 +385,4 @@ void intel_opregion_free(struct drm_device *dev)
opregion->enabled = 0; opregion->enabled = 0;
} }
#endif

View file

@ -1038,7 +1038,9 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25) #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
intel_init_chipset_flush_compat(dev); intel_init_chipset_flush_compat(dev);
#endif #endif
#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,25)
intel_opregion_init(dev); intel_opregion_init(dev);
#endif
#endif #endif
I915_WRITE16(HWSTAM, 0xeffe); I915_WRITE16(HWSTAM, 0xeffe);
@ -1097,7 +1099,9 @@ int i915_driver_unload(struct drm_device *dev)
drm_rmmap(dev, dev_priv->mmio_map); drm_rmmap(dev, dev_priv->mmio_map);
#ifdef __linux__ #ifdef __linux__
#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,25)
intel_opregion_free(dev); intel_opregion_free(dev);
#endif
#endif #endif
drm_free(dev->dev_private, sizeof(drm_i915_private_t), drm_free(dev->dev_private, sizeof(drm_i915_private_t),