diff options
| author | Shaohua Li <shaohua.li@intel.com> | 2009-10-14 05:19:28 -0400 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2009-11-30 12:42:12 -0500 |
| commit | 26444877812fb2a2b9301b0b3702fdf9f9e06e4b (patch) | |
| tree | e71ddd54f1ead80ebbd20ab4936b301a6f4593f7 /drivers/gpu/drm/i915/i915_reg.h | |
| parent | 311089d3d372c6f2b01a6d8a5ed7fcbcd9ad7621 (diff) | |
drm/i915: remove Pineview EOS protection support
HW guys have an evaluation about the impact about EOS, and say the impact
is quite small, so they have removed EOS detection support. This patch
removes EOS feature.
revert commit 043029655816ed4cfc2ed247020ef97e5d637392
directly reverting it gives a hunk error, so please use this one.
Signed-off-by: Shaohua Li <shaohua.li@intel.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
[anholt: fixed up commit message for update that the feature's really gone]
Diffstat (limited to 'drivers/gpu/drm/i915/i915_reg.h')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_reg.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index b11a682a4cff..d58f7ad91161 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h | |||
| @@ -852,7 +852,6 @@ | |||
| 852 | #define SDVOB_HOTPLUG_INT_EN (1 << 26) | 852 | #define SDVOB_HOTPLUG_INT_EN (1 << 26) |
| 853 | #define SDVOC_HOTPLUG_INT_EN (1 << 25) | 853 | #define SDVOC_HOTPLUG_INT_EN (1 << 25) |
| 854 | #define TV_HOTPLUG_INT_EN (1 << 18) | 854 | #define TV_HOTPLUG_INT_EN (1 << 18) |
| 855 | #define CRT_EOS_INT_EN (1 << 10) | ||
| 856 | #define CRT_HOTPLUG_INT_EN (1 << 9) | 855 | #define CRT_HOTPLUG_INT_EN (1 << 9) |
| 857 | #define CRT_HOTPLUG_FORCE_DETECT (1 << 3) | 856 | #define CRT_HOTPLUG_FORCE_DETECT (1 << 3) |
| 858 | #define CRT_HOTPLUG_ACTIVATION_PERIOD_32 (0 << 8) | 857 | #define CRT_HOTPLUG_ACTIVATION_PERIOD_32 (0 << 8) |
| @@ -887,7 +886,6 @@ | |||
| 887 | #define DPC_HOTPLUG_INT_STATUS (1 << 28) | 886 | #define DPC_HOTPLUG_INT_STATUS (1 << 28) |
| 888 | #define HDMID_HOTPLUG_INT_STATUS (1 << 27) | 887 | #define HDMID_HOTPLUG_INT_STATUS (1 << 27) |
| 889 | #define DPD_HOTPLUG_INT_STATUS (1 << 27) | 888 | #define DPD_HOTPLUG_INT_STATUS (1 << 27) |
| 890 | #define CRT_EOS_INT_STATUS (1 << 12) | ||
| 891 | #define CRT_HOTPLUG_INT_STATUS (1 << 11) | 889 | #define CRT_HOTPLUG_INT_STATUS (1 << 11) |
| 892 | #define TV_HOTPLUG_INT_STATUS (1 << 10) | 890 | #define TV_HOTPLUG_INT_STATUS (1 << 10) |
| 893 | #define CRT_HOTPLUG_MONITOR_MASK (3 << 8) | 891 | #define CRT_HOTPLUG_MONITOR_MASK (3 << 8) |