aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_dma.c
diff options
context:
space:
mode:
authorZhao Yakui <yakui.zhao@intel.com>2009-10-28 01:10:00 -0400
committerEric Anholt <eric@anholt.net>2009-11-05 17:49:13 -0500
commit01c66889c14aa163c49355b3be2ccfb214500599 (patch)
tree278e3e9a1fb0001d61d531804e8db6ea83bc712c /drivers/gpu/drm/i915/i915_dma.c
parent1dc7546d1a73664e5d117715b214bea9cae5951c (diff)
drm/i915: Add ACPI OpRegion support for Ironlake
Add the support of ACPI opregion on Ironlake so that the backlight brightness can be adjusted by using ACPI interface >/sys/class/backlight/acpi_video0/brightness Signed-off-by: Zhao Yakui <yakui.zhao@intel.com> Tested-by: Zhao Yakui <yakui.zhao@intel.com> [zhenyuw: cleanups, fix typo for checking GSE irq and convert to current irq handling logic.] Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com> Signed-off-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_dma.c')
-rw-r--r--drivers/gpu/drm/i915/i915_dma.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index 794ded2394cc..093146bacf84 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -1492,9 +1492,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
1492 } 1492 }
1493 1493
1494 /* Must be done after probing outputs */ 1494 /* Must be done after probing outputs */
1495 /* FIXME: verify on IGDNG */ 1495 intel_opregion_init(dev, 0);
1496 if (!IS_IGDNG(dev))
1497 intel_opregion_init(dev, 0);
1498 1496
1499 setup_timer(&dev_priv->hangcheck_timer, i915_hangcheck_elapsed, 1497 setup_timer(&dev_priv->hangcheck_timer, i915_hangcheck_elapsed,
1500 (unsigned long) dev); 1498 (unsigned long) dev);
@@ -1538,8 +1536,7 @@ int i915_driver_unload(struct drm_device *dev)
1538 if (dev_priv->regs != NULL) 1536 if (dev_priv->regs != NULL)
1539 iounmap(dev_priv->regs); 1537 iounmap(dev_priv->regs);
1540 1538
1541 if (!IS_IGDNG(dev)) 1539 intel_opregion_free(dev, 0);
1542 intel_opregion_free(dev, 0);
1543 1540
1544 if (drm_core_check_feature(dev, DRIVER_MODESET)) { 1541 if (drm_core_check_feature(dev, DRIVER_MODESET)) {
1545 intel_modeset_cleanup(dev); 1542 intel_modeset_cleanup(dev);