commit: d5627663f2088fa4be447fdcfd52bcb233448d85 From: Mathew McKernan <[email protected]> Date: Tue, 12 Apr 2011 06:51:37 +0100 Subject: [PATCH] drm/i915/tv: Remember the detected TV type
During detect() we would probe the connection bits to determine if there was a TV attached, and what video input type (Component, S-Video, Composite, etc) to use. However, we promptly discarded this vital bit of information and never propagated it to where it was used to determine the correct modes and setup the control registers. Fix it! This fixes a regression from 7b334fcb45b757ffb093696ca3de1b0c8b4a33f1. Reported-and-tested-by: Mathew McKernan <[email protected]> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=35977 Signed-off-by: Mathew McKernan <[email protected]> Signed-off-by: Chris Wilson <[email protected]> Cc: [email protected] Acked-by: Paul Menzel <[email protected]> Signed-off-by: Keith Packard <[email protected]> --- drivers/gpu/drm/i915/intel_tv.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c index 4256b8e..0be2265 100644 --- a/drivers/gpu/drm/i915/intel_tv.c +++ b/drivers/gpu/drm/i915/intel_tv.c @@ -1378,7 +1378,9 @@ intel_tv_detect(struct drm_connector *connector, bool force) if (type < 0) return connector_status_disconnected; + intel_tv->type = type; intel_tv_find_better_format(connector); + return connector_status_connected; } _______________________________________________ stable mailing list [email protected] http://linux.kernel.org/mailman/listinfo/stable
