diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2012-07-25 18:51:21 -0400 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2012-10-02 23:12:57 -0400 |
commit | c0077061e7ea3a8c1c316c87a79976bf8f00beb5 (patch) | |
tree | 8e9219dafef3c0c04ceb15be8fe04ffba0b1649d /drivers/gpu/drm/nouveau/nouveau_connector.c | |
parent | d38ac5217ab43cf61e8ebe6d7114fb2d1ca9a3a4 (diff) |
drm/nouveau/acpi: move definitions out of nouveau_drv.h
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 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c index bd0985a4ff64..5dbf2e45993d 100644 --- a/drivers/gpu/drm/nouveau/nouveau_connector.c +++ b/drivers/gpu/drm/nouveau/nouveau_connector.c | |||
@@ -36,6 +36,7 @@ | |||
36 | #include "nouveau_crtc.h" | 36 | #include "nouveau_crtc.h" |
37 | #include "nouveau_connector.h" | 37 | #include "nouveau_connector.h" |
38 | #include "nouveau_hw.h" | 38 | #include "nouveau_hw.h" |
39 | #include "nouveau_acpi.h" | ||
39 | 40 | ||
40 | #include <subdev/bios/gpio.h> | 41 | #include <subdev/bios/gpio.h> |
41 | 42 | ||
@@ -335,7 +336,7 @@ nouveau_connector_detect_lvds(struct drm_connector *connector, bool force) | |||
335 | * valid - it's not (rh#613284) | 336 | * valid - it's not (rh#613284) |
336 | */ | 337 | */ |
337 | if (nv_encoder->dcb->lvdsconf.use_acpi_for_edid) { | 338 | if (nv_encoder->dcb->lvdsconf.use_acpi_for_edid) { |
338 | if (!nouveau_acpi_edid(dev, connector)) { | 339 | if (!(nv_connector->edid = nouveau_acpi_edid(dev, connector))) { |
339 | status = connector_status_connected; | 340 | status = connector_status_connected; |
340 | goto out; | 341 | goto out; |
341 | } | 342 | } |