diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2011-10-14 23:55:47 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2011-12-21 19:01:21 +1000 |
| commit | 4ceca5f8649125645fc4e7f178a1dca1345ab9b4 (patch) | |
| tree | ebbbb793f81c4fcda6d84a22d323e003d9ec1471 /drivers | |
| parent | de69185573586302ada2e59ba41835df36986277 (diff) | |
drm/nouveau: don't pretend to support the DVI-I 'select subconnector' prop
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_connector.c | 5 | ||||
| -rw-r--r-- | 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 a8da98fe1282..592fcfb9b389 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 bfc0090ddcf1..38623a25d0b1 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; |