drm/i915/tv: fix gen4 composite s-video tv-out

From Jani Nikula
1f2561bd1e2c46145c643673b662c099d2074936 in ubuntu 3.8
e1f23f3dd817f53f622e486913ac662add46eeed in mainline linux

diff --git a/sys/dev/pci/drm/i915/intel_tv.c b/sys/dev/pci/drm/i915/intel_tv.c
index 1494c29..8106aac 100644 (file)
--- 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.
                 */