aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMathew McKernan <matmckernan@rauland.com.au>2011-04-12 01:51:38 -0400
committerKeith Packard <keithp@keithp.com>2011-04-12 13:00:21 -0400
commit89ea42d716e1ee94f643ecdc516d90a4111ec135 (patch)
treea8863954b789f1987c3ef84da2d0b40666acbc7b
parentd5627663f2088fa4be447fdcfd52bcb233448d85 (diff)
drm/i915/tv: Only poll for TV connections
As a probe for a TV connection modifies the TV_CTL register, it causes a loss of sync and a regular glitch on the output. This is highly undesirable when using the TV, so only poll for TV connections and wait for an explicit query for detecting the disconnection event. Reported-by: Mathew McKernan <matmckernan@rauland.com.au> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=35977 Signed-off-by: Mathew McKernan <matmckernan@rauland.com.au> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Keith Packard <keithp@keithp.com>
-rw-r--r--drivers/gpu/drm/i915/intel_tv.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c
index 0be2265d1f39..f5848cb91562 100644
--- a/drivers/gpu/drm/i915/intel_tv.c
+++ b/drivers/gpu/drm/i915/intel_tv.c
@@ -1672,8 +1672,7 @@ intel_tv_init(struct drm_device *dev)
1672 * 1672 *
1673 * More recent chipsets favour HDMI rather than integrated S-Video. 1673 * More recent chipsets favour HDMI rather than integrated S-Video.
1674 */ 1674 */
1675 connector->polled = 1675 connector->polled = DRM_CONNECTOR_POLL_CONNECT;
1676 DRM_CONNECTOR_POLL_CONNECT | DRM_CONNECTOR_POLL_DISCONNECT;
1677 1676
1678 drm_connector_init(dev, connector, &intel_tv_connector_funcs, 1677 drm_connector_init(dev, connector, &intel_tv_connector_funcs,
1679 DRM_MODE_CONNECTOR_SVIDEO); 1678 DRM_MODE_CONNECTOR_SVIDEO);