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

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

[Jani Nikula]

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

commit c35614380d5c956bfda20eab2755b2f5a7d6f1e7
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>
---
 drivers/gpu/drm/i915/intel_tv.c |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c
index 5be4ab218054..bafe92e317d5 100644
--- a/drivers/gpu/drm/i915/intel_tv.c
+++ b/drivers/gpu/drm/i915/intel_tv.c
@@ -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.
 		 */
-- 
1.7.9.5

Re: [PATCH] drm/i915/tv: fix gen4 composite s-video tv-out

[Daniel Vetter]

On Fri, Mar 28, 2014 at 08:54:04AM +0200, Jani Nikula wrote:
> This is *not* bisected, but the likely regression is
> 
> commit c35614380d5c956bfda20eab2755b2f5a7d6f1e7
> 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>

Queued for -next, thanks for the patch.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch

Re: [PATCH] drm/i915/tv: fix gen4 composite s-video tv-out

[Jani Nikula]

 Fri, 28 Mar 2014, Daniel Vetter <daniel@ffwll.ch> wrote:
> On Fri, Mar 28, 2014 at 08:54:04AM +0200, Jani Nikula wrote:
>> This is *not* bisected, but the likely regression is
>> 
>> commit c35614380d5c956bfda20eab2755b2f5a7d6f1e7
>> 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>
>
> Queued for -next, thanks for the patch.

Did you actually push this?

BR,
Jani.


-- 
Jani Nikula, Intel Open Source Technology Center

Re: [PATCH] drm/i915/tv: fix gen4 composite s-video tv-out

[Daniel Vetter]

On Fri, Mar 28, 2014 at 1:27 PM, Jani Nikula <jani.nikula@intel.com> wrote:
>>> 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>
>>
>> Queued for -next, thanks for the patch.
>
> Did you actually push this?

Oops, fixed now.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch