Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp711820pxv; Thu, 15 Jul 2021 14:09:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwXmunNt0vnDbP+kZkKRtSk6r9hhCDnr5iUzTFxfolD2uUk7qd5SpbT/B8PgaxqaGRPDnfW X-Received: by 2002:a17:906:1355:: with SMTP id x21mr2853704ejb.216.1626383391888; Thu, 15 Jul 2021 14:09:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626383391; cv=none; d=google.com; s=arc-20160816; b=RSoTwUFCDsyrmSD+2e5Jyuj3Gf4lyZWZTUrb3DKa+x94hQWmbbNVIrnXKw/v9hQbsl coguzHGtPbc9SxKWmW+ECjvOixdNezVp0wTCS+X1wPc7Vq7JLTmyx+vXyzdVaRHGg1cR lhX5uDCm2KivtPXLHBR+Bse6hILhLgCrRG6ChSIe/DhSqcAY+Q2CPUc9VVUIA2LfYxAF 6qmppjFKqHiUWW+aZ3m7OvcMRTlUXwhP7KD3D4TA/5/4lEjBbGl4cdmlfSqaYwdeLpT8 XYzddYAD5FrBGB9TH3OMwxRl+93Zv5pu5Xp3YfdDWyD7ddKGLVkIOozodYufZDI9C5Zo 4s/A== 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=H1Q26ekc/49Kt9MjJWDUO83tGWfEUPg3IDLu8JIr+hU=; b=c+VJW79FPwTy9Tin4nBQXKplXBelkoe1OQClS/w7i8Npxf/2lTC+WJC9qN/JeDMgAC 4KjZHrto2m2ALAYm24qElst7Cg++1OzRQBzVjyHAlpYbFctTEVzxeKxVG0kMJ+zKRdpV wXMu2sqV3fuK1shyNdEWj6TyYiILVuDuaxwrhws3WphBVoHuXazrifa7A6sy7CfSpPOb EwwkvC5ZuLgk2LZFiOKT6aeE6xPqF3WY85v7zU3kystHB9ublsdGz/+Nl2uANhGhV53X ECzUUhr7NkHfbGGPWPFt43TXef+60RlN4UKnhDtT4Q+KLBuWcpMFGslbYeRNUEgZiImI Z4SA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Mla3t2aI; 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 h2si8508623ejx.355.2021.07.15.14.09.28; Thu, 15 Jul 2021 14:09:51 -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=Mla3t2aI; 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 S243886AbhGOTVb (ORCPT + 99 others); Thu, 15 Jul 2021 15:21:31 -0400 Received: from mail.kernel.org ([198.145.29.99]:38160 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242714AbhGOTFc (ORCPT ); Thu, 15 Jul 2021 15:05:32 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id C7D9661414; Thu, 15 Jul 2021 19:01:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626375715; bh=h6SGYwkOPYKkFn333x4SYe2QVtcmWZIhEINtZl4VNX0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Mla3t2aI4Z86pY1NoaVIF2zJiRiS7/vls9o1ivUwxZZKfEPscFXuvd8egghzjW+8X mpD+N8cfd6FX1qUfM5hcVVwowBcxtA2dwAPV61wv6skipmfM/djlycfSQLSx28NRcb usYkoDvgODCozkuMEZf6KHbgCuMmxY/nzUUeuU9w= 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.12 163/242] drm/amdgpu: enable sdma0 tmz for Raven/Renoir(V2) Date: Thu, 15 Jul 2021 20:38:45 +0200 Message-Id: <20210715182621.875363177@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210715182551.731989182@linuxfoundation.org> References: <20210715182551.731989182@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 @@ -142,7 +142,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) }; @@ -268,7 +268,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) };