diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2012-01-12 01:17:16 -0500 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2012-03-13 03:09:23 -0400 |
commit | 4abb410a13eec3f49863be2e84ad062fef00dac0 (patch) | |
tree | 29a05dcc2d44af50f5825fc6cdd86c6438dfc233 | |
parent | 070be296b65d120c2fef58a5435f159ae32c4995 (diff) |
drm/nouveau: recognise DCB connector type for DP+DVI+VGA DMS-59
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_bios.h | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_connector.c | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.h b/drivers/gpu/drm/nouveau/nouveau_bios.h index a37c31e358aa..0fc4e21c748b 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bios.h +++ b/drivers/gpu/drm/nouveau/nouveau_bios.h | |||
@@ -75,6 +75,8 @@ enum dcb_connector_type { | |||
75 | DCB_CONNECTOR_eDP = 0x47, | 75 | DCB_CONNECTOR_eDP = 0x47, |
76 | DCB_CONNECTOR_HDMI_0 = 0x60, | 76 | DCB_CONNECTOR_HDMI_0 = 0x60, |
77 | DCB_CONNECTOR_HDMI_1 = 0x61, | 77 | DCB_CONNECTOR_HDMI_1 = 0x61, |
78 | DCB_CONNECTOR_DMS59_DP0 = 0x64, | ||
79 | DCB_CONNECTOR_DMS59_DP1 = 0x65, | ||
78 | DCB_CONNECTOR_NONE = 0xff | 80 | DCB_CONNECTOR_NONE = 0xff |
79 | }; | 81 | }; |
80 | 82 | ||
diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c index f3ce34be082a..cdae563be5bd 100644 --- a/drivers/gpu/drm/nouveau/nouveau_connector.c +++ b/drivers/gpu/drm/nouveau/nouveau_connector.c | |||
@@ -858,6 +858,8 @@ drm_conntype_from_dcb(enum dcb_connector_type dcb) | |||
858 | case DCB_CONNECTOR_DVI_D : return DRM_MODE_CONNECTOR_DVID; | 858 | case DCB_CONNECTOR_DVI_D : return DRM_MODE_CONNECTOR_DVID; |
859 | case DCB_CONNECTOR_LVDS : | 859 | case DCB_CONNECTOR_LVDS : |
860 | case DCB_CONNECTOR_LVDS_SPWG: return DRM_MODE_CONNECTOR_LVDS; | 860 | case DCB_CONNECTOR_LVDS_SPWG: return DRM_MODE_CONNECTOR_LVDS; |
861 | case DCB_CONNECTOR_DMS59_DP0: | ||
862 | case DCB_CONNECTOR_DMS59_DP1: | ||
861 | case DCB_CONNECTOR_DP : return DRM_MODE_CONNECTOR_DisplayPort; | 863 | case DCB_CONNECTOR_DP : return DRM_MODE_CONNECTOR_DisplayPort; |
862 | case DCB_CONNECTOR_eDP : return DRM_MODE_CONNECTOR_eDP; | 864 | case DCB_CONNECTOR_eDP : return DRM_MODE_CONNECTOR_eDP; |
863 | case DCB_CONNECTOR_HDMI_0 : | 865 | case DCB_CONNECTOR_HDMI_0 : |
@@ -1002,7 +1004,9 @@ nouveau_connector_create(struct drm_device *dev, int index) | |||
1002 | nv_connector->type == DCB_CONNECTOR_DVI_I || | 1004 | nv_connector->type == DCB_CONNECTOR_DVI_I || |
1003 | nv_connector->type == DCB_CONNECTOR_HDMI_0 || | 1005 | nv_connector->type == DCB_CONNECTOR_HDMI_0 || |
1004 | nv_connector->type == DCB_CONNECTOR_HDMI_1 || | 1006 | nv_connector->type == DCB_CONNECTOR_HDMI_1 || |
1005 | nv_connector->type == DCB_CONNECTOR_DP)) { | 1007 | nv_connector->type == DCB_CONNECTOR_DP || |
1008 | nv_connector->type == DCB_CONNECTOR_DMS59_DP0 || | ||
1009 | nv_connector->type == DCB_CONNECTOR_DMS59_DP1)) { | ||
1006 | drm_connector_attach_property(connector, | 1010 | drm_connector_attach_property(connector, |
1007 | disp->underscan_property, | 1011 | disp->underscan_property, |
1008 | UNDERSCAN_OFF); | 1012 | UNDERSCAN_OFF); |