From patchwork Wed Mar 12 19:38:48 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 3820661 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 4F73D9F369 for ; Wed, 12 Mar 2014 19:39:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9041720165 for ; Wed, 12 Mar 2014 19:39:12 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id BDB792015A for ; Wed, 12 Mar 2014 19:39:11 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 72763FB271; Wed, 12 Mar 2014 12:39:04 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qc0-f182.google.com (mail-qc0-f182.google.com [209.85.216.182]) by gabe.freedesktop.org (Postfix) with ESMTP id 3051AFB071 for ; Wed, 12 Mar 2014 12:38:57 -0700 (PDT) Received: by mail-qc0-f182.google.com with SMTP id e16so11809632qcx.41 for ; Wed, 12 Mar 2014 12:38:56 -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=JLVkqGIpCH+SuJhW2XLe3vCBBVQVCcVOkptF234pwZ4=; b=lClo+T1rvEkeYYDy7+S4PFxKDxg7BjGOWk8J+8++/ZtFEkUAXOGZPnYqukj//fGx2n 9TP9KFqwzDnmc4ONulZ1ImacxzogZ9KgYlW45D+sLkBPC2G075stTX80yFxjztLTx4BW Wg9Bl/2KXDXYdMGQ8F1z0Os/SKuM8kXYIiZWAuOV7/K+vfOlVm7JbsqaXbVCLsa4gAb+ 3Fa6xYDFW7gSeFzKTllI2WFy3fOGELC7m1B2JqvZdhUYIDR2CwTWOMzyQiJu++TTMMIX BfdUb95/w9A/0XPnwcRGWcUVJlV3BhiftOVbmDWWD53Ckz3Uh3DelilnofHxKnqsOzYG ZDjg== X-Received: by 10.224.12.14 with SMTP id v14mr57170149qav.73.1394653136841; Wed, 12 Mar 2014 12:38:56 -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 d30sm4177814qga.9.2014.03.12.12.38.55 for (version=TLSv1.2 cipher=AES128-GCM-SHA256 bits=128/128); Wed, 12 Mar 2014 12:38:55 -0700 (PDT) From: Alex Deucher To: dri-devel@lists.freedesktop.org Subject: [PATCH 1/2] drm/radeon/cik: properly set sdma ring status on disable Date: Wed, 12 Mar 2014 15:38:48 -0400 Message-Id: <1394653129-2104-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@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, 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 When we disable the rings, set the status properly. If not other code pathes may try and use the rings which are not functional at this point. Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org --- drivers/gpu/drm/radeon/cik_sdma.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/radeon/cik_sdma.c b/drivers/gpu/drm/radeon/cik_sdma.c index 1ecb3f1..5d7a5fa 100644 --- a/drivers/gpu/drm/radeon/cik_sdma.c +++ b/drivers/gpu/drm/radeon/cik_sdma.c @@ -264,6 +264,8 @@ static void cik_sdma_gfx_stop(struct radeon_device *rdev) WREG32(SDMA0_GFX_RB_CNTL + reg_offset, rb_cntl); WREG32(SDMA0_GFX_IB_CNTL + reg_offset, 0); } + rdev->ring[R600_RING_TYPE_DMA_INDEX].ready = false; + rdev->ring[CAYMAN_RING_TYPE_DMA1_INDEX].ready = false; } /**