From patchwork Thu Sep 18 17:26:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 4933081 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 2C3329F350 for ; Thu, 18 Sep 2014 17:26:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1AFEA2015D for ; Thu, 18 Sep 2014 17:27:00 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id DDC992017D for ; Thu, 18 Sep 2014 17:26:58 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4B99D6E279; Thu, 18 Sep 2014 10:26:58 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qc0-f176.google.com (mail-qc0-f176.google.com [209.85.216.176]) by gabe.freedesktop.org (Postfix) with ESMTP id 63C7C89BC0 for ; Thu, 18 Sep 2014 10:26:53 -0700 (PDT) Received: by mail-qc0-f176.google.com with SMTP id x3so1739498qcv.7 for ; Thu, 18 Sep 2014 10:26:52 -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:in-reply-to:references; bh=ujBo2ShugTns9ZPmJ5/wpaapbvEkJt80uDVTd2HGVxo=; b=gzXuh/BfHN/G1L+I+qyzX+KGNoYFG/+2zXjjAGGIzuwXRWtw2dHLsDz/9wWl8qbK7M ACvcn6dLjtvbRvL38Zudrr+3xwpzOdoBcbsxIuQI+RjUUZbBqleH3JRAgEdgeHG6s7w3 oWEePqgCby1wKl8paldzvv5OF9E17YYzEtV6h2S1G52JBrl6Q66NRYNC8/yVwJXMT9Wv Djj+GaTCWMxw9Zs0G7cD44XK9cYcqpLJfCCK/KoIdcR5Godm2xrX8uichQXQZQOis89g j5uzR/9ihNlHhJnqB0SVCa8xyC4kfPvGM4cIoHBlZnW5MmVC6U1VDf+HfiwQrEP3FhBP bu7A== X-Received: by 10.224.22.16 with SMTP id l16mr7179592qab.84.1411061212788; Thu, 18 Sep 2014 10:26:52 -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 t67sm17003129qge.13.2014.09.18.10.26.52 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Sep 2014 10:26:52 -0700 (PDT) From: Alex Deucher X-Google-Original-From: Alex Deucher To: dri-devel@lists.freedesktop.org Subject: [PATCH 3/3] drm/radeon: don't reset dma on r6xx-evergreen init Date: Thu, 18 Sep 2014 13:26:44 -0400 Message-Id: <1411061204-721-3-git-send-email-alexander.deucher@amd.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1411061204-721-1-git-send-email-alexander.deucher@amd.com> References: <1411061204-721-1-git-send-email-alexander.deucher@amd.com> Cc: Alex Deucher , stable@vger.kernel.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.7 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 Otherwise we may lose the DMA golden settings which can lead to hangs, etc. Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org --- drivers/gpu/drm/radeon/r600_dma.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/drivers/gpu/drm/radeon/r600_dma.c b/drivers/gpu/drm/radeon/r600_dma.c index 51fd985..a908daa 100644 --- a/drivers/gpu/drm/radeon/r600_dma.c +++ b/drivers/gpu/drm/radeon/r600_dma.c @@ -124,15 +124,6 @@ int r600_dma_resume(struct radeon_device *rdev) u32 rb_bufsz; int r; - /* Reset dma */ - if (rdev->family >= CHIP_RV770) - WREG32(SRBM_SOFT_RESET, RV770_SOFT_RESET_DMA); - else - WREG32(SRBM_SOFT_RESET, SOFT_RESET_DMA); - RREG32(SRBM_SOFT_RESET); - udelay(50); - WREG32(SRBM_SOFT_RESET, 0); - WREG32(DMA_SEM_INCOMPLETE_TIMER_CNTL, 0); WREG32(DMA_SEM_WAIT_FAIL_TIMER_CNTL, 0);