drm/nouveau: add bios connector type for dms59

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

2 files changed, 8 insertions, 7 deletions

diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.h b/drivers/gpu/drm/nouveau/nouveau_bios.h
index 1f3233df00e6..298a3af48d14 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bios.h
+++ b/drivers/gpu/drm/nouveau/nouveau_bios.h
@@ -69,6 +69,8 @@ enum dcb_connector_type {
         DCB_CONNECTOR_TV_3 = 0x13,
         DCB_CONNECTOR_DVI_I = 0x30,
         DCB_CONNECTOR_DVI_D = 0x31,
+        DCB_CONNECTOR_DMS59_0 = 0x38,
+        DCB_CONNECTOR_DMS59_1 = 0x39,
         DCB_CONNECTOR_LVDS = 0x40,
         DCB_CONNECTOR_LVDS_SPWG = 0x41,
         DCB_CONNECTOR_DP = 0x46,
diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c
index 9f9d50dbca7f..8f510fd956b0 100644
--- a/drivers/gpu/drm/nouveau/nouveau_connector.c
+++ b/drivers/gpu/drm/nouveau/nouveau_connector.c
@@ -867,6 +867,8 @@ drm_conntype_from_dcb(enum dcb_connector_type dcb)
         case DCB_CONNECTOR_TV_0     :
         case DCB_CONNECTOR_TV_1     :
         case DCB_CONNECTOR_TV_3     : return DRM_MODE_CONNECTOR_TV;
+        case DCB_CONNECTOR_DMS59_0  :
+        case DCB_CONNECTOR_DMS59_1  :
         case DCB_CONNECTOR_DVI_I    : return DRM_MODE_CONNECTOR_DVII;
         case DCB_CONNECTOR_DVI_D    : return DRM_MODE_CONNECTOR_DVID;
         case DCB_CONNECTOR_LVDS     :
@@ -1013,13 +1015,10 @@ nouveau_connector_create(struct drm_device *dev, int index)
 
         /* Add overscan compensation options to digital outputs */
         if (disp->underscan_property &&
-            (nv_connector->type == DCB_CONNECTOR_DVI_D ||
-             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_DMS59_DP0 ||
-             nv_connector->type == DCB_CONNECTOR_DMS59_DP1)) {
+            (type == DRM_MODE_CONNECTOR_DVID ||
+             type == DRM_MODE_CONNECTOR_DVII ||
+             type == DRM_MODE_CONNECTOR_HDMIA ||
+             type == DRM_MODE_CONNECTOR_DisplayPort)) {
                 drm_connector_attach_property(connector,
                                               disp->underscan_property,
                                               UNDERSCAN_OFF);