From e51ec1eebee556753bf98517d74ede3cb8cbdb39 Mon Sep 17 00:00:00 2001 From: Paulo Zanoni Date: Thu, 6 Dec 2012 11:12:38 -0200 Subject: [PATCH] --- yaml --- r: 357925 b: refs/heads/master c: 681e5811f88b7ecca77734421adafb62f19563be h: refs/heads/master i: 357923: b8b99eddc515ebabe78256f7be167c3634094d05 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/intel_display.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9008d60e9e6b..b14103d0c5b2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 88afe715dd5469bc24ca7a19ac62dd3c241cab48 +refs/heads/master: 681e5811f88b7ecca77734421adafb62f19563be diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c index 7f1b07c9061d..fa73b4ad88bb 100644 --- a/trunk/drivers/gpu/drm/i915/intel_display.c +++ b/trunk/drivers/gpu/drm/i915/intel_display.c @@ -1789,7 +1789,7 @@ static void intel_enable_pipe(struct drm_i915_private *dev_priv, enum pipe pipe, int reg; u32 val; - if (IS_HASWELL(dev_priv->dev)) + if (HAS_PCH_LPT(dev_priv->dev)) pch_transcoder = TRANSCODER_A; else pch_transcoder = pipe;