diff options
| author | Adam Jackson <ajax@redhat.com> | 2010-05-24 16:46:29 -0400 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2010-05-26 16:53:20 -0400 |
| commit | 7a772c492fcfffae812ffca78a628e76fa57fe58 (patch) | |
| tree | 1e837133d9b386cc11773f1ba3ed265b6907068c /drivers/gpu/drm/i915/i915_reg.h | |
| parent | 734b4157b367d66405f7dab80085d17c9c8dd3b5 (diff) | |
drm/i915/gen4: Extra CRT hotplug paranoia
Disable the CRT plug interrupt while doing the force cycle, explicitly
clear any CRT interrupt we may have generated, and restore when done.
Should mitigate interrupt storms from hotplug detection.
Signed-off-by: Adam Jackson <ajax@redhat.com>
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 | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index 784cf3c914e..7a726840efa 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h | |||
| @@ -1067,7 +1067,6 @@ | |||
| 1067 | #define CRT_HOTPLUG_DETECT_VOLTAGE_325MV (0 << 2) | 1067 | #define CRT_HOTPLUG_DETECT_VOLTAGE_325MV (0 << 2) |
| 1068 | #define CRT_HOTPLUG_DETECT_VOLTAGE_475MV (1 << 2) | 1068 | #define CRT_HOTPLUG_DETECT_VOLTAGE_475MV (1 << 2) |
| 1069 | #define CRT_HOTPLUG_MASK (0x3fc) /* Bits 9-2 */ | 1069 | #define CRT_HOTPLUG_MASK (0x3fc) /* Bits 9-2 */ |
| 1070 | #define CRT_FORCE_HOTPLUG_MASK 0xfffffe1f | ||
| 1071 | 1070 | ||
| 1072 | #define PORT_HOTPLUG_STAT 0x61114 | 1071 | #define PORT_HOTPLUG_STAT 0x61114 |
| 1073 | #define HDMIB_HOTPLUG_INT_STATUS (1 << 29) | 1072 | #define HDMIB_HOTPLUG_INT_STATUS (1 << 29) |