diff options
| author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2009-12-11 11:07:17 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2009-12-16 14:00:05 -0800 |
| commit | b01f2c3a4a37d09a47ad73ccbb46d554d21cfeb0 (patch) | |
| tree | 66624c9810c8175e403a047113f35aef61e925b6 /drivers/gpu/drm/i915/i915_reg.h | |
| parent | b295d1b6e3e3f240d27cbe556d33ff5eb54721a7 (diff) | |
| download | lwn-b01f2c3a4a37d09a47ad73ccbb46d554d21cfeb0.tar.gz lwn-b01f2c3a4a37d09a47ad73ccbb46d554d21cfeb0.zip | |
drm/i915: only enable hotplug for detected outputs
This patch changes around our hotplug enable code a bit to only enable
it for ports we actually detect and initialize. This prevents problems
with stuck or spurious interrupts on outputs that aren't actually wired
up, and is generally more correct.
Fixes FDO bug #23183.
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_reg.h')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_reg.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index 974b3cf70618..f79b13324faf 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h @@ -879,13 +879,6 @@ #define CRT_HOTPLUG_DETECT_VOLTAGE_475MV (1 << 2) #define CRT_HOTPLUG_MASK (0x3fc) /* Bits 9-2 */ #define CRT_FORCE_HOTPLUG_MASK 0xfffffe1f -#define HOTPLUG_EN_MASK (HDMIB_HOTPLUG_INT_EN | \ - HDMIC_HOTPLUG_INT_EN | \ - HDMID_HOTPLUG_INT_EN | \ - SDVOB_HOTPLUG_INT_EN | \ - SDVOC_HOTPLUG_INT_EN | \ - CRT_HOTPLUG_INT_EN) - #define PORT_HOTPLUG_STAT 0x61114 #define HDMIB_HOTPLUG_INT_STATUS (1 << 29) |