From patchwork Mon Aug 26 21:46:04 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 2849806 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D879A9F2F4 for ; Mon, 26 Aug 2013 21:46:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1CB1820431 for ; Mon, 26 Aug 2013 21:46:32 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 39FF620430 for ; Mon, 26 Aug 2013 21:46:31 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 18F80E734A for ; Mon, 26 Aug 2013 14:46:31 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qa0-f50.google.com (mail-qa0-f50.google.com [209.85.216.50]) by gabe.freedesktop.org (Postfix) with ESMTP id A5F06E7394 for ; Mon, 26 Aug 2013 14:46:12 -0700 (PDT) Received: by mail-qa0-f50.google.com with SMTP id o13so1960359qaj.16 for ; Mon, 26 Aug 2013 14:46:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=2ptFYGX2Tu4YY9o4U9eYm1uO+fBH9ANmbVB02/Mytro=; b=PN5Yr6v1lDiq7RUeuWS4tvdv6aDbhP5bAeP7BtOFF398rCrk7+KIGIWSGW9mEgDLXX 5kvK2S4gcrcLU3OubfcjvXiwiugFRkfsW69Tm1l/eBgeVp3kcNhingSuoCLxLxFKhz1+ Xj6k6gLihuWHy6NgRz9srD/tXZO1ONKBYqd733/dVw6MlDZPfXuT4HVs3ggEV2LS9/6k +EC3Zw424+zTAcv0R3k5oPonc+dv3SSqsfY6/26x8bQ2/jUZQX3IXZryEM4xndB5l/i+ BpDbmCtTHDz46ujnIORTrnnbljC1nRGtCttnkZK0umQpVILlesSu3lISoFZDKyL+T12q Mrfw== X-Received: by 10.224.54.7 with SMTP id o7mr18887622qag.49.1377553572050; Mon, 26 Aug 2013 14:46:12 -0700 (PDT) Received: from localhost.localdomain (static-74-96-105-49.washdc.fios.verizon.net. [74.96.105.49]) by mx.google.com with ESMTPSA id m10sm24748876qae.12.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 26 Aug 2013 14:46:11 -0700 (PDT) From: Alex Deucher To: dri-devel@lists.freedesktop.org, linux@rainbow-software.org Subject: [PATCH] drm/radeon: fix resume on some rs4xx boards Date: Mon, 26 Aug 2013 17:46:04 -0400 Message-Id: <1377553564-25383-1-git-send-email-alexander.deucher@amd.com> X-Mailer: git-send-email 1.8.3.1 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 X-Spam-Status: No, score=-6.5 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Setting MC_MISC_CNTL.GART_INDEX_REG_EN causes hangs on some boards on resume. The systems seem to work fine without touching this bit so leave it as is. Reported-by: Ondrej Zary Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org --- drivers/gpu/drm/radeon/rs400.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/radeon/rs400.c b/drivers/gpu/drm/radeon/rs400.c index 233a9b9..d48fdacd 100644 --- a/drivers/gpu/drm/radeon/rs400.c +++ b/drivers/gpu/drm/radeon/rs400.c @@ -177,7 +177,8 @@ int rs400_gart_enable(struct radeon_device *rdev) WREG32_MC(RS480_MC_MISC_CNTL, (RS480_GART_INDEX_REG_EN | RS690_BLOCK_GFX_D3_EN)); } else { - WREG32_MC(RS480_MC_MISC_CNTL, RS480_GART_INDEX_REG_EN); + /* XXX this causes hangs on a some boards on resume */ + /*WREG32_MC(RS480_MC_MISC_CNTL, RS480_GART_INDEX_REG_EN);*/ } /* Enable gart */ WREG32_MC(RS480_AGP_ADDRESS_SPACE_SIZE, (RS480_GART_EN | size_reg));