From patchwork Sat Jul 7 11:09:31 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lauri Kasanen X-Patchwork-Id: 1168691 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 942073FC36 for ; Sat, 7 Jul 2012 11:39:38 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6BD829EF60 for ; Sat, 7 Jul 2012 04:34:38 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mailout-eu.gmx.com (mailout-eu.gmx.com [213.165.64.44]) by gabe.freedesktop.org (Postfix) with SMTP id 247DB9ECFF for ; Sat, 7 Jul 2012 04:10:14 -0700 (PDT) Received: (qmail invoked by alias); 07 Jul 2012 11:10:13 -0000 Received: from dsl-jklbrasgw2-feb1f800-169.dhcp.inet.fi (EHLO Valinor) [84.248.177.169] by mail.gmx.com (mp-eu006) with SMTP; 07 Jul 2012 13:10:13 +0200 X-Authenticated: #62935399 X-Provags-ID: V01U2FsdGVkX18a/1N4uE8aI6GpcOL0KHpGwV+5OzEoSTfPxynwwT PnmLJWeQS6H2Ym Date: Sat, 7 Jul 2012 14:09:31 +0300 From: Lauri Kasanen To: dri-devel@lists.freedesktop.org Subject: [PATCH 2/2] drm/radeon: Make sure the correct TA bit is used for R700 Message-Id: <20120707140931.1896a055.cand@gmx.com> X-Mailer: Sylpheed 3.1.4 (GTK+ 2.18.6; x86_64-unknown-linux-gnu) Mime-Version: 1.0 X-Y-GMX-Trusted: 0 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: , 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 The declarations were moved around because of a GCC warning, "ISO C90 forbids mixed declarations and code". (why so strict?) Signed-off-by: Lauri Kasanen --- drivers/gpu/drm/radeon/r600.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c index bff6272..c77cdba 100644 --- a/drivers/gpu/drm/radeon/r600.c +++ b/drivers/gpu/drm/radeon/r600.c @@ -1278,15 +1278,24 @@ void r600_vram_scratch_fini(struct radeon_device *rdev) int r600_gpu_soft_reset(struct radeon_device *rdev) { struct rv515_mc_save save; - u32 grbm_busy_mask = S_008010_VC_BUSY(1) | S_008010_VGT_BUSY_NO_DMA(1) | - S_008010_VGT_BUSY(1) | S_008010_TA03_BUSY(1) | + u32 grbm_busy_mask; + u32 grbm2_busy_mask; + u32 tmp; + + u32 ta_busy = S_008010_TA03_BUSY(1); + + if (rdev->family >= CHIP_RV770) + ta_busy = S_008010_R700_TA03_BUSY(1); + + grbm_busy_mask = S_008010_VC_BUSY(1) | S_008010_VGT_BUSY_NO_DMA(1) | + S_008010_VGT_BUSY(1) | ta_busy | S_008010_TC_BUSY(1) | S_008010_SX_BUSY(1) | S_008010_SH_BUSY(1) | S_008010_SPI03_BUSY(1) | S_008010_SMX_BUSY(1) | S_008010_SC_BUSY(1) | S_008010_PA_BUSY(1) | S_008010_DB03_BUSY(1) | S_008010_CR_BUSY(1) | S_008010_CB03_BUSY(1) | S_008010_GUI_ACTIVE(1); - u32 grbm2_busy_mask = S_008014_SPI0_BUSY(1) | S_008014_SPI1_BUSY(1) | + grbm2_busy_mask = S_008014_SPI0_BUSY(1) | S_008014_SPI1_BUSY(1) | S_008014_SPI2_BUSY(1) | S_008014_SPI3_BUSY(1) | S_008014_TA0_BUSY(1) | S_008014_TA1_BUSY(1) | S_008014_TA2_BUSY(1) | S_008014_TA3_BUSY(1) | @@ -1294,7 +1303,6 @@ int r600_gpu_soft_reset(struct radeon_device *rdev) S_008014_DB2_BUSY(1) | S_008014_DB3_BUSY(1) | S_008014_CB0_BUSY(1) | S_008014_CB1_BUSY(1) | S_008014_CB2_BUSY(1) | S_008014_CB3_BUSY(1); - u32 tmp; if (!(RREG32(GRBM_STATUS) & GUI_ACTIVE)) return 0;