diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2010-03-15 09:43:51 +1000 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2010-03-15 09:47:00 +1000 |
commit | f4053509669f904aec70c51e2ff75563ba7ae823 (patch) | |
tree | ad9e422bbf4de8eee264df57795c57cb06e18064 /drivers/gpu/drm/nouveau/nouveau_connector.c | |
parent | 965cf68e8797932e9cd49238a6dd39423ac9b256 (diff) | |
download | linux-stable-f4053509669f904aec70c51e2ff75563ba7ae823.tar.gz linux-stable-f4053509669f904aec70c51e2ff75563ba7ae823.tar.bz2 linux-stable-f4053509669f904aec70c51e2ff75563ba7ae823.zip |
drm/nouveau: add module option to disable TV detection
Intended to be used as a workaround in cases where we falsely detect
that a TV is connected when it's not.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_connector.c')
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_connector.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c index 24327f468c4b..14afe1e47e57 100644 --- a/drivers/gpu/drm/nouveau/nouveau_connector.c +++ b/drivers/gpu/drm/nouveau/nouveau_connector.c @@ -302,7 +302,7 @@ nouveau_connector_detect(struct drm_connector *connector) detect_analog: nv_encoder = find_encoder_by_type(connector, OUTPUT_ANALOG); - if (!nv_encoder) + if (!nv_encoder && !nouveau_tv_disable) nv_encoder = find_encoder_by_type(connector, OUTPUT_TV); if (nv_encoder) { struct drm_encoder *encoder = to_drm_encoder(nv_encoder); |