diff options
| author | Adam Jackson <ajax@redhat.com> | 2011-06-16 16:36:24 -0400 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-10-20 14:11:15 -0700 |
| commit | 2294488da3402220120ff10360653a2ae3c15024 (patch) | |
| tree | 693f2800040f9afc4e7c828c521e027718d45c4a /drivers | |
| parent | 46eb303682f72717d1a75cdd2309733bfed43396 (diff) | |
| download | linux-3.10-2294488da3402220120ff10360653a2ae3c15024.tar.gz linux-3.10-2294488da3402220120ff10360653a2ae3c15024.tar.bz2 linux-3.10-2294488da3402220120ff10360653a2ae3c15024.zip | |
drm/i915: Fix multifunction SDVO detection
I can't think of any sensible reason to limit this to a mask of 0x0f,
ie, SDVO_OUTPUT_{TMDS,RGB,CVBS,SVID}0.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_sdvo.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c index ed15c00aecd..6cbbe5c3e06 100644 --- a/drivers/gpu/drm/i915/intel_sdvo.c +++ b/drivers/gpu/drm/i915/intel_sdvo.c @@ -1232,8 +1232,7 @@ static bool intel_sdvo_multifunc_encoder(struct intel_sdvo *intel_sdvo) { /* Is there more than one type of output? */ - int caps = intel_sdvo->caps.output_flags & 0xf; - return caps & -caps; + return hweight16(intel_sdvo->caps.output_flags) > 1; } static struct edid * |