From patchwork Mon Dec 20 17:35:04 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 421951 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 oBKHa6L7027298 for ; Mon, 20 Dec 2010 17:36:27 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2DC9C9EF0B for ; Mon, 20 Dec 2010 09:36:06 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-vw0-f49.google.com (mail-vw0-f49.google.com [209.85.212.49]) by gabe.freedesktop.org (Postfix) with ESMTP id AFBFF9ED98 for ; Mon, 20 Dec 2010 09:35:20 -0800 (PST) Received: by mail-vw0-f49.google.com with SMTP id 5so1317755vws.36 for ; Mon, 20 Dec 2010 09:35:20 -0800 (PST) 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:in-reply-to:references; bh=ZEZMg+/mcYm2b3ZnpI4WO4ePIOnEX4m1uSOAAhHsFzA=; b=Ulq7xROM6lcxNA4u5VFj4/TIBa8VIeBSuz7VvSs7owlRZHtrjTdegb8ETCvqTlwitz YadJ/7MGKp095bjSrkP6qSlv6PYfSMyj60nT87zOT9cDbbCIRX+wqsMAKJiDhdpQtMP0 Z7bo5bg5aS7hKX3Ja1+6DOjhb3AhsOEsPo8+8= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=cI2POE1qVmUbr6AgpGMKkAIc64Mihdv1XOdx5GS1D6Xk+H/URXEALq6zpYu1WwAip6 Wv97KTjHpRAf+wczTGhOqTiLFztp8U4rvVylrkG7EoPBRc/Yhk6qX9QP3rJazvdmgoD5 VfU1qq4HGgfaNeG09nUwQKylraZSK2C7BwdwI= Received: by 10.220.74.206 with SMTP id v14mr1276042vcj.185.1292866520441; Mon, 20 Dec 2010 09:35:20 -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 bq5sm769515vcb.32.2010.12.20.09.35.19 (version=SSLv3 cipher=RC4-MD5); Mon, 20 Dec 2010 09:35:19 -0800 (PST) From: Alex Deucher To: airlied@gmail.com, dri-devel@lists.freedesktop.org Subject: [PATCH 2/2] drm/radeon/kms/evergreen: reset the grbm blocks at resume and init Date: Mon, 20 Dec 2010 12:35:04 -0500 Message-Id: <1292866504-8939-2-git-send-email-alexdeucher@gmail.com> X-Mailer: git-send-email 1.7.1.1 In-Reply-To: <1292866504-8939-1-git-send-email-alexdeucher@gmail.com> References: <1292866504-8939-1-git-send-email-alexdeucher@gmail.com> Cc: stable@kernel.org 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.3 (demeter1.kernel.org [140.211.167.41]); Mon, 20 Dec 2010 17:37:13 +0000 (UTC) diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index 8b82749..056b93c 100644 --- a/drivers/gpu/drm/radeon/evergreen.c +++ b/drivers/gpu/drm/radeon/evergreen.c @@ -2701,6 +2701,11 @@ int evergreen_resume(struct radeon_device *rdev) { int r; + /* reset the asic, the gfx blocks are often in a bad state + * after the driver is unloaded or after a resume + */ + if (radeon_asic_reset(rdev)) + dev_warn(rdev->dev, "GPU reset failed !\n"); /* Do not reset GPU before posting, on rv770 hw unlike on r500 hw, * posting will perform necessary task to bring back GPU into good * shape. @@ -2861,6 +2866,11 @@ int evergreen_init(struct radeon_device *rdev) r = radeon_atombios_init(rdev); if (r) return r; + /* reset the asic, the gfx blocks are often in a bad state + * after the driver is unloaded or after a resume + */ + if (radeon_asic_reset(rdev)) + dev_warn(rdev->dev, "GPU reset failed !\n"); /* Post card if necessary */ if (!evergreen_card_posted(rdev)) { if (!rdev->bios) {