From patchwork Sun Sep 12 03:09:12 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?TWFyZWsgT2zFocOhaw==?= X-Patchwork-Id: 172782 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o8C39k6T012357 for ; Sun, 12 Sep 2010 03:10:07 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D5C2A9E856 for ; Sat, 11 Sep 2010 20:09:45 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-fx0-f49.google.com (mail-fx0-f49.google.com [209.85.161.49]) by gabe.freedesktop.org (Postfix) with ESMTP id E65879E740 for ; Sat, 11 Sep 2010 20:09:36 -0700 (PDT) Received: by fxm12 with SMTP id 12so3204821fxm.36 for ; Sat, 11 Sep 2010 20:09:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:mime-version:content-type :content-transfer-encoding; bh=FyGKaCi37i7NHUUsXltvq8mOK13hzb+f3/M0KbOipnE=; b=r1j1Fmd6v4HDBzOsRV8anGF2T9zx/n5Zqx0gSnyNDsg2XvTdwgydcGhpxnbwmSfEVo D2m4SR9sN0zbIzUeJdm3z6oV/59CguBeXweAR7Gv6Um/4Z04989TfJ6wzcXlVUlG266q 8cPVLHIkwlUuPGjVonweWOMSNb0XXegK7CnYE= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:mime-version :content-type:content-transfer-encoding; b=sUk9/h4YyOG0xOgZWjBc/jEGvqywKAbP/Xlz5S+PpIdHXqYZ0bENS8RMY+mUAwYsLj wQzK+XxvPkPYyJguCLeZo1UnQMeIu1KUbq1/O7R/p3rU22vHfIJ6bK+0x50T1njkbtW5 cSerd0O7yVwIk44ExdyvU5d/44o2RBWy/VjUo= Received: by 10.223.110.132 with SMTP id n4mr1821978fap.106.1284260975775; Sat, 11 Sep 2010 20:09:35 -0700 (PDT) Received: from localhost.localdomain (ip-94-113-216-99.net.upcbroadband.cz [94.113.216.99]) by mx.google.com with ESMTPS id a7sm2133244faa.21.2010.09.11.20.09.34 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sat, 11 Sep 2010 20:09:35 -0700 (PDT) From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= To: dri-devel@lists.freedesktop.org Subject: [PATCH 1/2] drm/radeon/kms: increase lockup detection interval to 10 sec for r100-r500 Date: Sun, 12 Sep 2010 05:09:12 +0200 Message-Id: <1284260953-2334-1-git-send-email-maraeo@gmail.com> X-Mailer: git-send-email 1.7.0.4 MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.11 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 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Sun, 12 Sep 2010 03:10:07 +0000 (UTC) X-MIME-Autoconverted: from base64 to 8bit by demeter1.kernel.org id o8C39k6T012357 diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c index e817a0b..ec64b36 100644 --- a/drivers/gpu/drm/radeon/r100.c +++ b/drivers/gpu/drm/radeon/r100.c @@ -2020,18 +2020,7 @@ bool r100_gpu_cp_is_lockup(struct radeon_device *rdev, struct r100_gpu_lockup *l return false; } elapsed = jiffies_to_msecs(cjiffies - lockup->last_jiffies); - if (elapsed >= 3000) { - /* very likely the improbable case where current - * rptr is equal to last recorded, a while ago, rptr - * this is more likely a false positive update tracking - * information which should force us to be recall at - * latter point - */ - lockup->last_cp_rptr = cp->rptr; - lockup->last_jiffies = jiffies; - return false; - } - if (elapsed >= 1000) { + if (elapsed >= 10000) { dev_err(rdev->dev, "GPU lockup CP stall for more than %lumsec\n", elapsed); return true; }