drm/i915: Fix up pipe vs. double wide confusion
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Wed, 4 Sep 2013 15:30:06 +0000 (18:30 +0300)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 17 Sep 2013 08:03:39 +0000 (10:03 +0200)
Double wide mode is only available on pipe A, except on GDG where
pipe B is also double wide capable.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/intel_display.c

index 9bbb6ea34d06bfbb421f41aa03ca1b2f6982dd66..4dd6561cb7c88aeb4396e45f7b321752f703bc44 100644 (file)
@@ -4153,10 +4153,10 @@ static int intel_crtc_compute_config(struct intel_crtc *crtc,
                 * Enable pixel doubling when the dot clock
                 * is > 90% of the (display) core speed.
                 *
-                * XXX: No double-wide on 915GM pipe B. Is that
-                * the only reason for the pipe == PIPE_A check?
+                * GDG double wide on either pipe,
+                * otherwise pipe A only.
                 */
-               if (crtc->pipe == PIPE_A &&
+               if ((crtc->pipe == PIPE_A || IS_I915G(dev)) &&
                    adjusted_mode->clock > clock_limit * 9 / 10) {
                        clock_limit *= 2;
                        pipe_config->double_wide = true;