Skip to content

Commit

Permalink
drm/i915/lvds: Always return connected in the absence of better infor…
Browse files Browse the repository at this point in the history
…mation

The LVDS connector should default to connected. We tried our best to
verify the claims of the BIOS that the hardware exists during init(),
and then during detect() we then try to verify that the panel is open.
In the event of an unsuccessful query, we should then always report
that the LVDS panel is connected. This was only the case for gen2/3,
later generations leaked the return value from the panel probe instead.

Reported-and-tested-by: Alessandro Suardi <alessandro.suardi@gmail.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Keith Packard <keithp@keithp.com>
  • Loading branch information
Chris Wilson committed Mar 24, 2011
1 parent f0c8602 commit 6ee3b5a
Showing 1 changed file with 2 additions and 8 deletions.
10 changes: 2 additions & 8 deletions drivers/gpu/drm/i915/intel_lvds.c
Original file line number Diff line number Diff line change
Expand Up @@ -473,19 +473,13 @@ static enum drm_connector_status
intel_lvds_detect(struct drm_connector *connector, bool force)
{
struct drm_device *dev = connector->dev;
enum drm_connector_status status = connector_status_connected;
enum drm_connector_status status;

status = intel_panel_detect(dev);
if (status != connector_status_unknown)
return status;

/* ACPI lid methods were generally unreliable in this generation, so
* don't even bother.
*/
if (IS_GEN2(dev) || IS_GEN3(dev))
return connector_status_connected;

return status;
return connector_status_connected;
}

/**
Expand Down

0 comments on commit 6ee3b5a

Please sign in to comment.