From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CA3BCCA9EC9 for ; Mon, 4 Nov 2019 22:11:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9BF19205C9 for ; Mon, 4 Nov 2019 22:11:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572905499; bh=82Iwy/4pR8jTM/KNiRL/8URn/tQlaOBlPsmrF1+kfTo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=W2F+m8jmvFjXElMFNwNfCJv0kpr0V/gmtm1vmSFgUoHwhFx1mIae8T2/mtqq2o0Qc xRBpEWC8JtnE3U49BYTrV4s99QUtEGC2d4u54uzjlVTZZJPeEh8Lv2cFtQIVzjaMZQ COvTNuA1uEK0nZkNPpZsU9XZQn0bvdzwkSxfNZpQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390708AbfKDWLi (ORCPT ); Mon, 4 Nov 2019 17:11:38 -0500 Received: from mail.kernel.org ([198.145.29.99]:44986 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390697AbfKDWLf (ORCPT ); Mon, 4 Nov 2019 17:11:35 -0500 Received: from localhost (6.204-14-84.ripe.coltfrance.com [84.14.204.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2F1BC205C9; Mon, 4 Nov 2019 22:11:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572905494; bh=82Iwy/4pR8jTM/KNiRL/8URn/tQlaOBlPsmrF1+kfTo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WBwB63waYH3nr25XWx/eSS/fttDaTpRv9TAJnzuj4NCWVl3cbTfs+foEGzNj85vQz z5EcerIp5/85psBBydQHrWhzJQyLuVFDJ4/Vhlwcf3shbEzS08ZwQ1IlGZpAPBqlWw SmtwN+TJd9DuW3uVjPL0aYxtPfDWUVNWT9wl8Jlc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, chen gong , Aaron Liu , Alex Deucher Subject: [PATCH 5.3 141/163] drm/amdgpu: Fix SDMA hang when performing VKexample test Date: Mon, 4 Nov 2019 22:45:31 +0100 Message-Id: <20191104212150.546790069@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191104212140.046021995@linuxfoundation.org> References: <20191104212140.046021995@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: chen gong commit e5574f61e9d8274c49e9a5d943abde8e938d57e1 upstream. VKexample test hang during Occlusion/SDMA/Varia runs. Clear XNACK_WATERMK in reg SDMA0_UTCL1_WATERMK to fix this issue. Signed-off-by: chen gong Reviewed-by: Aaron Liu Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 1 + 1 file changed, 1 insertion(+) --- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c @@ -159,6 +159,7 @@ static const struct soc15_reg_golden gol SOC15_REG_GOLDEN_VALUE(SDMA0, 0, mmSDMA0_RLC7_RB_RPTR_ADDR_LO, 0xfffffffd, 0x00000001), SOC15_REG_GOLDEN_VALUE(SDMA0, 0, mmSDMA0_RLC7_RB_WPTR_POLL_CNTL, 0xfffffff7, 0x00403000), SOC15_REG_GOLDEN_VALUE(SDMA0, 0, mmSDMA0_UTCL1_PAGE, 0x000003ff, 0x000003c0), + SOC15_REG_GOLDEN_VALUE(SDMA0, 0, mmSDMA0_UTCL1_WATERMK, 0xfc000000, 0x00000000) }; static const struct soc15_reg_golden golden_settings_sdma1_4_2[] = {