aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancisco Jerez <currojerez@riseup.net>2010-10-23 17:12:37 -0400
committerBen Skeggs <bskeggs@redhat.com>2010-11-17 23:38:43 -0500
commit06ef3e61dd44f76fef89d8e7ad5d6c845f3f345e (patch)
treec4e5674320fde9ab567abcc20683da8c09ad410d
parent01db363979e96115a895f35c823303660f0f328d (diff)
drm/nouveau: Don't poll LVDS outputs.
Reported-by: Xavier Chantry <chantry.xavier@gmail.com> Signed-off-by: Francisco Jerez <currojerez@riseup.net> Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_connector.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c
index 9ec2b8a81344..1dd52dbfad46 100644
--- a/drivers/gpu/drm/nouveau/nouveau_connector.c
+++ b/drivers/gpu/drm/nouveau/nouveau_connector.c
@@ -888,10 +888,12 @@ nouveau_connector_create(struct drm_device *dev, int index)
888 nv_connector->use_dithering ? 888 nv_connector->use_dithering ?
889 DRM_MODE_DITHERING_ON : DRM_MODE_DITHERING_OFF); 889 DRM_MODE_DITHERING_ON : DRM_MODE_DITHERING_OFF);
890 890
891 if (dev_priv->card_type >= NV_50) 891 if (dcb->type != DCB_CONNECTOR_LVDS) {
892 connector->polled = DRM_CONNECTOR_POLL_HPD; 892 if (dev_priv->card_type >= NV_50)
893 else 893 connector->polled = DRM_CONNECTOR_POLL_HPD;
894 connector->polled = DRM_CONNECTOR_POLL_CONNECT; 894 else
895 connector->polled = DRM_CONNECTOR_POLL_CONNECT;
896 }
895 break; 897 break;
896 } 898 }
897 899