From a395304ecd6be8a07e21f104d1b0a0e3a9eff284 Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Fri, 14 Oct 2011 23:55:47 +1000 Subject: [PATCH] --- yaml --- r: 282590 b: refs/heads/master c: 4ceca5f8649125645fc4e7f178a1dca1345ab9b4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_connector.c | 5 +---- trunk/drivers/gpu/drm/nouveau/nouveau_display.c | 1 + 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 8f53f97e1104..e5991b45d2ea 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: de69185573586302ada2e59ba41835df36986277 +refs/heads/master: 4ceca5f8649125645fc4e7f178a1dca1345ab9b4 diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_connector.c b/trunk/drivers/gpu/drm/nouveau/nouveau_connector.c index a8da98fe1282..592fcfb9b389 100644 --- a/trunk/drivers/gpu/drm/nouveau/nouveau_connector.c +++ b/trunk/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/trunk/drivers/gpu/drm/nouveau/nouveau_display.c b/trunk/drivers/gpu/drm/nouveau/nouveau_display.c index bfc0090ddcf1..38623a25d0b1 100644 --- a/trunk/drivers/gpu/drm/nouveau/nouveau_display.c +++ b/trunk/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;