diff options
| author | Maarten Lankhorst <maarten.lankhorst@canonical.com> | 2012-11-08 17:19:38 +0100 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2012-11-09 13:43:08 +1000 |
| commit | df285500b203a5603b1cdd1b16f42ab7a3544d7b (patch) | |
| tree | fba817f6633484725cfb8e64db34181be9bd61b5 | |
| parent | 11d92561c81be2f4a7af37f035e1af294b960abe (diff) | |
| download | op-kernel-dev-df285500b203a5603b1cdd1b16f42ab7a3544d7b.zip op-kernel-dev-df285500b203a5603b1cdd1b16f42ab7a3544d7b.tar.gz | |
drm/nouveau: fix acpi edid retrieval
Commit c0077061e7ea accidentally inverted the logic for nouveau_acpi_edid,
causing it to only show a connector as connected when the edid could not
be retrieved with acpi.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| -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 9a6e2cb..d3595b2 100644 --- a/drivers/gpu/drm/nouveau/nouveau_connector.c +++ b/drivers/gpu/drm/nouveau/nouveau_connector.c @@ -355,7 +355,7 @@ nouveau_connector_detect_lvds(struct drm_connector *connector, bool force) * valid - it's not (rh#613284) */ if (nv_encoder->dcb->lvdsconf.use_acpi_for_edid) { - if (!(nv_connector->edid = nouveau_acpi_edid(dev, connector))) { + if ((nv_connector->edid = nouveau_acpi_edid(dev, connector))) { status = connector_status_connected; goto out; } |
