diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-10-09 05:33:26 -0400 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-10-19 04:16:19 -0400 |
commit | 939fe4d7d6e2c92370ca5d1fb70e81043f5ff8d9 (patch) | |
tree | cffcf208f082ebb9cd5a93781c057393230647a3 | |
parent | 83e41eb9cc3de6c08d63bbcf2c953bfbf65c025c (diff) |
drm/i915: Remove duplicate set of ADPA definitions
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-rw-r--r-- | drivers/gpu/drm/i915/i915_reg.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index 47032186a31a..557f27134d05 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h | |||
@@ -661,13 +661,6 @@ | |||
661 | #define LVDS 0x61180 | 661 | #define LVDS 0x61180 |
662 | #define LVDS_ON (1<<31) | 662 | #define LVDS_ON (1<<31) |
663 | 663 | ||
664 | #define ADPA 0x61100 | ||
665 | #define ADPA_DPMS_MASK (~(3<<10)) | ||
666 | #define ADPA_DPMS_ON (0<<10) | ||
667 | #define ADPA_DPMS_SUSPEND (1<<10) | ||
668 | #define ADPA_DPMS_STANDBY (2<<10) | ||
669 | #define ADPA_DPMS_OFF (3<<10) | ||
670 | |||
671 | /* Scratch pad debug 0 reg: | 664 | /* Scratch pad debug 0 reg: |
672 | */ | 665 | */ |
673 | #define DPLL_FPA01_P1_POST_DIV_MASK_I830 0x001f0000 | 666 | #define DPLL_FPA01_P1_POST_DIV_MASK_I830 0x001f0000 |
@@ -1200,6 +1193,7 @@ | |||
1200 | #define ADPA_DPMS_STANDBY (2<<10) | 1193 | #define ADPA_DPMS_STANDBY (2<<10) |
1201 | #define ADPA_DPMS_OFF (3<<10) | 1194 | #define ADPA_DPMS_OFF (3<<10) |
1202 | 1195 | ||
1196 | |||
1203 | /* Hotplug control (945+ only) */ | 1197 | /* Hotplug control (945+ only) */ |
1204 | #define PORT_HOTPLUG_EN 0x61110 | 1198 | #define PORT_HOTPLUG_EN 0x61110 |
1205 | #define HDMIB_HOTPLUG_INT_EN (1 << 29) | 1199 | #define HDMIB_HOTPLUG_INT_EN (1 << 29) |