From patchwork Wed May 21 18:42:26 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesse Barnes X-Patchwork-Id: 4218421 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 45E1E9F32A for ; Wed, 21 May 2014 18:43:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 61A9620377 for ; Wed, 21 May 2014 18:43:00 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 68CBE20375 for ; Wed, 21 May 2014 18:42:59 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E28FE6EAA9; Wed, 21 May 2014 11:42:58 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from gproxy5-pub.mail.unifiedlayer.com (gproxy5-pub.mail.unifiedlayer.com [67.222.38.55]) by gabe.freedesktop.org (Postfix) with SMTP id 509E56EAB2 for ; Wed, 21 May 2014 11:42:57 -0700 (PDT) Received: (qmail 14509 invoked by uid 0); 21 May 2014 18:42:55 -0000 Received: from unknown (HELO cmgw4) (10.0.90.85) by gproxy5.mail.unifiedlayer.com with SMTP; 21 May 2014 18:42:55 -0000 Received: from box514.bluehost.com ([74.220.219.114]) by cmgw4 with id 4iio1o00J2UhLwi01iirW3; Wed, 21 May 2014 12:42:55 -0600 X-Authority-Analysis: v=2.1 cv=CpMsLBID c=1 sm=1 tr=0 a=9W6Fsu4pMcyimqnCr1W0/w==:117 a=9W6Fsu4pMcyimqnCr1W0/w==:17 a=cNaOj0WVAAAA:8 a=f5113yIGAAAA:8 a=p79X1p2LZacA:10 a=3ROhxo7VqVMA:10 a=TBVoxVdAAAAA:8 a=GhZ5P8ky69gA:10 a=noBwr2J6l1kA:10 a=kCfvZJGldO2mi53t-5YA:9 a=rW6DTWptwo0A:10 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=virtuousgeek.org; s=default; h=References:In-Reply-To:Message-Id:Date:Subject:To:From; bh=WBzhMxvukwLuj7S6L+6A8NAkbfLEUWPu1c+5+o07X5I=; b=lO1MbcI/aTX4okyU3KV4E4O0QE8V4tHkYkee7+Ze5b4BECDO+ehN1RX0hBMIoPoc6G9moI1bPlMBmlXq28pV256zPfNFBz6+0/5EzoAcKoKpBDZwMYldd/TY6Qs2d5Wp; Received: from [67.161.37.189] (port=48619 helo=localhost.localdomain) by box514.bluehost.com with esmtpsa (TLSv1.2:DHE-RSA-AES256-GCM-SHA384:256) (Exim 4.82) (envelope-from ) id 1WnBTT-0004nn-Uk for intel-gfx@lists.freedesktop.org; Wed, 21 May 2014 12:42:48 -0600 From: Jesse Barnes To: intel-gfx@lists.freedesktop.org Date: Wed, 21 May 2014 11:42:26 -0700 Message-Id: <1400697746-7511-2-git-send-email-jbarnes@virtuousgeek.org> X-Mailer: git-send-email 1.8.4.2 In-Reply-To: <1400697746-7511-1-git-send-email-jbarnes@virtuousgeek.org> References: <1400697746-7511-1-git-send-email-jbarnes@virtuousgeek.org> 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 2/2] drm/i915: use SNB A step FDI values on A step CPUs X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP More of an example of where to use the stepping macro than anything else. I think these early steppings never went outside of Intel. Signed-off-by: Jesse Barnes --- drivers/gpu/drm/i915/intel_display.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index bdb4624..828bac5 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -2883,6 +2883,13 @@ static void ironlake_fdi_link_train(struct drm_crtc *crtc) } +static const int snb_a_fdi_train_param[] = { + FDI_LINK_TRAIN_400MV_0DB_SNB_A, + FDI_LINK_TRAIN_400MV_6DB_SNB_A, + FDI_LINK_TRAIN_600MV_3_5DB_SNB_A, + FDI_LINK_TRAIN_800MV_0DB_SNB_A, +}; + static const int snb_b_fdi_train_param[] = { FDI_LINK_TRAIN_400MV_0DB_SNB_B, FDI_LINK_TRAIN_400MV_6DB_SNB_B, @@ -2898,6 +2905,12 @@ static void gen6_fdi_link_train(struct drm_crtc *crtc) struct intel_crtc *intel_crtc = to_intel_crtc(crtc); int pipe = intel_crtc->pipe; u32 reg, temp, i, retry; + const int *train_param; + + if (INTEL_STEPPING(dev) == 0) + train_param = snb_a_fdi_train_param; + else + train_param = snb_b_fdi_train_param; /* Train 1: umask FDI RX Interrupt symbol_lock and bit_lock bit for train result */ @@ -2943,7 +2956,7 @@ static void gen6_fdi_link_train(struct drm_crtc *crtc) reg = FDI_TX_CTL(pipe); temp = I915_READ(reg); temp &= ~FDI_LINK_TRAIN_VOL_EMP_MASK; - temp |= snb_b_fdi_train_param[i]; + temp |= train_param[i]; I915_WRITE(reg, temp); POSTING_READ(reg); @@ -2996,7 +3009,7 @@ static void gen6_fdi_link_train(struct drm_crtc *crtc) reg = FDI_TX_CTL(pipe); temp = I915_READ(reg); temp &= ~FDI_LINK_TRAIN_VOL_EMP_MASK; - temp |= snb_b_fdi_train_param[i]; + temp |= train_param[i]; I915_WRITE(reg, temp); POSTING_READ(reg);