Rev 6131 | Rev 6320 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 6131 | Rev 6296 | ||
|---|---|---|---|
| Line 1443... | Line 1443... | ||
| 1443 | if ((hpd[i] & hotplug_trigger) == 0) |
1443 | if ((hpd[i] & hotplug_trigger) == 0) |
| 1444 | continue; |
1444 | continue; |
| Line 1445... | Line 1445... | ||
| 1445 | 1445 | ||
| Line 1446... | Line 1446... | ||
| 1446 | *pin_mask |= BIT(i); |
1446 | *pin_mask |= BIT(i); |
| 1447 | 1447 | ||
| Line 1448... | Line 1448... | ||
| 1448 | // if (!intel_hpd_pin_to_port(i, &port)) |
1448 | if (!intel_hpd_pin_to_port(i, &port)) |
| 1449 | continue; |
1449 | continue; |
| 1450 | 1450 | ||
| Line 1697... | Line 1697... | ||
| 1697 | if (hotplug_trigger) { |
1697 | if (hotplug_trigger) { |
| 1698 | intel_get_hpd_pins(&pin_mask, &long_mask, hotplug_trigger, |
1698 | intel_get_hpd_pins(&pin_mask, &long_mask, hotplug_trigger, |
| 1699 | hotplug_trigger, hpd_status_g4x, |
1699 | hotplug_trigger, hpd_status_g4x, |
| 1700 | i9xx_port_hotplug_long_detect); |
1700 | i9xx_port_hotplug_long_detect); |
| Line 1701... | Line 1701... | ||
| 1701 | 1701 | ||
| 1702 | // intel_hpd_irq_handler(dev, pin_mask, long_mask); |
1702 | intel_hpd_irq_handler(dev, pin_mask, long_mask); |
| Line 1703... | Line 1703... | ||
| 1703 | } |
1703 | } |
| 1704 | 1704 | ||
| 1705 | if (hotplug_status & DP_AUX_CHANNEL_MASK_INT_STATUS_G4X) |
1705 | if (hotplug_status & DP_AUX_CHANNEL_MASK_INT_STATUS_G4X) |
| Line 1709... | Line 1709... | ||
| 1709 | 1709 | ||
| 1710 | if (hotplug_trigger) { |
1710 | if (hotplug_trigger) { |
| 1711 | intel_get_hpd_pins(&pin_mask, &long_mask, hotplug_trigger, |
1711 | intel_get_hpd_pins(&pin_mask, &long_mask, hotplug_trigger, |
| 1712 | hotplug_trigger, hpd_status_i915, |
1712 | hotplug_trigger, hpd_status_i915, |
| 1713 | i9xx_port_hotplug_long_detect); |
1713 | i9xx_port_hotplug_long_detect); |
| 1714 | // intel_hpd_irq_handler(dev, pin_mask, long_mask); |
1714 | intel_hpd_irq_handler(dev, pin_mask, long_mask); |
| 1715 | } |
1715 | } |
| 1716 | } |
1716 | } |
| Line 1717... | Line 1717... | ||
| 1717 | } |
1717 | } |
| Line 1817... | Line 1817... | ||
| 1817 | 1817 | ||
| 1818 | intel_get_hpd_pins(&pin_mask, &long_mask, hotplug_trigger, |
1818 | intel_get_hpd_pins(&pin_mask, &long_mask, hotplug_trigger, |
| 1819 | dig_hotplug_reg, hpd, |
1819 | dig_hotplug_reg, hpd, |
| Line 1820... | Line 1820... | ||
| 1820 | pch_port_hotplug_long_detect); |
1820 | pch_port_hotplug_long_detect); |
| 1821 | 1821 | ||
| Line 1822... | Line 1822... | ||
| 1822 | // intel_hpd_irq_handler(dev, pin_mask, long_mask); |
1822 | intel_hpd_irq_handler(dev, pin_mask, long_mask); |
| 1823 | } |
1823 | } |
| 1824 | 1824 | ||
| Line 1982... | Line 1982... | ||
| 1982 | intel_get_hpd_pins(&pin_mask, &long_mask, hotplug2_trigger, |
1982 | intel_get_hpd_pins(&pin_mask, &long_mask, hotplug2_trigger, |
| 1983 | dig_hotplug_reg, hpd_spt, |
1983 | dig_hotplug_reg, hpd_spt, |
| 1984 | spt_port_hotplug2_long_detect); |
1984 | spt_port_hotplug2_long_detect); |
| 1985 | } |
1985 | } |
| Line -... | Line 1986... | ||
| - | 1986 | ||
| - | 1987 | if (pin_mask) |
|
| - | 1988 | intel_hpd_irq_handler(dev, pin_mask, long_mask); |
|
| 1986 | 1989 | ||
| 1987 | if (pch_iir & SDE_GMBUS_CPT) |
1990 | if (pch_iir & SDE_GMBUS_CPT) |
| 1988 | gmbus_irq_handler(dev); |
1991 | gmbus_irq_handler(dev); |
| Line 1989... | Line 1992... | ||
| 1989 | } |
1992 | } |
| Line 1999... | Line 2002... | ||
| 1999 | 2002 | ||
| 2000 | intel_get_hpd_pins(&pin_mask, &long_mask, hotplug_trigger, |
2003 | intel_get_hpd_pins(&pin_mask, &long_mask, hotplug_trigger, |
| 2001 | dig_hotplug_reg, hpd, |
2004 | dig_hotplug_reg, hpd, |
| Line -... | Line 2005... | ||
| - | 2005 | ilk_port_hotplug_long_detect); |
|
| 2002 | ilk_port_hotplug_long_detect); |
2006 | |
| Line 2003... | Line 2007... | ||
| 2003 | 2007 | intel_hpd_irq_handler(dev, pin_mask, long_mask); |
|
| 2004 | } |
2008 | } |
| 2005 | 2009 | ||
| 2006 | static void ilk_display_irq_handler(struct drm_device *dev, u32 de_iir) |
2010 | static void ilk_display_irq_handler(struct drm_device *dev, u32 de_iir) |
| 2007 | { |
2011 | { |
| Line 2008... | Line 2012... | ||
| 2008 | struct drm_i915_private *dev_priv = dev->dev_private; |
2012 | struct drm_i915_private *dev_priv = dev->dev_private; |
| 2009 | enum pipe pipe; |
2013 | enum pipe pipe; |
| Line 2010... | Line 2014... | ||
| 2010 | u32 hotplug_trigger = de_iir & DE_DP_A_HOTPLUG; |
2014 | u32 hotplug_trigger = de_iir & DE_DP_A_HOTPLUG; |
| 2011 | 2015 | ||
| Line 2012... | Line 2016... | ||
| 2012 | // if (hotplug_trigger) |
2016 | if (hotplug_trigger) |
| Line 2187... | Line 2191... | ||
| 2187 | 2191 | ||
| 2188 | intel_get_hpd_pins(&pin_mask, &long_mask, hotplug_trigger, |
2192 | intel_get_hpd_pins(&pin_mask, &long_mask, hotplug_trigger, |
| 2189 | dig_hotplug_reg, hpd, |
2193 | dig_hotplug_reg, hpd, |
| Line -... | Line 2194... | ||
| - | 2194 | bxt_port_hotplug_long_detect); |
|
| 2190 | bxt_port_hotplug_long_detect); |
2195 | |
| Line 2191... | Line 2196... | ||
| 2191 | 2196 | intel_hpd_irq_handler(dev, pin_mask, long_mask); |
|
| 2192 | } |
2197 | } |
| 2193 | 2198 | ||
| Line 4314... | Line 4319... | ||
| 4314 | */ |
4319 | */ |
| 4315 | void intel_irq_init(struct drm_i915_private *dev_priv) |
4320 | void intel_irq_init(struct drm_i915_private *dev_priv) |
| 4316 | { |
4321 | { |
| 4317 | struct drm_device *dev = dev_priv->dev; |
4322 | struct drm_device *dev = dev_priv->dev; |
| Line 4318... | Line 4323... | ||
| 4318 | 4323 | ||
| Line 4319... | Line 4324... | ||
| 4319 | // intel_hpd_init_work(dev_priv); |
4324 | intel_hpd_init_work(dev_priv); |
| 4320 | 4325 | ||
| Line 4321... | Line 4326... | ||
| 4321 | INIT_WORK(&dev_priv->rps.work, gen6_pm_rps_work); |
4326 | INIT_WORK(&dev_priv->rps.work, gen6_pm_rps_work); |