diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-01-10 23:42:58 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-01-10 23:42:58 -0500 |
| commit | 0c9d2c418aa4a45534943c4c9a1c8dda82d3b481 (patch) | |
| tree | 7844c421b7bd20b9b4e9c17b425ee050653eb407 /include | |
| parent | 94fd163d86b049842856864cdeac318131ec576d (diff) | |
| parent | 804c7559e9376c3ba78ae15a30337b1e24f8ae80 (diff) | |
Merge remote branch 'korg/drm-radeon-next' into drm-linus
* korg/drm-radeon-next:
drm/radeon/kms: add additional safe regs for r4xx/rs6xx and r5xx
drm/radeon/kms: Don't try to enable IRQ if we have no handler installed
drm: Avoid calling vblank function is vblank wasn't initialized
drm/radeon: mkregtable.c: close a file before exit
drm/radeon/kms: Make sure we release AGP device if we acquired it
drm/radeon/kms: Schedule host path read cache flush through the ring V2
drm/radeon/kms: Workaround RV410/R420 CP errata (V3)
drm/radeon/kms: detect sideport memory on IGP chips
drm/radeon: fix a couple of array index errors
drm/radeon/kms: add support for eDP (embedded DisplayPort)
drm: Add eDP connector type
drm/radeon/kms: pull in the latest upstream ObjectID.h changes
drm/radeon/kms: whitespace changes to ObjectID.h
drm/radeon/kms: fix typo in atom connector type handling
Diffstat (limited to 'include')
| -rw-r--r-- | include/drm/drm_mode.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/drm/drm_mode.h b/include/drm/drm_mode.h index 43009bc2e757..bc4fdf27bd2e 100644 --- a/include/drm/drm_mode.h +++ b/include/drm/drm_mode.h | |||
| @@ -160,6 +160,7 @@ struct drm_mode_get_encoder { | |||
| 160 | #define DRM_MODE_CONNECTOR_HDMIA 11 | 160 | #define DRM_MODE_CONNECTOR_HDMIA 11 |
| 161 | #define DRM_MODE_CONNECTOR_HDMIB 12 | 161 | #define DRM_MODE_CONNECTOR_HDMIB 12 |
| 162 | #define DRM_MODE_CONNECTOR_TV 13 | 162 | #define DRM_MODE_CONNECTOR_TV 13 |
| 163 | #define DRM_MODE_CONNECTOR_eDP 14 | ||
| 163 | 164 | ||
| 164 | struct drm_mode_get_connector { | 165 | struct drm_mode_get_connector { |
| 165 | 166 | ||