Commit e1f23f3d authored Mar 28, 2014 by Jani Nikula Committed by Daniel Vetter Mar 28, 2014

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



This is *not* bisected, but the likely regression is

commit c3561438
Author: Zhao Yakui <yakui.zhao@intel.com>
Date:   Tue Nov 24 09:48:48 2009 +0800

    drm/i915: Don't set up the TV port if it isn't in the BIOS table.

The commit does not check for all TV device types that might be present
in the VBT, disabling TV out for the missing ones. Add composite
S-video.

Reported-and-tested-by: Matthew Khouzam <matthew.khouzam@gmail.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=73362


Cc: stable@vger.kernel.org
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

parent e3243d16

drivers/gpu/drm/i915/intel_tv.c

+7 −2

Original line number	Diff line number	Diff line
		@@ -1536,9 +1536,14 @@ static int tv_is_present_in_vbt(struct drm_device *dev)
		/*
		* If the device type is not TV, continue.
		*/
		if (p_child->old.device_type != DEVICE_TYPE_INT_TV &&
		p_child->old.device_type != DEVICE_TYPE_TV)
		switch (p_child->old.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.
		*/