Received: by 2002:a05:6358:45e:b0:b5:b6eb:e1f9 with SMTP id 30csp2027084rwe; Fri, 2 Sep 2022 07:32:17 -0700 (PDT) X-Google-Smtp-Source: AA6agR5t9z8M7g97p9Og7g+oU3j+x33fQJLuJl3Mm1skCgeb1i7I4o/kP/n9l2dqphsnWWPCZpK4 X-Received: by 2002:a17:90a:a882:b0:1fd:8bc5:7b1a with SMTP id h2-20020a17090aa88200b001fd8bc57b1amr5097592pjq.10.1662129137334; Fri, 02 Sep 2022 07:32:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662129137; cv=none; d=google.com; s=arc-20160816; b=oJgwW+veT4kBYWGj6S83Nm/cA4JVoTMzQAsKlTIASqs9HetmTjKcHENoZoo1ea7kK4 VFkRpA34d9jkaOqQLgSCxog2t2RE6dJOi2wUNKNIOcHh3CNpmklUlbsg5JeucA2B2JYr Bt64Q/TsYqyHhL0gQgYKKbIf+ohBlDfN2DwSgd5NlsAYt+wTY+Q0Fegp+4vJpnkKAzxg P7jWUlWOzB7OGa8p2YM66atUt3VSJ4vPQ0piXW/Wm8JdqfBGeIscllEef0P4JFUK2sdF LQCQH3bnTLI7OhVZBKXicfgQJDbxL8dsuhOY9lTvF/Zk2KuGkBfJN1OmJLJXR0DSeQi5 UNig== 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=UbTxjWQWcrIlUcwG1319IGUzIaKgF/dPSJTsVwmXjaU=; b=e5XlahKtwT5XjmGDPB5GG0czC8lw2sNk1zznqfbpheRpqiOkC4CCtUJzjo1vV2x1tL ReaMM3c8ONh05s1luy5yP8PkBsXcd8s26BvWJZQUzu32vx9qsCqeJ52kYvq8JYCKlDmG K43OkPZmAESI9xZKj2AaLjg2VynZkaGle2/aU8dUNTJvgK/FwxkBJb3EmvUNqJNyUn7Y oTghbPgbKiJZN24zfGpp2FnlO+pdFFU97VXr1+gOOUYxcSRbauhm+0CmDaTbn4SEPbCU DDOAncg9o12gZgS2DfVpZYdY+lFK+0q74VmSuNnoPalY0r57xtW4XDKMKcJ58gWHwckm IJ3w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=u6D4h+GH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id cp8-20020a056a00348800b0053b091eb6c9si2168539pfb.273.2022.09.02.07.32.02; Fri, 02 Sep 2022 07:32:17 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=u6D4h+GH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 S238110AbiIBM4j (ORCPT + 99 others); Fri, 2 Sep 2022 08:56:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34826 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238233AbiIBMyI (ORCPT ); Fri, 2 Sep 2022 08:54:08 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 090F0D9D; Fri, 2 Sep 2022 05:38:44 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id A8D3662181; Fri, 2 Sep 2022 12:38:20 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9E1D2C433C1; Fri, 2 Sep 2022 12:38:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1662122300; bh=oMTC32BuVSAw4PAlLwY406UsI1M/nTgKc6MBfnXNkKQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=u6D4h+GHTJSRFUCl27KJXT9YNm0G2k0ILu/vQ6c/Ut3zA06aMRBAZLx0hoBLP2Msk gp257EojnvXghi3R1mnpaOH5VlMQczQR47BPYcufoVB1BkrEAF7ExE/Qx3s8fcno0K Qqj14/gsl2qnHe3Ggu+LA59ZaaUmDd/gBEWpRXvc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Shane Xiao , Aaron Liu , Alex Deucher , Sasha Levin Subject: [PATCH 5.19 60/72] drm/amdgpu: Add secure display TA load for Renoir Date: Fri, 2 Sep 2022 14:19:36 +0200 Message-Id: <20220902121406.750858595@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220902121404.772492078@linuxfoundation.org> References: <20220902121404.772492078@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Shane Xiao [ Upstream commit e42dfa66d59240afbdd8d4b47b87486db39504aa ] Add secure display TA load for Renoir Signed-off-by: Shane Xiao Reviewed-by: Aaron Liu Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/psp_v12_0.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v12_0.c b/drivers/gpu/drm/amd/amdgpu/psp_v12_0.c index a2588200ea580..0b2ac418e4ac4 100644 --- a/drivers/gpu/drm/amd/amdgpu/psp_v12_0.c +++ b/drivers/gpu/drm/amd/amdgpu/psp_v12_0.c @@ -101,6 +101,16 @@ static int psp_v12_0_init_microcode(struct psp_context *psp) adev->psp.dtm_context.context.bin_desc.start_addr = (uint8_t *)adev->psp.hdcp_context.context.bin_desc.start_addr + le32_to_cpu(ta_hdr->dtm.offset_bytes); + + if (adev->apu_flags & AMD_APU_IS_RENOIR) { + adev->psp.securedisplay_context.context.bin_desc.fw_version = + le32_to_cpu(ta_hdr->securedisplay.fw_version); + adev->psp.securedisplay_context.context.bin_desc.size_bytes = + le32_to_cpu(ta_hdr->securedisplay.size_bytes); + adev->psp.securedisplay_context.context.bin_desc.start_addr = + (uint8_t *)adev->psp.hdcp_context.context.bin_desc.start_addr + + le32_to_cpu(ta_hdr->securedisplay.offset_bytes); + } } return 0; -- 2.35.1