summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesse Barnes <jbarnes@nietzche.virtuousgeek.org>2008-04-09 14:09:29 -0700
committerJesse Barnes <jbarnes@nietzche.virtuousgeek.org>2008-04-09 14:13:38 -0700
commitb3737f3fd9210aead1f7fc4187dd05eea77ed0a6 (patch)
tree0c59cfdf16a093d8e6d8f7f5dcd2389bd1128e01
parent6c92689dcc627886c32afd4eca8f0da25bd07183 (diff)
Fix TV load detection
Now that we can allocate load detect pipes, we can perform TV out load detection correctly. Call the new routines and enable proper TV detection.
-rw-r--r--linux-core/intel_tv.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/linux-core/intel_tv.c b/linux-core/intel_tv.c
index cc50f8c1..84825eb8 100644
--- a/linux-core/intel_tv.c
+++ b/linux-core/intel_tv.c
@@ -1438,17 +1438,16 @@ intel_tv_detect(struct drm_output *output)
mode = reported_modes[0];
drm_mode_set_crtcinfo(&mode, CRTC_INTERLACE_HALVE_V);
-#if 0
- /* FIXME: pipe allocation for load detection */
- crtc = i830GetLoadDetectPipe (output, &mode, &dpms_mode);
+
+ crtc = intel_get_load_detect_pipe(output, &mode, &dpms_mode);
if (crtc) {
type = intel_tv_detect_type(crtc, output);
- i830ReleaseLoadDetectPipe (output, dpms_mode);
+ intel_release_load_detect_pipe(output, dpms_mode);
}
-#endif
+
if (type != tv_priv->type) {
tv_priv->type = type;
- intel_tv_format_configure_property (output);
+ intel_tv_format_configure_property(output);
}
switch (type) {