From patchwork Thu Mar 21 18:10:12 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Calvin Owens X-Patchwork-Id: 2319081 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork2.kernel.org (Postfix) with ESMTP id 5E015DFE82 for ; Fri, 22 Mar 2013 11:35:49 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 72839E6361 for ; Fri, 22 Mar 2013 04:35:49 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-oa0-f49.google.com (mail-oa0-f49.google.com [209.85.219.49]) by gabe.freedesktop.org (Postfix) with ESMTP id A4756E613A for ; Thu, 21 Mar 2013 11:10:15 -0700 (PDT) Received: by mail-oa0-f49.google.com with SMTP id j6so3482084oag.36 for ; Thu, 21 Mar 2013 11:10:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:message-id:date:from:user-agent:mime-version:to:cc :subject:content-type:content-transfer-encoding; bh=RiFUBhOLLmRkQsEp+9HgxAZM4th0RDxs5t2oJNRmzrE=; b=jTWaGXW344uVd3I19ahhhA0WjqrNPblw6BMwYbHFBGEfvYIUA8YyMH6BsycFDXiQfR GlZ96Q06woQ8fzCdk737oylRq0O999LxWsnkN+63S23nw+xYCXHl1ORgPNguSjVfe7rG /kgTJ1N5r7f5AsHPbnoiT+r4dEwjSX0zQB+5Ivnez0S6v2aiJFFm528vbnQZiamom9eq U4TTcBUHYzfIXlGXCSg4QilkWOABnupht4TmzaxKCU18g7zIfXC76bNOQFqqH2CVXWSK c7Xv9MGEEBOJH+iNj4GP1YRtSbMTE5YD+sHtCQX9CenhH8zAjsMtCwA0cGJUKd4vytIl 61sg== X-Received: by 10.182.134.70 with SMTP id pi6mr4673598obb.57.1363889415245; Thu, 21 Mar 2013 11:10:15 -0700 (PDT) Received: from [10.1.1.2] (cpe-76-187-8-238.tx.res.rr.com. [76.187.8.238]) by mx.google.com with ESMTPS id h9sm8055139obg.14.2013.03.21.11.10.13 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 21 Mar 2013 11:10:14 -0700 (PDT) Message-ID: <514B4D04.6070007@Gmail.com> Date: Thu, 21 Mar 2013 13:10:12 -0500 From: Calvin Owens User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130203 Thunderbird/17.0.2 MIME-Version: 1.0 To: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH] nouveau: Fix unconditional return waiting on memory X-Mailman-Approved-At: Fri, 22 Mar 2013 04:33:08 -0700 Cc: Calvin Owens , Ben Skeggs X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Typo in nv50_display_flip_wait allows page flipping to run ahead before memory has time to settle. Signed-off-by: Calvin Owens --- drivers/gpu/drm/nouveau/nv50_display.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c index 2db5799..96bc2f3 100644 --- a/drivers/gpu/drm/nouveau/nv50_display.c +++ b/drivers/gpu/drm/nouveau/nv50_display.c @@ -479,7 +479,7 @@ nv50_display_flip_wait(void *data) { struct nv50_display_flip *flip = data; if (nouveau_bo_rd32(flip->disp->sync, flip->chan->addr / 4) == - flip->chan->data); + flip->chan->data) return true; usleep_range(1, 2); return false;