aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_irq.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2010-08-24 04:02:58 -0400
committerChris Wilson <chris@chris-wilson.co.uk>2010-09-08 05:13:31 -0400
commit3b61796785e7b0ca8846b7a709216dceb6e2f68d (patch)
treed18355e358fa0830c20fea619647b75d191c6f05 /drivers/gpu/drm/i915/i915_irq.c
parent19c55da11660fea1a0f1ddbb33ecf38d4f728799 (diff)
drm/i915: Rename i915_opregion.c to intel_opregion.c
It's part of the generic Intel driver infrastructure so rename it in prepreparation for using it for VBT. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_irq.c')
-rw-r--r--drivers/gpu/drm/i915/i915_irq.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 59457e83b011..3afd6e5662d1 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -347,7 +347,7 @@ irqreturn_t ironlake_irq_handler(struct drm_device *dev)
347 347
348 348
349 if (de_iir & DE_GSE) 349 if (de_iir & DE_GSE)
350 ironlake_opregion_gse_intr(dev); 350 intel_opregion_gse_intr(dev);
351 351
352 if (de_iir & DE_PLANEA_FLIP_DONE) { 352 if (de_iir & DE_PLANEA_FLIP_DONE) {
353 intel_prepare_page_flip(dev, 0); 353 intel_prepare_page_flip(dev, 0);
@@ -1065,7 +1065,7 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
1065 if ((pipea_stats & PIPE_LEGACY_BLC_EVENT_STATUS) || 1065 if ((pipea_stats & PIPE_LEGACY_BLC_EVENT_STATUS) ||
1066 (pipeb_stats & PIPE_LEGACY_BLC_EVENT_STATUS) || 1066 (pipeb_stats & PIPE_LEGACY_BLC_EVENT_STATUS) ||
1067 (iir & I915_ASLE_INTERRUPT)) 1067 (iir & I915_ASLE_INTERRUPT))
1068 opregion_asle_intr(dev); 1068 intel_opregion_asle_intr(dev);
1069 1069
1070 /* With MSI, interrupts are only generated when iir 1070 /* With MSI, interrupts are only generated when iir
1071 * transitions from zero to nonzero. If another bit got 1071 * transitions from zero to nonzero. If another bit got
@@ -1252,7 +1252,7 @@ void i915_enable_interrupt (struct drm_device *dev)
1252 struct drm_i915_private *dev_priv = dev->dev_private; 1252 struct drm_i915_private *dev_priv = dev->dev_private;
1253 1253
1254 if (!HAS_PCH_SPLIT(dev)) 1254 if (!HAS_PCH_SPLIT(dev))
1255 opregion_enable_asle(dev); 1255 intel_opregion_enable_asle(dev);
1256 dev_priv->irq_enabled = 1; 1256 dev_priv->irq_enabled = 1;
1257} 1257}
1258 1258
@@ -1570,7 +1570,7 @@ int i915_driver_irq_postinstall(struct drm_device *dev)
1570 I915_WRITE(PORT_HOTPLUG_EN, hotplug_en); 1570 I915_WRITE(PORT_HOTPLUG_EN, hotplug_en);
1571 } 1571 }
1572 1572
1573 opregion_enable_asle(dev); 1573 intel_opregion_enable_asle(dev);
1574 1574
1575 return 0; 1575 return 0;
1576} 1576}