diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-11-23 21:47:41 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-11-23 21:47:41 +0100 |
commit | 58a273745fbb2fbd01d26e7a60f0acc8c1d99469 (patch) | |
tree | bc16200f3b6ea150b298422754e32959eaa339bc /include/drm/drm_dp_helper.h | |
parent | driver: pcmcia: replace IRQ_GPIO() with gpio_to_irq() (diff) | |
parent | macb: allow GEM to have configurable receive buffer size (diff) | |
download | linux-58a273745fbb2fbd01d26e7a60f0acc8c1d99469.tar.xz linux-58a273745fbb2fbd01d26e7a60f0acc8c1d99469.zip |
Merge branches 'drivers/macb-gem' and 'drivers/pxa-gpio' into next/drivers
Diffstat (limited to 'include/drm/drm_dp_helper.h')
-rw-r--r-- | include/drm/drm_dp_helper.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/drm/drm_dp_helper.h b/include/drm/drm_dp_helper.h index 0d2f727e96be..93df2d72750b 100644 --- a/include/drm/drm_dp_helper.h +++ b/include/drm/drm_dp_helper.h @@ -72,6 +72,7 @@ #define DP_MAIN_LINK_CHANNEL_CODING 0x006 +#define DP_EDP_CONFIGURATION_CAP 0x00d #define DP_TRAINING_AUX_RD_INTERVAL 0x00e #define DP_PSR_SUPPORT 0x070 @@ -159,6 +160,8 @@ # define DP_CP_IRQ (1 << 2) # define DP_SINK_SPECIFIC_IRQ (1 << 6) +#define DP_EDP_CONFIGURATION_SET 0x10a + #define DP_LANE0_1_STATUS 0x202 #define DP_LANE2_3_STATUS 0x203 # define DP_LANE_CR_DONE (1 << 0) |