From patchwork Mon Nov 21 18:22:06 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Hooker X-Patchwork-Id: 126891 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id AA50DB71F5 for ; Tue, 22 Nov 2011 05:23:35 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1RSYWd-0003TG-Dp; Mon, 21 Nov 2011 18:23:27 +0000 Received: from mail-vx0-f177.google.com ([209.85.220.177]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1RSYWS-0003R4-1W for kernel-team@lists.ubuntu.com; Mon, 21 Nov 2011 18:23:16 +0000 Received: by mail-vx0-f177.google.com with SMTP id fo13so4414053vcb.8 for ; Mon, 21 Nov 2011 10:23:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; bh=L2uaO2zjPOmVjfmPT/+/rpvILvhjz2qLkfdD+wroQpU=; b=mV/YJke3NBg38bnJyuq21I8t0Pw0wx7AXToRJd55+VXBrY68aozWOnZKvfz3ysIqjM BcBEfUV/5xFlUhJe6WMxj8lccxXGNcNuconxn5D/GKPh/Ejr2Gd9X2IThHk0nuqVOleO 81HOgbbx9WTcv6Gi77/FbD0r19V0WUiF3fkQ4= Received: by 10.220.154.11 with SMTP id m11mr1133378vcw.133.1321899795741; Mon, 21 Nov 2011 10:23:15 -0800 (PST) Received: from localhost.localdomain (c-68-34-39-96.hsd1.va.comcast.net. [68.34.39.96]) by mx.google.com with ESMTPS id w5sm15245720vdh.17.2011.11.21.10.23.14 (version=SSLv3 cipher=OTHER); Mon, 21 Nov 2011 10:23:15 -0800 (PST) From: Robert Hooker To: kernel-team@lists.ubuntu.com Subject: [PATCH 2/2] drm/i915: always set FDI composite sync bit Date: Mon, 21 Nov 2011 13:22:06 -0500 Message-Id: <1321899726-31548-3-git-send-email-sarvatt@ubuntu.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1321899726-31548-1-git-send-email-sarvatt@ubuntu.com> References: <1321899726-31548-1-git-send-email-sarvatt@ubuntu.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com From: Jesse Barnes commit c4f9c4c2b3f1831e932e04db992cf6fe92c2a95a upstream It's needed for 3 pipe support as well as just regular functionality (e.g. DisplayPort). Signed-off-by: Jesse Barnes Tested-by: Adam Jackson Tested-by: Eugeni Dodonov Signed-off-by: Keith Packard Signed-off-by: Robert Hooker --- drivers/gpu/drm/i915/i915_reg.h | 1 + drivers/gpu/drm/i915/intel_display.c | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index b7918c0..500e734 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h @@ -3145,6 +3145,7 @@ #define FDI_LINK_TRAIN_NONE_IVB (3<<8) /* both Tx and Rx */ +#define FDI_COMPOSITE_SYNC (1<<11) #define FDI_LINK_TRAIN_AUTO (1<<10) #define FDI_SCRAMBLING_ENABLE (0<<7) #define FDI_SCRAMBLING_DISABLE (1<<7) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 759d5c5..9fd9421 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -2340,6 +2340,7 @@ static void ivb_manual_fdi_link_train(struct drm_crtc *crtc) temp |= FDI_LINK_TRAIN_PATTERN_1_IVB; temp &= ~FDI_LINK_TRAIN_VOL_EMP_MASK; temp |= FDI_LINK_TRAIN_400MV_0DB_SNB_B; + temp |= FDI_COMPOSITE_SYNC; I915_WRITE(reg, temp | FDI_TX_ENABLE); reg = FDI_RX_CTL(pipe); @@ -2347,6 +2348,7 @@ static void ivb_manual_fdi_link_train(struct drm_crtc *crtc) temp &= ~FDI_LINK_TRAIN_AUTO; temp &= ~FDI_LINK_TRAIN_PATTERN_MASK_CPT; temp |= FDI_LINK_TRAIN_PATTERN_1_CPT; + temp |= FDI_COMPOSITE_SYNC; I915_WRITE(reg, temp | FDI_RX_ENABLE); POSTING_READ(reg);