diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-09-21 12:19:32 +0200 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-09-21 12:19:32 +0200 |
| commit | e9e5f8e8d373e72f5c39dafde1ce110fc7082118 (patch) | |
| tree | 2991e33571a59cc2488daef36dcfeab7bddb9d7f /drivers/gpu/drm/i915/intel_sdvo.c | |
| parent | drm/i915: use GMBUS to manage i2c links (diff) | |
| parent | Merge remote branch 'linus' into drm-intel-fixes (diff) | |
| download | linux-e9e5f8e8d373e72f5c39dafde1ce110fc7082118.tar.xz linux-e9e5f8e8d373e72f5c39dafde1ce110fc7082118.zip | |
Merge branch 'drm-intel-fixes' into HEAD
Conflicts:
drivers/char/agp/intel-agp.c
drivers/gpu/drm/i915/intel_crt.c
Diffstat (limited to 'drivers/gpu/drm/i915/intel_sdvo.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_sdvo.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c index 2b3b4754c97d..ba058e600ce7 100644 --- a/drivers/gpu/drm/i915/intel_sdvo.c +++ b/drivers/gpu/drm/i915/intel_sdvo.c @@ -1421,7 +1421,7 @@ intel_analog_is_connected(struct drm_device *dev) if (!analog_connector) return false; - if (analog_connector->funcs->detect(analog_connector) == + if (analog_connector->funcs->detect(analog_connector, false) == connector_status_disconnected) return false; @@ -1490,7 +1490,8 @@ intel_sdvo_hdmi_sink_detect(struct drm_connector *connector) return status; } -static enum drm_connector_status intel_sdvo_detect(struct drm_connector *connector) +static enum drm_connector_status +intel_sdvo_detect(struct drm_connector *connector, bool force) { uint16_t response; struct intel_sdvo *intel_sdvo = intel_attached_sdvo(connector); |