From patchwork Fri Jul 29 00:06:09 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesse Barnes X-Patchwork-Id: 1018682 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p6T06Vvo015788 for ; Fri, 29 Jul 2011 00:06:54 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9CCCA9E91D for ; Thu, 28 Jul 2011 17:06:31 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from oproxy4-pub.bluehost.com (oproxy4-pub.bluehost.com [69.89.21.11]) by gabe.freedesktop.org (Postfix) with SMTP id CBE849E776 for ; Thu, 28 Jul 2011 17:06:12 -0700 (PDT) Received: (qmail 12043 invoked by uid 0); 29 Jul 2011 00:06:12 -0000 Received: from unknown (HELO box514.bluehost.com) (74.220.219.114) by cpoproxy1.bluehost.com with SMTP; 29 Jul 2011 00:06:12 -0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=virtuousgeek.org; s=default; h=Message-Id:Date:Subject:Cc:To:From; bh=ZYaNeRRpa7Si7ry/dfbCKzwpgWXXJCV+GyvNR1pVaKg=; b=Xaw1LYo3W4hMEBCWZ4kC7iK93CVeEcxRI+Cc+4dgH7w2d/CfIhRXr0zwOUzh2+6FZsb03rKNyhZ2cbhceNV2kewgZJ+NTUAhTGQ68jW3BXIHi+MLTCoX+QDXEk5rsOeK; Received: from c-67-161-37-189.hsd1.ca.comcast.net ([67.161.37.189] helo=localhost.localdomain) by box514.bluehost.com with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.69) (envelope-from ) id 1Qmaah-000896-Tr; Thu, 28 Jul 2011 18:06:12 -0600 From: Jesse Barnes To: intel-gfx@lists.freedesktop.org Date: Thu, 28 Jul 2011 17:06:09 -0700 Message-Id: <1311897969-6584-1-git-send-email-jbarnes@virtuousgeek.org> X-Mailer: git-send-email 1.7.4.1 X-Identified-User: {10642:box514.bluehost.com:virtuous:virtuousgeek.org} {sentby:smtp auth 67.161.37.189 authed with jbarnes@virtuousgeek.org} Subject: [Intel-gfx] [PATCH] drm/i915: apply phase pointer override on SNB+ too X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Fri, 29 Jul 2011 00:06:54 +0000 (UTC) These bits moved around on SNB and above. Signed-off-by: Jesse Barnes --- drivers/gpu/drm/i915/i915_reg.h | 12 ++++++++++++ drivers/gpu/drm/i915/intel_display.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 0 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index 5d5def7..d5a9812 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h @@ -3075,6 +3075,18 @@ #define TRANS_6BPC (2<<5) #define TRANS_12BPC (3<<5) +#define _TRANSA_CHICKEN2 0xf0064 +#define _TRANSB_CHICKEN2 0xf1064 +#define TRANS_CHICKEN2(pipe) _PIPE(pipe, _TRANSA_CHICKEN2, _TRANSB_CHICKEN2) +#define TRANS_AUTOTRAIN_GEN_STALL_DIS (1<<31) + +#define SOUTH_CHICKEN1 0xc2000 +#define FDIA_PHASE_SYNC_OVR (1<<19) +#define FDIA_PHASE_SYNC_EN (1<<18) +#define FDIB_PHASE_SYNC_OVR (1<<17) +#define FDIB_PHASE_SYNC_EN (1<<16) +#define FDIC_PHASE_SYNC_OVR (1<<15) +#define FDIC_PHASE_SYNC_EN (1<<14) #define SOUTH_CHICKEN2 0xc2004 #define DPLS_EDP_PPS_FIX_DIS (1<<0) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 5609c06..187b035 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -2133,6 +2133,23 @@ static void ironlake_fdi_link_train(struct drm_crtc *crtc) I915_WRITE(FDI_RX_CHICKEN(pipe), FDI_RX_PHASE_SYNC_POINTER_OVR); I915_WRITE(FDI_RX_CHICKEN(pipe), FDI_RX_PHASE_SYNC_POINTER_OVR | FDI_RX_PHASE_SYNC_POINTER_EN); + } else if (HAS_PCH_CPT(dev)) { + u32 flags; + switch (pipe) { + case 0: + flags = FDIA_PHASE_SYNC_OVR | FDIA_PHASE_SYNC_EN; + break; + case 2: + flags = FDIA_PHASE_SYNC_OVR | FDIA_PHASE_SYNC_EN; + break; + case 3: + flags = FDIA_PHASE_SYNC_OVR | FDIA_PHASE_SYNC_EN; + break; + default: + break; + } + I915_WRITE(SOUTH_CHICKEN1, flags); /* once to unlock... */ + I915_WRITE(SOUTH_CHICKEN1, flags); /* then again to enable */ } reg = FDI_RX_IIR(pipe); @@ -2490,6 +2507,23 @@ static void ironlake_fdi_disable(struct drm_crtc *crtc) I915_WRITE(FDI_RX_CHICKEN(pipe), I915_READ(FDI_RX_CHICKEN(pipe) & ~FDI_RX_PHASE_SYNC_POINTER_EN)); + } else if (HAS_PCH_CPT(dev)) { + u32 flags; + switch (pipe) { + case 0: + flags = FDIA_PHASE_SYNC_OVR; + break; + case 2: + flags = FDIA_PHASE_SYNC_OVR; + break; + case 3: + flags = FDIA_PHASE_SYNC_OVR; + break; + default: + break; + } + I915_WRITE(SOUTH_CHICKEN1, flags); /* once to unlock... */ + I915_WRITE(SOUTH_CHICKEN1, flags); /* then again to enable */ } /* still set train pattern 1 */