drm/i915/tv: fix gen4 composite s-video tv-out
Subsystems (2)
PATCH 1/1 drm/i915/tv: fix gen4 composite s-video tv-out
This is *not* bisected, but the likely regression is
commit c35614380d5c956bfda20eab2755b2f5a7d6f1e7
Author: Zhao Yakui <[email protected]> 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.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=73362
--- drivers/gpu/drm/i915/intel_tv.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_tv.c +7 -2
@@ -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. */
Signature · 1 line
1.7.9.5
Daniel Vetter
AppliedQuoted 8 lines · Jani Nikula
This is *not* bisected, but the likely regression is
commit
c35614380d5c956bfda20eab2755b2f5a7d6f1e7Author: Zhao Yakui <[email protected]> Date: Tue Nov 24 09:48:48 2009 +0800drm/i915: Don't set up the TV port if it isn't in the BIOS table.
Quoted 8 lines
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 <[email protected]>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=73362
Signed-off-by Jani Nikula <[email protected]>
Queued for -next, thanks for the patch.
-Daniel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
Quoted 13 lines · Daniel Vetter
Quoted 12 lines · Jani Nikula
This is *not* bisected, but the likely regression is
commit
c35614380d5c956bfda20eab2755b2f5a7d6f1e7Author: Zhao Yakui <[email protected]> Date: Tue Nov 24 09:48:48 2009 +0800drm/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.
Quoted 6 lines
Quoted 4 lines
Reported-and-tested-by Matthew Khouzam <[email protected]>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=73362
Signed-off-by Jani Nikula <[email protected]>Queued for -next, thanks for the patch.
Did you actually push this?
BR,
Jani.
Signature · 1 line
Jani Nikula, Intel Open Source Technology Center
Quoted 8 lines · Jani Nikula
Quoted 6 lines
Quoted 4 lines
Reported-and-tested-by Matthew Khouzam <[email protected]>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=73362
Signed-off-by Jani Nikula <[email protected]>Queued for -next, thanks for the patch.
Did you actually push this?
Oops, fixed now.
-Daniel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch