From patchwork Mon Mar 11 21:06:23 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 2251111 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork1.kernel.org (Postfix) with ESMTP id 324723FC8F for ; Mon, 11 Mar 2013 21:07:26 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1E28DE60B4 for ; Mon, 11 Mar 2013 14:07:26 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qa0-f51.google.com (mail-qa0-f51.google.com [209.85.216.51]) by gabe.freedesktop.org (Postfix) with ESMTP id 170EFE5C48 for ; Mon, 11 Mar 2013 14:06:31 -0700 (PDT) Received: by mail-qa0-f51.google.com with SMTP id cr7so1241667qab.10 for ; Mon, 11 Mar 2013 14:06:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=l7thZvU43E2qlTDWP53j4ILCLnQ1wuGxHng/tDE315c=; b=OAYVjiLkxWMkGFhvtM/O7lbjsCV+vM0Wczn/L3z2CIOWrzhd/EiiUvdgiCscQkWTRp 4xpF5wQAwYn03wYwMTwqR8FziQzc7JPIbdkCzTJG0ZVsvBtkuxC18zbZI6zj0RkNA/Iv ZMSL3ZVt1nXanuFucjcsakJWpsTcQjJx/ISBJQGpSuEu/SCbWscdlONDMXsMVGIXBUtr kfp43Hu8LK2/4ar2+X9LuZNdBKarpJphG52ULLhoXq/aIskIwXbxnytLbkg/mNp1sNKA aGRNIPxNqVGC1kAIKQl8UyJ63mc2coisZRgaSWqDAd5GeoCHSS+pUfqww1XnwidlmscH rWMw== X-Received: by 10.49.52.70 with SMTP id r6mr22021427qeo.20.1363035990360; Mon, 11 Mar 2013 14:06:30 -0700 (PDT) Received: from localhost.localdomain (static-74-96-105-49.washdc.fios.verizon.net. [74.96.105.49]) by mx.google.com with ESMTPS id gn6sm11726374qab.5.2013.03.11.14.06.29 (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 11 Mar 2013 14:06:29 -0700 (PDT) From: alexdeucher@gmail.com To: dri-devel@lists.freedesktop.org Subject: [PATCH 1/2] drm/radeon: fix S/R on VM systems (cayman/TN/SI) Date: Mon, 11 Mar 2013 17:06:23 -0400 Message-Id: <1363035984-4861-2-git-send-email-alexdeucher@gmail.com> X-Mailer: git-send-email 1.7.7.5 In-Reply-To: <1363035984-4861-1-git-send-email-alexdeucher@gmail.com> References: <1363035984-4861-1-git-send-email-alexdeucher@gmail.com> Cc: Alex Deucher , stable@vger.kernel.org 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: , 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 From: Alex Deucher We weren't properly tearing down the VM sub-alloctor on suspend leading to bogus VM PTs on resume. Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=60439 Tested-by: Dmitry Cherkasov Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org Reviewed-by: Christian König --- drivers/gpu/drm/radeon/ni.c | 1 + drivers/gpu/drm/radeon/si.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c index 3d81ca7..e6f3989 100644 --- a/drivers/gpu/drm/radeon/ni.c +++ b/drivers/gpu/drm/radeon/ni.c @@ -1780,6 +1780,7 @@ int cayman_resume(struct radeon_device *rdev) int cayman_suspend(struct radeon_device *rdev) { r600_audio_fini(rdev); + radeon_vm_manager_fini(rdev); cayman_cp_enable(rdev, false); cayman_dma_stop(rdev); evergreen_irq_suspend(rdev); diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c index 9128120..bafbe32 100644 --- a/drivers/gpu/drm/radeon/si.c +++ b/drivers/gpu/drm/radeon/si.c @@ -4469,6 +4469,7 @@ int si_resume(struct radeon_device *rdev) int si_suspend(struct radeon_device *rdev) { + radeon_vm_manager_fini(rdev); si_cp_enable(rdev, false); cayman_dma_stop(rdev); si_irq_suspend(rdev);