Received: by 2002:ac0:946b:0:0:0:0:0 with SMTP id j40csp926301imj; Sat, 9 Feb 2019 10:58:35 -0800 (PST) X-Google-Smtp-Source: AHgI3IbPO3/Fs1+2K9kZgq0myY+lmefwLkFbGdvOdqDxUfgsTVsz+aDXR8NYjQMUFUETlLRxYnlT X-Received: by 2002:a17:902:8a91:: with SMTP id p17mr29806639plo.316.1549738715788; Sat, 09 Feb 2019 10:58:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549738715; cv=none; d=google.com; s=arc-20160816; b=s55+ytqFm964A82vkuZSDxBl/sWFdGO6whDkxF0fCiDwtSUpAMrVvOhGqUxMK9eWtE PYufUHgYJos2oDJAwgYTj/F32gUbq44MFeskzfGdFi2FE3De+h3Xry+2U+ytUdvCnM9A babDZCqpgX2WKt9UVgmCZfnzpcKlORnE9Nuwr+6ssAAGBkJ7QcJonH7AIlDskrtk/PJW 1tCNXhY0Jqe6BDZeVv5bgB3+WkYn5zbmO6zeBiGp33T+Ft47a5bSl2DU3Brbl5VRE0/N rOnH0/mUW5c8dMs2JXwa2+IS3kILYJw9S/clQLsK3z9mLeNzoVDJd9QCuH910mi0oWCE mb7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=+S2bWNxO3Sj/c1WC9z2In0/F2/VDJB2+WBckg6piI+M=; b=CSLDSqBAFPuDATYxI5p1A/NasKOrJLo6w2Tdx5T9BjjRQonueDa2WwmxLULqeqfvIW 60KuBC/XJxb1zgbwQyOPLQXBcCpI++M5ffmDe60HtVNDNCL4TEHLFVeyvqZh6fyrmeej 4EgyFfv/e7uDc7z+flhyaAfrhw7Xf3FuJHiNQWLLIfm+M682pt08IlLwlV8OWXXCX6wT B2WaNEDhhVjvKnwA0ZuXF+Vqq1yBFxcKcjfwitd5G+OfJLGkuh2f9vHGpPFx0Xm682tm cAzUMqrjoZHJ3X1eR/LI2FG6pPDkOg67YKXbjRpjoYa0G2Ynu4znYOH3SCuegmkVcsY3 UUeQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=JguHeDrn; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m75si5982595pfj.53.2019.02.09.10.58.20; Sat, 09 Feb 2019 10:58:35 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=JguHeDrn; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728010AbfBIS4I (ORCPT + 99 others); Sat, 9 Feb 2019 13:56:08 -0500 Received: from mail.kernel.org ([198.145.29.99]:32886 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727333AbfBISsL (ORCPT ); Sat, 9 Feb 2019 13:48:11 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 64BDB2192B; Sat, 9 Feb 2019 18:48:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549738090; bh=piS+ve4NsLFiqF14w5vK98/GfacsCblY/WaVt8eL1YY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JguHeDrnkCp3+Ke4Wxf3qFMEf8YNdfdindUM+ItfYIZcxhuC5DjuZ3VRFB5faJQ4z P49Zb3qUxV5Idzyc2gEgJqtQ/6s4juMIBQSZKAZGP17S8Z6c6idAihn03bkhse5CRO 3H+/6cN71P9Yp8TKR2EllgJI2XUWNCv0QGxE954w= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jim Qu , Alex Deucher , Sasha Levin , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 4.20 27/42] drm/amdgpu: set WRITE_BURST_LENGTH to 64B to workaround SDMA1 hang Date: Sat, 9 Feb 2019 13:47:19 -0500 Message-Id: <20190209184734.125935-27-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190209184734.125935-1-sashal@kernel.org> References: <20190209184734.125935-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jim Qu [ Upstream commit 0c6c8125582714e1fd3544983eba3d750db0f5b8 ] effect asics: VEGA10 and VEGA12 Signed-off-by: Jim Qu Acked-by: Alex Deucher Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c index 7a8c9172d30a..86d5dc5f8887 100644 --- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c @@ -73,7 +73,6 @@ static const struct soc15_reg_golden golden_settings_sdma_4[] = { SOC15_REG_GOLDEN_VALUE(SDMA0, 0, mmSDMA0_RLC1_RB_WPTR_POLL_CNTL, 0x0000fff0, 0x00403000), SOC15_REG_GOLDEN_VALUE(SDMA0, 0, mmSDMA0_UTCL1_PAGE, 0x000003ff, 0x000003c0), SOC15_REG_GOLDEN_VALUE(SDMA0, 0, mmSDMA0_UTCL1_WATERMK, 0xfc000000, 0x00000000), - SOC15_REG_GOLDEN_VALUE(SDMA1, 0, mmSDMA1_CHICKEN_BITS, 0xfe931f07, 0x02831f07), SOC15_REG_GOLDEN_VALUE(SDMA1, 0, mmSDMA1_CLK_CTRL, 0xffffffff, 0x3f000100), SOC15_REG_GOLDEN_VALUE(SDMA1, 0, mmSDMA1_GFX_IB_CNTL, 0x800f0100, 0x00000100), SOC15_REG_GOLDEN_VALUE(SDMA1, 0, mmSDMA1_GFX_RB_WPTR_POLL_CNTL, 0x0000fff0, 0x00403000), @@ -91,6 +90,7 @@ static const struct soc15_reg_golden golden_settings_sdma_4[] = { static const struct soc15_reg_golden golden_settings_sdma_vg10[] = { SOC15_REG_GOLDEN_VALUE(SDMA0, 0, mmSDMA0_GB_ADDR_CONFIG, 0x0018773f, 0x00104002), SOC15_REG_GOLDEN_VALUE(SDMA0, 0, mmSDMA0_GB_ADDR_CONFIG_READ, 0x0018773f, 0x00104002), + SOC15_REG_GOLDEN_VALUE(SDMA1, 0, mmSDMA1_CHICKEN_BITS, 0xfe931f07, 0x02831d07), SOC15_REG_GOLDEN_VALUE(SDMA1, 0, mmSDMA1_GB_ADDR_CONFIG, 0x0018773f, 0x00104002), SOC15_REG_GOLDEN_VALUE(SDMA1, 0, mmSDMA1_GB_ADDR_CONFIG_READ, 0x0018773f, 0x00104002) }; @@ -98,6 +98,7 @@ static const struct soc15_reg_golden golden_settings_sdma_vg10[] = { static const struct soc15_reg_golden golden_settings_sdma_vg12[] = { SOC15_REG_GOLDEN_VALUE(SDMA0, 0, mmSDMA0_GB_ADDR_CONFIG, 0x0018773f, 0x00104001), SOC15_REG_GOLDEN_VALUE(SDMA0, 0, mmSDMA0_GB_ADDR_CONFIG_READ, 0x0018773f, 0x00104001), + SOC15_REG_GOLDEN_VALUE(SDMA1, 0, mmSDMA1_CHICKEN_BITS, 0xfe931f07, 0x02831d07), SOC15_REG_GOLDEN_VALUE(SDMA1, 0, mmSDMA1_GB_ADDR_CONFIG, 0x0018773f, 0x00104001), SOC15_REG_GOLDEN_VALUE(SDMA1, 0, mmSDMA1_GB_ADDR_CONFIG_READ, 0x0018773f, 0x00104001) }; -- 2.19.1