Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp659970pxv; Thu, 15 Jul 2021 12:45:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzrBAPlGO2lSc71pGzllmTAC1Qr+tmc5njVotgT7cQPDDIWD7uO5vjTq1k472faDkxKzZBc X-Received: by 2002:a17:906:9d17:: with SMTP id fn23mr7361048ejc.191.1626378319438; Thu, 15 Jul 2021 12:45:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626378319; cv=none; d=google.com; s=arc-20160816; b=MSP0N8RvFDPdDdJlKywlTyAAoO5B62JEmUuwpfBL0nuAfb2sVLrtCtcgQaTzW0EPqs iRsYLxujHC8o3rRO5Olw5PwjnjthxrKhH6GAFig2R+TH1Jv2Rl6SbSqNuyRNP7OK0B5x 9mKD0uRflCXg836k/t1QMxbdkh2vT3YtuT5+ds/3ila4bYK5hb10gUl8fMB5VPlHZe+i McKUQUOtuY63iE+A8INkweUnPfZBerPA31aYALOQE4jr/7MSdS0ymNFVvSAUNH72EEnA sR/UCQH715M2l9ahagEwk1sWdKMAJojut41QhHD1FZ6EnpwtD+I5Tyl7YK+XF8UQYFUn s5fA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=cwiB8cpNT28idIAQ+A262gEI2/VM4wU4989k+9VVLs0=; b=c1WA3upW0E8Pg203wRHESgQvCQCu6cItpulZv5K8IqD66ZbDdvZCbq5woTpm9cAuSD sdos08oGNsCvHlGB8PzyydL+W9oD1v5cl1UFj/HYlgdTI6fieMrR4MplgcnXU4y+qLYS Tx/8/ljjvn2RQ4LDb0w9wjn0DvkL7flZ9Eu2xYCpl4wMbf9qLQFfEWzR+lyL9KMUpSGZ 13oj/iMoJdBEZ1K+rS1Lbkg/8BzLO0kYEpN+EpSn6TcVdB0s05Yqomrgw2/fpIb8XMG3 +cqslVSSBbfKsmooH+wy9NO0hNK/GwSSd+D4tokYCaXC7XqlJOU+NuOwiaChS9OuqJ6g D/gw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=v6v9w0He; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id sa13si7992202ejb.425.2021.07.15.12.44.56; Thu, 15 Jul 2021 12:45:19 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=v6v9w0He; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239623AbhGOTni (ORCPT + 99 others); Thu, 15 Jul 2021 15:43:38 -0400 Received: from mail.kernel.org ([198.145.29.99]:50894 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244587AbhGOTO5 (ORCPT ); Thu, 15 Jul 2021 15:14:57 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id D54BF613FE; Thu, 15 Jul 2021 19:10:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626376241; bh=zVnrzu6C+mHptIFCtc3PyHqup5NPS/GTlv78a3Q3xGM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=v6v9w0HeBIwAjo03nHwhOcX9EZMXk8n/m37rC59E6s8ZgC/jcUNQ5F4PTSbF2Duim Xa0AktXqF+dE6Al4VzYT0BxvdNxITbsb9XkKsUl/79MMEbt62Xs5FY+B4lgpS54iAm JPY3s5gVKODWk3DrKXoumbLBgIo0lj9f1P4w7yww= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Aaron Liu , Luben Tuikov , Alex Deucher Subject: [PATCH 5.13 187/266] drm/amdgpu: enable sdma0 tmz for Raven/Renoir(V2) Date: Thu, 15 Jul 2021 20:39:02 +0200 Message-Id: <20210715182644.221198869@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210715182613.933608881@linuxfoundation.org> References: <20210715182613.933608881@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Aaron Liu commit e2329e74a615cc58b25c42b7aa1477a5e3f6a435 upstream. Without driver loaded, SDMA0_UTCL1_PAGE.TMZ_ENABLE is set to 1 by default for all asic. On Raven/Renoir, the sdma goldsetting changes SDMA0_UTCL1_PAGE.TMZ_ENABLE to 0. This patch restores SDMA0_UTCL1_PAGE.TMZ_ENABLE to 1. Signed-off-by: Aaron Liu Acked-by: Luben Tuikov Acked-by: Alex Deucher 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c @@ -144,7 +144,7 @@ static const struct soc15_reg_golden gol SOC15_REG_GOLDEN_VALUE(SDMA0, 0, mmSDMA0_RLC0_RB_WPTR_POLL_CNTL, 0xfffffff7, 0x00403000), SOC15_REG_GOLDEN_VALUE(SDMA0, 0, mmSDMA0_RLC1_IB_CNTL, 0x800f0111, 0x00000100), SOC15_REG_GOLDEN_VALUE(SDMA0, 0, mmSDMA0_RLC1_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_PAGE, 0x000003ff, 0x000003e0), SOC15_REG_GOLDEN_VALUE(SDMA0, 0, mmSDMA0_UTCL1_WATERMK, 0xfc000000, 0x00000000) }; @@ -288,7 +288,7 @@ static const struct soc15_reg_golden gol SOC15_REG_GOLDEN_VALUE(SDMA0, 0, mmSDMA0_POWER_CNTL, 0x003fff07, 0x40000051), SOC15_REG_GOLDEN_VALUE(SDMA0, 0, mmSDMA0_RLC0_RB_WPTR_POLL_CNTL, 0xfffffff7, 0x00403000), SOC15_REG_GOLDEN_VALUE(SDMA0, 0, mmSDMA0_RLC1_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_PAGE, 0x000003ff, 0x000003e0), SOC15_REG_GOLDEN_VALUE(SDMA0, 0, mmSDMA0_UTCL1_WATERMK, 0xfc000000, 0x03fbe1fe) };