drm/nouveau: recognise DCB connector type for DP+DVI+VGA DMS-59

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.h b/drivers/gpu/drm/nouveau/nouveau_bios.h
index a37c31e358aa40eb9a6e618c9c59459b8233329b..0fc4e21c748b6fd7610f693c8e35f138794568a7 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_bios.h
+++ b/drivers/gpu/drm/nouveau/nouveau_bios.h
@@ -75,6 +75,8 @@ enum dcb_connector_type {
        DCB_CONNECTOR_eDP = 0x47,
        DCB_CONNECTOR_HDMI_0 = 0x60,
        DCB_CONNECTOR_HDMI_1 = 0x61,
+       DCB_CONNECTOR_DMS59_DP0 = 0x64,
+       DCB_CONNECTOR_DMS59_DP1 = 0x65,
        DCB_CONNECTOR_NONE = 0xff
 };
 

diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c
index f3ce34be082a7d5ad82b651de6978e2f63111ce2..cdae563be5bde8177741acb8886306c308c30dc7 100644 (file)
--- 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)
        case DCB_CONNECTOR_DVI_D    : return DRM_MODE_CONNECTOR_DVID;
        case DCB_CONNECTOR_LVDS     :
        case DCB_CONNECTOR_LVDS_SPWG: return DRM_MODE_CONNECTOR_LVDS;
+       case DCB_CONNECTOR_DMS59_DP0:
+       case DCB_CONNECTOR_DMS59_DP1:
        case DCB_CONNECTOR_DP       : return DRM_MODE_CONNECTOR_DisplayPort;
        case DCB_CONNECTOR_eDP      : return DRM_MODE_CONNECTOR_eDP;
        case DCB_CONNECTOR_HDMI_0   :
@@ -1002,7 +1004,9 @@ nouveau_connector_create(struct drm_device *dev, int index)
             nv_connector->type == DCB_CONNECTOR_DVI_I ||
             nv_connector->type == DCB_CONNECTOR_HDMI_0 ||
             nv_connector->type == DCB_CONNECTOR_HDMI_1 ||
-            nv_connector->type == DCB_CONNECTOR_DP)) {
+            nv_connector->type == DCB_CONNECTOR_DP ||
+            nv_connector->type == DCB_CONNECTOR_DMS59_DP0 ||
+            nv_connector->type == DCB_CONNECTOR_DMS59_DP1)) {
                drm_connector_attach_property(connector,
                                              disp->underscan_property,
                                              UNDERSCAN_OFF);