diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2015-01-09 14:21:15 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-01-13 00:49:02 +0100 |
| commit | 1d83d957e621f160dfe0f08194e9c2fdd5fa7f3e (patch) | |
| tree | 16041f55f7d18bcbc32ebec3ce43beafa835a669 /drivers/gpu/drm/i915/intel_sdvo.c | |
| parent | d2182a660808d9053a605e3ebc8c46a323ec6e5d (diff) | |
| download | linux-stable-1d83d957e621f160dfe0f08194e9c2fdd5fa7f3e.tar.gz linux-stable-1d83d957e621f160dfe0f08194e9c2fdd5fa7f3e.tar.bz2 linux-stable-1d83d957e621f160dfe0f08194e9c2fdd5fa7f3e.zip | |
drm/i915: Don't pretend SDVO hotplug works on 915
915 doens't support hotplug at all, so we shouldn't try to pretend
otherwise in the SDVO code.
Note: i915 does have hotplug support in hw, we simply never enabled it
in i915.ko: There's only one hpd bit for all outputs, so not worth the
bother to add this special case for this rather old platform.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
[danvet: Clarify that only i915.ko doesn't support hpd on i915g.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_sdvo.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_sdvo.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c index 6d7a277458b5..4e3d362931e9 100644 --- a/drivers/gpu/drm/i915/intel_sdvo.c +++ b/drivers/gpu/drm/i915/intel_sdvo.c @@ -1617,6 +1617,9 @@ static uint16_t intel_sdvo_get_hotplug_support(struct intel_sdvo *intel_sdvo) struct drm_device *dev = intel_sdvo->base.base.dev; uint16_t hotplug; + if (!I915_HAS_HOTPLUG(dev)) + return 0; + /* HW Erratum: SDVO Hotplug is broken on all i945G chips, there's noise * on the line. */ if (IS_I945G(dev) || IS_I945GM(dev)) |