diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2014-05-03 05:19:38 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2014-05-03 05:19:38 +0000 |
| commit | 2a4313c1f06e25a39d602f2b5699a271bf1c15a9 (patch) | |
| tree | 3e467b1e4702bc26abbc5b4c8a93fb0d8803fce5 /sys/dev | |
| parent | dca1ac09c973d3dffaa00dc8f2cdb956095a3341 (diff) | |
drm/i915/tv: fix gen4 composite s-video tv-out
From Jani Nikula
1f2561bd1e2c46145c643673b662c099d2074936 in ubuntu 3.8
e1f23f3dd817f53f622e486913ac662add46eeed in mainline linux
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/pci/drm/i915/intel_tv.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/sys/dev/pci/drm/i915/intel_tv.c b/sys/dev/pci/drm/i915/intel_tv.c index 1494c2988cb..8106aacac78 100644 --- a/sys/dev/pci/drm/i915/intel_tv.c +++ b/sys/dev/pci/drm/i915/intel_tv.c @@ -1,4 +1,4 @@ -/* $OpenBSD: intel_tv.c,v 1.6 2014/03/24 17:06:49 kettenis Exp $ */ +/* $OpenBSD: intel_tv.c,v 1.7 2014/05/03 05:19:37 jsg Exp $ */ /* * Copyright © 2006-2008 Intel Corporation * Jesse Barnes <jesse.barnes@intel.com> @@ -1531,9 +1531,14 @@ static int tv_is_present_in_vbt(struct drm_device *dev) /* * If the device type is not TV, continue. */ - if (p_child->device_type != DEVICE_TYPE_INT_TV && - p_child->device_type != DEVICE_TYPE_TV) + switch (p_child->device_type) { + case DEVICE_TYPE_INT_TV: + case DEVICE_TYPE_TV: + case DEVICE_TYPE_TV_SVIDEO_COMPOSITE: + break; + default: continue; + } /* Only when the addin_offset is non-zero, it is regarded * as present. */ |