From mboxrd@z Thu Jan 1 00:00:00 1970 From: Damien Lespiau Subject: [PATCH 3/3] drm/i915: Correctly enable CLKOUT_DP for ULT platoforms Date: Sat, 8 Dec 2012 18:08:11 +0000 Message-ID: <1354990091-9629-4-git-send-email-damien.lespiau@gmail.com> References: <1354990091-9629-1-git-send-email-damien.lespiau@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-we0-f177.google.com (mail-we0-f177.google.com [74.125.82.177]) by gabe.freedesktop.org (Postfix) with ESMTP id 39F18E5C78 for ; Sat, 8 Dec 2012 10:08:24 -0800 (PST) Received: by mail-we0-f177.google.com with SMTP id x48so611762wey.36 for ; Sat, 08 Dec 2012 10:08:24 -0800 (PST) In-Reply-To: <1354990091-9629-1-git-send-email-damien.lespiau@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org From: Damien Lespiau SBI_GEN0 is used instead of SBI_DBUFF0 on ULT platforms. Signed-off-by: Damien Lespiau --- drivers/gpu/drm/i915/i915_reg.h | 2 ++ drivers/gpu/drm/i915/intel_display.c | 12 +++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index acf768d..90c4f43 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h @@ -4563,6 +4563,8 @@ #define SBI_SSCAUXDIV_FINALDIV2SEL(x) ((x)<<4) #define SBI_DBUFF0 0x2a00 #define SBI_DBUFF0_ENABLE (1<<0) +#define SBI_GEN0 0x1f00 +#define SBI_GEN0_ENABLE (1<<0) /* LPT PIXCLK_GATE */ #define PIXCLK_GATE 0xC6020 diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 0eba466..6472065 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -5132,9 +5132,15 @@ static void lpt_init_pch_refclk(struct drm_device *dev) intel_sbi_write(dev_priv, 0x21EC, tmp, SBI_MPHY); } - tmp = intel_sbi_read(dev_priv, SBI_DBUFF0, SBI_ICLK); - tmp |= SBI_DBUFF0_ENABLE; - intel_sbi_write(dev_priv, SBI_DBUFF0, tmp, SBI_ICLK); + if (IS_ULT(dev)) { + tmp = intel_sbi_read(dev_priv, SBI_GEN0, SBI_ICLK); + tmp |= SBI_GEN0_ENABLE; + intel_sbi_write(dev_priv, SBI_GEN0, tmp, SBI_ICLK); + } else { + tmp = intel_sbi_read(dev_priv, SBI_DBUFF0, SBI_ICLK); + tmp |= SBI_DBUFF0_ENABLE; + intel_sbi_write(dev_priv, SBI_DBUFF0, tmp, SBI_ICLK); + } } /* -- 1.7.7.5