From 4ceca5f8649125645fc4e7f178a1dca1345ab9b4 Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Fri, 14 Oct 2011 23:55:47 +1000 Subject: [PATCH] drm/nouveau: don't pretend to support the DVI-I 'select subconnector' prop Signed-off-by: Ben Skeggs --- drivers/gpu/drm/nouveau/nouveau_connector.c | 5 +---- drivers/gpu/drm/nouveau/nouveau_display.c | 1 + 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c index a8da98f..592fcfb 100644 --- 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 bfc0090..38623a2 100644 --- 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; -- 2.7.4