diff options
author | Francisco Jerez <currojerez@riseup.net> | 2009-08-01 22:19:19 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2009-08-04 00:11:00 -0400 |
commit | aeaa1ad3ff32be833680e484d99ec29d892da1ff (patch) | |
tree | ccd8a945aae9a2427da67ba74ccce83d114fb1a2 | |
parent | 74bd3c26b90f39b9dcc05c471333da8998572b5d (diff) |
drm: Define DRM_MODE_SUBCONNECTOR_SCART
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r-- | drivers/gpu/drm/drm_crtc.c | 2 | ||||
-rw-r--r-- | include/drm/drm_mode.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index c7ab80b45e3f..ed53c5c37ac4 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c | |||
@@ -108,6 +108,7 @@ static struct drm_prop_enum_list drm_tv_select_enum_list[] = | |||
108 | { DRM_MODE_SUBCONNECTOR_Composite, "Composite" }, /* TV-out */ | 108 | { DRM_MODE_SUBCONNECTOR_Composite, "Composite" }, /* TV-out */ |
109 | { DRM_MODE_SUBCONNECTOR_SVIDEO, "SVIDEO" }, /* TV-out */ | 109 | { DRM_MODE_SUBCONNECTOR_SVIDEO, "SVIDEO" }, /* TV-out */ |
110 | { DRM_MODE_SUBCONNECTOR_Component, "Component" }, /* TV-out */ | 110 | { DRM_MODE_SUBCONNECTOR_Component, "Component" }, /* TV-out */ |
111 | { DRM_MODE_SUBCONNECTOR_SCART, "SCART" }, /* TV-out */ | ||
111 | }; | 112 | }; |
112 | 113 | ||
113 | DRM_ENUM_NAME_FN(drm_get_tv_select_name, drm_tv_select_enum_list) | 114 | DRM_ENUM_NAME_FN(drm_get_tv_select_name, drm_tv_select_enum_list) |
@@ -118,6 +119,7 @@ static struct drm_prop_enum_list drm_tv_subconnector_enum_list[] = | |||
118 | { DRM_MODE_SUBCONNECTOR_Composite, "Composite" }, /* TV-out */ | 119 | { DRM_MODE_SUBCONNECTOR_Composite, "Composite" }, /* TV-out */ |
119 | { DRM_MODE_SUBCONNECTOR_SVIDEO, "SVIDEO" }, /* TV-out */ | 120 | { DRM_MODE_SUBCONNECTOR_SVIDEO, "SVIDEO" }, /* TV-out */ |
120 | { DRM_MODE_SUBCONNECTOR_Component, "Component" }, /* TV-out */ | 121 | { DRM_MODE_SUBCONNECTOR_Component, "Component" }, /* TV-out */ |
122 | { DRM_MODE_SUBCONNECTOR_SCART, "SCART" }, /* TV-out */ | ||
121 | }; | 123 | }; |
122 | 124 | ||
123 | DRM_ENUM_NAME_FN(drm_get_tv_subconnector_name, | 125 | DRM_ENUM_NAME_FN(drm_get_tv_subconnector_name, |
diff --git a/include/drm/drm_mode.h b/include/drm/drm_mode.h index c51e9f528c8f..616aeb42b773 100644 --- a/include/drm/drm_mode.h +++ b/include/drm/drm_mode.h | |||
@@ -141,6 +141,7 @@ struct drm_mode_get_encoder { | |||
141 | #define DRM_MODE_SUBCONNECTOR_Composite 5 | 141 | #define DRM_MODE_SUBCONNECTOR_Composite 5 |
142 | #define DRM_MODE_SUBCONNECTOR_SVIDEO 6 | 142 | #define DRM_MODE_SUBCONNECTOR_SVIDEO 6 |
143 | #define DRM_MODE_SUBCONNECTOR_Component 8 | 143 | #define DRM_MODE_SUBCONNECTOR_Component 8 |
144 | #define DRM_MODE_SUBCONNECTOR_SCART 9 | ||
144 | 145 | ||
145 | #define DRM_MODE_CONNECTOR_Unknown 0 | 146 | #define DRM_MODE_CONNECTOR_Unknown 0 |
146 | #define DRM_MODE_CONNECTOR_VGA 1 | 147 | #define DRM_MODE_CONNECTOR_VGA 1 |