drm/nouveau: don't pretend to support the DVI-I 'select subconnector' prop

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

diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c
index a8da98fe1282601cad899ef5791f68cbed4e1499..592fcfb9b389755b5ef64a7f8c4219637047b77f 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_connector.c
+++ b/drivers/gpu/drm/nouveau/nouveau_connector.c
@@ -935,11 +935,8 @@ nouveau_connector_create(struct drm_device *dev, int index)
        }
 
        /* Init DVI-I specific properties */
-       if (dcb->type == DCB_CONNECTOR_DVI_I) {
-               drm_mode_create_dvi_i_properties(dev);
+       if (dcb->type == DCB_CONNECTOR_DVI_I)
                drm_connector_attach_property(connector, dev->mode_config.dvi_i_subconnector_property, 0);
-               drm_connector_attach_property(connector, dev->mode_config.dvi_i_select_subconnector_property, 0);
-       }
 
        /* Add overscan compensation options to digital outputs */
        if (disp->underscan_property &&

diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c
index bfc0090ddcf16df8d1f02a8712e962c63e4a66d4..38623a25d0b19cf76fe4df44c7af199251ea4b68 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_display.c
+++ b/drivers/gpu/drm/nouveau/nouveau_display.c
@@ -215,6 +215,7 @@ nouveau_display_create(struct drm_device *dev)
 
        drm_mode_config_init(dev);
        drm_mode_create_scaling_mode_property(dev);
+       drm_mode_create_dvi_i_properties(dev);
 
        if (dev_priv->card_type < NV_50)
                gen = 0;