From patchwork Thu Mar 25 22:25:55 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher James Halse Rogers X-Patchwork-Id: 48601 X-Patchwork-Delegate: apw@canonical.com 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 CF070B7CF6 for ; Fri, 26 Mar 2010 09:26:35 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1NuvVU-00064Q-Vp; Thu, 25 Mar 2010 22:26:29 +0000 Received: from mail-bw0-f228.google.com ([209.85.218.228]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1NuvVT-000631-L5 for kernel-team@lists.ubuntu.com; Thu, 25 Mar 2010 22:26:27 +0000 Received: by mail-bw0-f228.google.com with SMTP id 28so7221689bwz.14 for ; Thu, 25 Mar 2010 15:26:27 -0700 (PDT) Received: by 10.204.130.90 with SMTP id r26mr443570bks.9.1269555987419; Thu, 25 Mar 2010 15:26:27 -0700 (PDT) Received: from localhost.localdomain (ppp121-44-103-226.lns20.syd6.internode.on.net [121.44.103.226]) by mx.google.com with ESMTPS id 16sm194249bwz.5.2010.03.25.15.26.24 (version=SSLv3 cipher=RC4-MD5); Thu, 25 Mar 2010 15:26:26 -0700 (PDT) From: Chris Halse Rogers To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/3] UBUNTU: [Upstream] drm/nv04-nv40: Fix up the programmed horizontal sync pulse delay. Date: Fri, 26 Mar 2010 09:25:55 +1100 Message-Id: <1269555956-3532-2-git-send-email-raof@ubuntu.com> X-Mailer: git-send-email 1.7.0 In-Reply-To: <1269555956-3532-1-git-send-email-raof@ubuntu.com> References: <1269555956-3532-1-git-send-email-raof@ubuntu.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 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: Christopher James Halse Rogers The calculated values were a little bit off (~16 clocks), the only effect it could have had is a slightly offset image with respect to the blob on analog outputs (bug 26790). BugLink: http://bugs.launchpad.net/bugs/529130 Signed-off-by: Francisco Jerez Signed-off-by: Christopher James Halse Rogers Acked-by: Stefan Bader Acked-by: Andy Whitcroft --- drivers/gpu/drm/nouveau/nv04_crtc.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nv04_crtc.c b/drivers/gpu/drm/nouveau/nv04_crtc.c index d2f143e..9986aba 100644 --- a/drivers/gpu/drm/nouveau/nv04_crtc.c +++ b/drivers/gpu/drm/nouveau/nv04_crtc.c @@ -230,9 +230,9 @@ nv_crtc_mode_set_vga(struct drm_crtc *crtc, struct drm_display_mode *mode) struct drm_framebuffer *fb = crtc->fb; /* Calculate our timings */ - int horizDisplay = (mode->crtc_hdisplay >> 3) - 1; - int horizStart = (mode->crtc_hsync_start >> 3) - 1; - int horizEnd = (mode->crtc_hsync_end >> 3) - 1; + int horizDisplay = (mode->crtc_hdisplay >> 3) - 1; + int horizStart = (mode->crtc_hsync_start >> 3) + 1; + int horizEnd = (mode->crtc_hsync_end >> 3) + 1; int horizTotal = (mode->crtc_htotal >> 3) - 5; int horizBlankStart = (mode->crtc_hdisplay >> 3) - 1; int horizBlankEnd = (mode->crtc_htotal >> 3) - 1;