Commit 939fe4d7 authored by Chris Wilson's avatar Chris Wilson

drm/i915: Remove duplicate set of ADPA definitions

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent 83e41eb9
...@@ -661,13 +661,6 @@ ...@@ -661,13 +661,6 @@
#define LVDS 0x61180 #define LVDS 0x61180
#define LVDS_ON (1<<31) #define LVDS_ON (1<<31)
#define ADPA 0x61100
#define ADPA_DPMS_MASK (~(3<<10))
#define ADPA_DPMS_ON (0<<10)
#define ADPA_DPMS_SUSPEND (1<<10)
#define ADPA_DPMS_STANDBY (2<<10)
#define ADPA_DPMS_OFF (3<<10)
/* Scratch pad debug 0 reg: /* Scratch pad debug 0 reg:
*/ */
#define DPLL_FPA01_P1_POST_DIV_MASK_I830 0x001f0000 #define DPLL_FPA01_P1_POST_DIV_MASK_I830 0x001f0000
...@@ -1200,6 +1193,7 @@ ...@@ -1200,6 +1193,7 @@
#define ADPA_DPMS_STANDBY (2<<10) #define ADPA_DPMS_STANDBY (2<<10)
#define ADPA_DPMS_OFF (3<<10) #define ADPA_DPMS_OFF (3<<10)
/* Hotplug control (945+ only) */ /* Hotplug control (945+ only) */
#define PORT_HOTPLUG_EN 0x61110 #define PORT_HOTPLUG_EN 0x61110
#define HDMIB_HOTPLUG_INT_EN (1 << 29) #define HDMIB_HOTPLUG_INT_EN (1 << 29)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment