From patchwork Fri Jan 21 15:38:22 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 495741 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 p0LFchNX012137 for ; Fri, 21 Jan 2011 15:39:04 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5A4BC9EFC5 for ; Fri, 21 Jan 2011 07:38:43 -0800 (PST) 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 4F09B9E7B1 for ; Fri, 21 Jan 2011 07:38:33 -0800 (PST) Received: by fxm19 with SMTP id 19so1923133fxm.36 for ; Fri, 21 Jan 2011 07:38:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer; bh=bYtzbcBmJ+cD23+wVZWoBMQpUbfJFA9bPqaR9KTBQd8=; b=mtQaf0AIRqtEC11DMU6p98A6qqwdYVdZIpqMCwOc0nAyNtyVYONLeyPZkP0aHMjkN5 EuIhXg/VhQk9OAE8x76LzzG0M+ayegbElkhKglC2K7Jj4iWtqbz4gLe7gYQtsPIp5cLa o47iXKR0SsTHh8d2A9txwmYTPTNRWtKzmYjLI= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=thvrCCe77vEgjnsHkZjrLHlLXgNB4cDyc1Mfm+OyA9QQu+sxBLFeFVAqvBKNhQAYwj T0DiUU/Y9VobC3l2ieYtFXVRQ5KX0QmW19xhSHKrd32EUB+UVO6hYqcxdYAf9AfVHzdk w9p/pgZGRzGf+FZ/nfY/a7dUjGEC3xHC4atOM= Received: by 10.223.113.73 with SMTP id z9mr814609fap.41.1295624312081; Fri, 21 Jan 2011 07:38:32 -0800 (PST) Received: from localhost.localdomain (static-74-96-105-7.washdc.fios.verizon.net [74.96.105.7]) by mx.google.com with ESMTPS id 17sm3642149far.19.2011.01.21.07.38.30 (version=SSLv3 cipher=RC4-MD5); Fri, 21 Jan 2011 07:38:31 -0800 (PST) From: Alex Deucher To: airlied@gmail.com, dri-devel@lists.freedesktop.org Subject: [PATCH] drm/radeon/kms: match r6xx/r7xx/evergreen asic_reset with previous asics Date: Fri, 21 Jan 2011 10:38:22 -0500 Message-Id: <1295624302-1731-1-git-send-email-alexdeucher@gmail.com> X-Mailer: git-send-email 1.7.1.1 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: , MIME-Version: 1.0 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.6 (demeter1.kernel.org [140.211.167.41]); Fri, 21 Jan 2011 15:39:04 +0000 (UTC) diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index be48bbc..90e6d84 100644 --- a/drivers/gpu/drm/radeon/evergreen.c +++ b/drivers/gpu/drm/radeon/evergreen.c @@ -2201,6 +2201,9 @@ static int evergreen_gpu_soft_reset(struct radeon_device *rdev) struct evergreen_mc_save save; u32 grbm_reset = 0; + if (!(RREG32(GRBM_STATUS) & GUI_ACTIVE)) + return 0; + dev_info(rdev->dev, "GPU softreset \n"); dev_info(rdev->dev, " GRBM_STATUS=0x%08X\n", RREG32(GRBM_STATUS)); diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c index becc0a9..f574d9b 100644 --- a/drivers/gpu/drm/radeon/r600.c +++ b/drivers/gpu/drm/radeon/r600.c @@ -1288,6 +1288,9 @@ int r600_gpu_soft_reset(struct radeon_device *rdev) S_008014_CB2_BUSY(1) | S_008014_CB3_BUSY(1); u32 tmp; + if (!(RREG32(GRBM_STATUS) & GUI_ACTIVE)) + return 0; + dev_info(rdev->dev, "GPU softreset \n"); dev_info(rdev->dev, " R_008010_GRBM_STATUS=0x%08X\n", RREG32(R_008010_GRBM_STATUS));