From patchwork Mon Nov 5 16:34:58 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 1699501 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork2.kernel.org (Postfix) with ESMTP id 84073DF2AB for ; Mon, 5 Nov 2012 16:36:25 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C11C4A0236 for ; Mon, 5 Nov 2012 08:36:25 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qa0-f42.google.com (mail-qa0-f42.google.com [209.85.216.42]) by gabe.freedesktop.org (Postfix) with ESMTP id 1FDDDA0215 for ; Mon, 5 Nov 2012 08:35:07 -0800 (PST) Received: by mail-qa0-f42.google.com with SMTP id b33so666612qad.15 for ; Mon, 05 Nov 2012 08:35:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=v+Ab4kdpcsKN2Dqf33MM/OsVB8d0qFhbi816bDmid4c=; b=ZStOkGKIAOxKkqNA7JZ9IZEVfvn3a3qmvAlK/+r8J7rzVvXaJlYsZqjHB69l/qGj1G n/TjnzfIh7wdOGPiRQxWVp0P04Q+RXgoUjhk6XVB1L1GNnNpCQ50IFjQFMnK5LuVD7fQ RTlmKZXihfXtlHJb9yECZYvHFE3f3Kl++i11Uo5CLMKefdcJ6rdB4qMJUde1aJJshgk5 pRYiJ+RogNzz7nU9/8tQVmMGuRR0qZW4/OtIFPv5486nHUtrIarYLxVyBR7n/XOQrbi7 pYWqce6G4eUsV2TzrjObb+ouBJEh7tuZUHzf03vDfHZA2TJebdKo8yLE/g4t6yqYwfHK L9Fg== Received: by 10.49.82.113 with SMTP id h17mr18057702qey.24.1352133306080; Mon, 05 Nov 2012 08:35:06 -0800 (PST) Received: from localhost.localdomain (static-74-96-105-49.washdc.fios.verizon.net. [74.96.105.49]) by mx.google.com with ESMTPS id f12sm9020294qey.5.2012.11.05.08.35.04 (version=SSLv3 cipher=OTHER); Mon, 05 Nov 2012 08:35:05 -0800 (PST) From: alexdeucher@gmail.com To: airlied@gmail.com, dri-devel@lists.freedesktop.org Subject: [PATCH] drm/radeon: fix typo in evergreen_mc_resume() Date: Mon, 5 Nov 2012 11:34:58 -0500 Message-Id: <1352133298-19666-1-git-send-email-alexdeucher@gmail.com> X-Mailer: git-send-email 1.7.7.5 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 Add missing index that may have led us to enabling more crtcs than necessary. May also fix: https://bugs.freedesktop.org/show_bug.cgi?id=56139 Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org Reviewed-by: Michel Dänzer --- drivers/gpu/drm/radeon/evergreen.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index 14313ad..af31f82 100644 --- a/drivers/gpu/drm/radeon/evergreen.c +++ b/drivers/gpu/drm/radeon/evergreen.c @@ -1372,7 +1372,7 @@ void evergreen_mc_resume(struct radeon_device *rdev, struct evergreen_mc_save *s WREG32(BIF_FB_EN, FB_READ_EN | FB_WRITE_EN); for (i = 0; i < rdev->num_crtc; i++) { - if (save->crtc_enabled) { + if (save->crtc_enabled[i]) { if (ASIC_IS_DCE6(rdev)) { tmp = RREG32(EVERGREEN_CRTC_BLANK_CONTROL + crtc_offsets[i]); tmp |= EVERGREEN_CRTC_BLANK_DATA_EN;