From 5d0629590582d4fe55471c193c5160b9cc8da2f7 Mon Sep 17 00:00:00 2001
From: jsg <jsg@openbsd.org>
Date: Sat, 3 May 2014 05:19:37 +0000
Subject: [PATCH] drm/i915/tv: fix gen4 composite s-video tv-out

From Jani Nikula
1f2561bd1e2c46145c643673b662c099d2074936 in ubuntu 3.8
e1f23f3dd817f53f622e486913ac662add46eeed in mainline linux
---
 sys/dev/pci/drm/i915/intel_tv.c | 11 ++++++++---
 1 file 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.
 		 */
-- 
2.20.1