From patchwork Fri Jan 15 18:51:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 8044011 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 620279F6FA for ; Fri, 15 Jan 2016 18:52:17 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8D18B203A4 for ; Fri, 15 Jan 2016 18:52:16 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 6527C20395 for ; Fri, 15 Jan 2016 18:52:15 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 77FFF6E189; Fri, 15 Jan 2016 10:52:14 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qg0-f48.google.com (mail-qg0-f48.google.com [209.85.192.48]) by gabe.freedesktop.org (Postfix) with ESMTPS id 79C1B6E189 for ; Fri, 15 Jan 2016 10:52:13 -0800 (PST) Received: by mail-qg0-f48.google.com with SMTP id 6so435911810qgy.1 for ; Fri, 15 Jan 2016 10:52:13 -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:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=f3mca7xgLxycHIYcDaqBsfQEVlYqjb2D546Hu7xAANY=; b=xo5ScD8p92NFyiI/+X0f6go5Dn8FiRsGSWrs2flhULDcCaUd3u7eYONIuZuULV7VGJ BDoCFoN+RRVr6K3u624mPHL7IzDS1tf9PVQHO9SViFSP2SkW9JbCRTF0NHTPiJmhLeXI eXgPEJVadzx9kwT42AikoaLIAuwXlBO3SFOXB7CkxTvtzGwUD54pPFeB6QXsYDNBNh88 pKmVg1rW86ruRR2lDSRmalL34exuSfG7nSAAukLJ1CbwOIC1qDwr7sdx7r5d2K6Pjurr Frh6WqC5Pi2POepHeXW06/BgSYRuZ+uwW6iDQ0e1b6zZ2c6GvxC8yllAtbeRErD3l+Xl o3TQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-type:content-transfer-encoding; bh=f3mca7xgLxycHIYcDaqBsfQEVlYqjb2D546Hu7xAANY=; b=BlOdS1XqMbYlIDiyPwWDyzfiIwiv3DJ0Kvx5QjPzeiE+hVRbo84bbVTj7iAbFiVrM+ /0zQOuhM+7p86qWxMqD1w+k2q9ZHAZHD93SqhvCBBRLqyg1Y9JwnybaiT3dR/i4taghB d/3bGArkpGnaVcu43QblJ6jHruD1yI0ui1IgDqrBU30RzCwlEqJ5bQpA7jVydwnjdg/A 7o+u/tWEkQlfFV10ThuJdUoumKHAfq/zTRtXVM+cOE3/UjlQN+skfc4ylCh2H0zMrS0G 3vZ2O2hdkcroInAMWvUJ8IW7bVncCwBRiOr6I4g1Fa0/OB1d5G8BDMh0qeuSZG9sUBy8 VyJQ== X-Gm-Message-State: ALoCoQn35L0pKKsZXCiQY2eC0iIPddkAkDdQwl2ViJ95dbfVkL4Qpz0bCom4SYy098pllOofjeV/VCyPF381XiGIotxdzbzBTg== X-Received: by 10.140.42.13 with SMTP id b13mr15198417qga.67.1452883932657; Fri, 15 Jan 2016 10:52:12 -0800 (PST) Received: from cm.localdomain (static-74-96-105-49.washdc.fios.verizon.net. [74.96.105.49]) by smtp.gmail.com with ESMTPSA id a104sm4994485qge.43.2016.01.15.10.52.12 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 15 Jan 2016 10:52:12 -0800 (PST) From: Alex Deucher X-Google-Original-From: Alex Deucher To: dri-devel@lists.freedesktop.org Subject: [PATCH 2/7] drm/amdgpu: Add some tweaks to gfx 8 soft reset Date: Fri, 15 Jan 2016 13:51:59 -0500 Message-Id: <1452883924-13355-3-git-send-email-alexander.deucher@amd.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1452883924-13355-1-git-send-email-alexander.deucher@amd.com> References: <1452883924-13355-1-git-send-email-alexander.deucher@amd.com> MIME-Version: 1.0 Cc: Alex Deucher X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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, 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 Reviewed-by: Junwei Zhang Reviewed-by: Christian König Reviewed-by: Ken Wang Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c index 4a6d761..7f5625e 100644 --- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c @@ -4186,7 +4186,18 @@ static int gfx_v8_0_soft_reset(void *handle) gfx_v8_0_cp_gfx_enable(adev, false); /* Disable MEC parsing/prefetching */ - /* XXX todo */ + gfx_v8_0_cp_compute_enable(adev, false); + + if (grbm_soft_reset || srbm_soft_reset) { + tmp = RREG32(mmGMCON_DEBUG); + tmp = REG_SET_FIELD(tmp, + GMCON_DEBUG, GFX_STALL, 1); + tmp = REG_SET_FIELD(tmp, + GMCON_DEBUG, GFX_CLEAR, 1); + WREG32(mmGMCON_DEBUG, tmp); + + udelay(50); + } if (grbm_soft_reset) { tmp = RREG32(mmGRBM_SOFT_RESET); @@ -4215,6 +4226,16 @@ static int gfx_v8_0_soft_reset(void *handle) WREG32(mmSRBM_SOFT_RESET, tmp); tmp = RREG32(mmSRBM_SOFT_RESET); } + + if (grbm_soft_reset || srbm_soft_reset) { + tmp = RREG32(mmGMCON_DEBUG); + tmp = REG_SET_FIELD(tmp, + GMCON_DEBUG, GFX_STALL, 0); + tmp = REG_SET_FIELD(tmp, + GMCON_DEBUG, GFX_CLEAR, 0); + WREG32(mmGMCON_DEBUG, tmp); + } + /* Wait a little for things to settle down */ udelay(50); gfx_v8_0_print_status((void *)adev);