Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp634611pxv; Thu, 15 Jul 2021 12:04:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzr2Sus46MS5B09LmxgS0CumIKh+rBEztkxbIRbRJjcra3/BXhtOEPvTduleYGUZQIsWf30 X-Received: by 2002:a5d:858b:: with SMTP id f11mr4315325ioj.156.1626375876694; Thu, 15 Jul 2021 12:04:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626375876; cv=none; d=google.com; s=arc-20160816; b=kYRNaRmq9geHC9316J0yM2SfUArxneAvGfh+acFgMwgmnk7McaQ99Bo/w6tEQ9Mqr2 ZvW7eMkGicRoyDcxoSpCMQThtmlVcxLEXpwYE5UEp/f31kIdnzS1sBIpEyPG94q2VfI9 eBWNk530REc7lUJDK27VdRQL29oq6tV+T0jE+8OEqXdKFS9XbgFgZwGOuo10vXQbKau0 RL4g/SHuVuPqlIxcyEr58vCnQL4eO/cSP23Fb/7tyBrXCQWzWfrBHcH9BLAWcLSjwihk PirO5OIE3RQk8pikwgaNh00LPEsNwEbmR1t1ZdWXnmKhlzLadwPv0gHqAfuCKpDeu14H /zNA== 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=xcg5dBQ440hLjGIetsaChmJqZ3lfBsHut3N+3X9P0B8=; b=oS8ujPWGtH9lh3JcnEqH3+tK0KResa9hJzPX5x2lc/FWvhfoCIyYqXoHsTwg8FGDBb 74KJnorY/eEMDwP2JrUclnerpaQaVnDYoaUandkapyATph9eAGPujjRHsRlSWzUbDDBW SFw9X5AOkQ/7g7NL2u3u8DIfuG+dGwY9cF0jOff1BQS74ozMnKZwusHUoREobpt21ZU6 rXOg0kusjmQD9cpqZq5tJPIgYHzi+19RJuB4qg4g2gY9p+5ZlU/HCivigVO78DuGwjIR rkWhgDy1wfk2vG4CCECGRq7UzJsJKsnMTNx0KIAP+5sXrQSap9dOf3/yLCgzRV40CqWm cBfA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=U6Mz5Hkv; 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 h13si7599556iop.97.2021.07.15.12.04.23; Thu, 15 Jul 2021 12:04:36 -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=U6Mz5Hkv; 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 S241929AbhGOTFF (ORCPT + 99 others); Thu, 15 Jul 2021 15:05:05 -0400 Received: from mail.kernel.org ([198.145.29.99]:59882 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240754AbhGOSzx (ORCPT ); Thu, 15 Jul 2021 14:55:53 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id A77AE610C7; Thu, 15 Jul 2021 18:52:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626375179; bh=hiFfcImKXdb4KrxusaWyGhEjB14sFU6NBWrhsb2lHu4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=U6Mz5HkvYabgnF5Csy0onMry9wDO4auNbKL8Rnq3ETSdSSvnEOevv/ExNM+vivMjI qECm68VuwPS0u7wo/pdlupc3fXYwgQ+vBj+wVpTDtIvzhDUbT7Vag9H44AbQFU2SUa sZrA10OtXhwFLRwZVdk7D6CJa816Py7Ac3QRVvv0= 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.10 150/215] drm/amdgpu: enable sdma0 tmz for Raven/Renoir(V2) Date: Thu, 15 Jul 2021 20:38:42 +0200 Message-Id: <20210715182626.125702032@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210715182558.381078833@linuxfoundation.org> References: <20210715182558.381078833@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 @@ -143,7 +143,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) }; @@ -269,7 +269,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) };