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=-3.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,HTML_MESSAGE,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=no 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 940D9C43603 for ; Wed, 18 Dec 2019 05:32:43 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5A5E42082E for ; Wed, 18 Dec 2019 05:32:43 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=amdcloud.onmicrosoft.com header.i=@amdcloud.onmicrosoft.com header.b="ISMiElf1" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5A5E42082E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amd.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=amd-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BEFEB6E21F; Wed, 18 Dec 2019 05:32:42 +0000 (UTC) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2067.outbound.protection.outlook.com [40.107.244.67]) by gabe.freedesktop.org (Postfix) with ESMTPS id D9EE96E21F for ; Wed, 18 Dec 2019 05:32:40 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=efqyBs2uY+11u6deFktIYswvxAWbs9XbMfByKWeu+BOKOTfoeIH5y6Ck3uHZe4kWQmjQoJZPIAIY3T5hSDjn9T1MkdZRMSsva6/49L7CadLA69uhkm6RApqReFkDemRlUj2LpKRH1YxR0dAAYlS7uPyTEpLeSCFvLZNzLrOfm+mwCVoF59A5Fvkt9xzru52/jgSyRqtguqbDbSQA4LVIqKtyl0jqM0KxmFVQKxfoiHpNCgRmCH7lRO+r9dzdOlP3R1UBe+vpWivr7dZP9yAbtLK0WhctydQQ+/CdSpBTfZLIfXyXysOuBj0WN/vOnLV2ozlk95xerlDgtrxJwOO8YA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=7LfDcT8mwcPAsXbs/KLOsRZ4ItAtg7T0AxM0TFlfwhc=; b=iqfCvQIQKfkN+jgK7DwAVNK0aoBbW7uLeG70h2ynniJcNT5U/RllIS/hNPZ9qkivE+p/ty4lgHPpbkUFYiDbz3Ylepjdet0JeuykVd7GSyvRFVFscAOyyOFGN0L2zJM7GKZ6MvNnTXDI3e4PVN9oMnhVMTXiiblNSCra0TBawq2lAKaZ5kn7+nDARHmIS3BfiUIkTuXZdDtuyw00lwSPSKOQcGyN4bauFtizKJYizoW8OJJ4xoBCJERK4/4wg/FF7oWxZaKf8hzW/p9zoWcKpKg+zmv3m1k6RsKvGnmkncd2n4RpyF+otxfph9Inbv1qe+GQE8JyMIEQM26ew2h3BQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector2-amdcloud-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=7LfDcT8mwcPAsXbs/KLOsRZ4ItAtg7T0AxM0TFlfwhc=; b=ISMiElf1XK9sNuZrV676nco21dkJzr/3pmrV4WdSJWcIqcLIGoAjFkFi0aTBJeBgrSIRjn8VRPz5x7eAr9REI6rihU+QkIgAUAe2CXkUx91PiRDOKIq9F8Zr63vTODWBAetqYQFuhGCTcQaaXBKC0DhOryKopdh6+lnVAf+JHzs= Received: from MN2PR12MB3296.namprd12.prod.outlook.com (20.179.80.139) by MN2PR12MB4286.namprd12.prod.outlook.com (10.255.125.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2538.15; Wed, 18 Dec 2019 05:32:38 +0000 Received: from MN2PR12MB3296.namprd12.prod.outlook.com ([fe80::b02a:3af3:a3c2:61f3]) by MN2PR12MB3296.namprd12.prod.outlook.com ([fe80::b02a:3af3:a3c2:61f3%6]) with mapi id 15.20.2538.019; Wed, 18 Dec 2019 05:32:38 +0000 From: "Wang, Kevin(Yang)" To: "Yin, Tianci (Rico)" , "amd-gfx@lists.freedesktop.org" Subject: Re: [PATCH 1/2] drm/amdgpu: update the method to get fb_loc of memory training Thread-Topic: [PATCH 1/2] drm/amdgpu: update the method to get fb_loc of memory training Thread-Index: AQHVtUnfeURRT0G2EUG+ocMfwBWfV6e/XVZ7 Date: Wed, 18 Dec 2019 05:32:37 +0000 Message-ID: References: <20191218022126.25205-1-tianci.yin@amd.com> In-Reply-To: <20191218022126.25205-1-tianci.yin@amd.com> Accept-Language: en-US, zh-CN Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: msip_labels: MSIP_Label_76546daa-41b6-470c-bb85-f6f40f044d7f_Enabled=True; MSIP_Label_76546daa-41b6-470c-bb85-f6f40f044d7f_SiteId=3dd8961f-e488-4e60-8e11-a82d994e183d; MSIP_Label_76546daa-41b6-470c-bb85-f6f40f044d7f_SetDate=2019-12-18T05:32:37.060Z; MSIP_Label_76546daa-41b6-470c-bb85-f6f40f044d7f_Name=Internal Distribution Only; MSIP_Label_76546daa-41b6-470c-bb85-f6f40f044d7f_ContentBits=0; MSIP_Label_76546daa-41b6-470c-bb85-f6f40f044d7f_Method=Standard; authentication-results: spf=none (sender IP is ) smtp.mailfrom=Kevin1.Wang@amd.com; x-originating-ip: [180.167.199.189] x-ms-publictraffictype: Email x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 03136536-9f55-4713-c460-08d7837bb1dd x-ms-traffictypediagnostic: MN2PR12MB4286:|MN2PR12MB4286: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:7691; x-forefront-prvs: 0255DF69B9 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(4636009)(39860400002)(366004)(376002)(346002)(136003)(396003)(199004)(189003)(7696005)(71200400001)(86362001)(19627405001)(66476007)(5660300002)(110136005)(64756008)(9686003)(91956017)(2906002)(4326008)(81156014)(26005)(8676002)(81166006)(478600001)(8936002)(76116006)(53546011)(186003)(66946007)(66446008)(316002)(55016002)(6506007)(33656002)(52536014)(15650500001)(66556008)(54906003); DIR:OUT; SFP:1101; SCL:1; SRVR:MN2PR12MB4286; H:MN2PR12MB3296.namprd12.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: amd.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 02cHf9vcxbmmKWRuHEomge5af7aYNcCrXN/fE3BE7zx7fAIbsGKqBNlY1jooCU48PeqPNjKZ9JUABsNO7j5s6O6x1ovnxmnvwsUlMfUO9kP6asNDHZ8FQMOZdMNOI/WrzOWVMNdycZdhcyUCPu9HcaKA10GHr6R2WYFWzMRsmAwoC5Ri53PAgUL8SM6MU4AbTmPkUDkE2HMgp5nSeO2TtfKPCwL+VuJcIJy3+nF61ZjnfihaVvRRMVMna6/GjaKmvdNA/LlHMm3JcbOYVMju77uKt6wnptPVW43g5MHhnxolFY+OJObCHXRV6TxAyLbba9T+3pumUVejw7H87D+SvKsiCS8nIy/2nUtZsv1KQwYKnE+OGRhHpfw0ynt3roKLHM1dIHGQruPDE69anYGky59ghq1kTbG3sF6Gczp7ZdQt54E5qXfzNvtUtkF7CXn4 MIME-Version: 1.0 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 03136536-9f55-4713-c460-08d7837bb1dd X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Dec 2019 05:32:38.1713 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 8k3g6csnyDUj9zNjb9L/mX5c+l3XNkJQo4g2yiUkkv+fYNob5J8jfa/ElBW0yaYs X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4286 X-BeenThere: amd-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Long, Gang" , "Xu, Feifei" , "Tuikov, Luben" , "Deucher, Alexander" , "Zhang, Hawking" , "Koenig, Christian" , "Yuan, Xiaojie" Content-Type: multipart/mixed; boundary="===============1308352572==" Errors-To: amd-gfx-bounces@lists.freedesktop.org Sender: "amd-gfx" --===============1308352572== Content-Language: en-US Content-Type: multipart/alternative; boundary="_000_MN2PR12MB3296E3ACC90169776F9E090EA2530MN2PR12MB3296namp_" --_000_MN2PR12MB3296E3ACC90169776F9E090EA2530MN2PR12MB3296namp_ Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable [AMD Official Use Only - Internal Distribution Only] ________________________________ From: Tianci Yin Sent: Wednesday, December 18, 2019 10:21 AM To: amd-gfx@lists.freedesktop.org Cc: Tuikov, Luben ; Koenig, Christian ; Deucher, Alexander ; Zhang, Hawking= ; Xu, Feifei ; Yuan, Xiaojie ; Long, Gang ; Wang, Kevin(Yang) ; Yin, Tianci (Rico) Subject: [PATCH 1/2] drm/amdgpu: update the method to get fb_loc of memory = training From: "Tianci.Yin" The method of getting fb_loc changed from parsing VBIOS to taking certain offset from top of VRAM Change-Id: I053b42fdb1d822722fa7980b2cd9f86b3fdce539 --- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 3 +- .../gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 36 ++----------------- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 6 +++- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 7 ++++ drivers/gpu/drm/amd/include/atomfirmware.h | 14 -------- 5 files changed, 16 insertions(+), 50 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdg= pu/amdgpu.h index a78a363b1d71..fa2cf8e7bc07 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h @@ -642,9 +642,8 @@ struct amdgpu_fw_vram_usage { struct amdgpu_bo *reserved_bo; void *va; - /* Offset on the top of VRAM, used as c2p write buffer. + /* GDDR6 training support flag. */ - u64 mem_train_fb_loc; bool mem_train_support; }; diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c b/drivers/gpu= /drm/amd/amdgpu/amdgpu_atomfirmware.c index ff4eb96bdfb5..009cb0b03d13 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c @@ -528,13 +528,9 @@ static int gddr6_mem_train_support(struct amdgpu_devic= e *adev) int amdgpu_atomfirmware_get_mem_train_fb_loc(struct amdgpu_device *adev) { struct atom_context *ctx =3D adev->mode_info.atom_context; - unsigned char *bios =3D ctx->bios; - struct vram_reserve_block *reserved_block; - int index, block_number; + int index; uint8_t frev, crev; uint16_t data_offset, size; - uint32_t start_address_in_kb; - uint64_t offset; int ret; adev->fw_vram_usage.mem_train_support =3D false; @@ -569,32 +565,6 @@ int amdgpu_atomfirmware_get_mem_train_fb_loc(struct am= dgpu_device *adev) [kevin]: this function is not return any address after change, i think we'd better to rename this function to another is well. the code can be merge to function gddr6_mem_train_support(). return -EINVAL; } - reserved_block =3D (struct vram_reserve_block *) - (bios + data_offset + sizeof(struct atom_common_table_heade= r)); - block_number =3D ((unsigned int)size - sizeof(struct atom_common_ta= ble_header)) - / sizeof(struct vram_reserve_block); - reserved_block +=3D (block_number > 0) ? block_number-1 : 0; - DRM_DEBUG("block_number:0x%04x, last block: 0x%08xkb sz, %dkb fw, %= dkb drv.\n", - block_number, - le32_to_cpu(reserved_block->start_address_in_kb), - le16_to_cpu(reserved_block->used_by_firmware_in_kb), - le16_to_cpu(reserved_block->used_by_driver_in_kb)); - if (reserved_block->used_by_firmware_in_kb > 0) { - start_address_in_kb =3D le32_to_cpu(reserved_block->start_a= ddress_in_kb); - offset =3D (uint64_t)start_address_in_kb * ONE_KiB; - if ((offset & (ONE_MiB - 1)) < (4 * ONE_KiB + 1) ) { - offset -=3D ONE_MiB; - } - - offset &=3D ~(ONE_MiB - 1); - adev->fw_vram_usage.mem_train_fb_loc =3D offset; - adev->fw_vram_usage.mem_train_support =3D true; - DRM_DEBUG("mem_train_fb_loc:0x%09llx.\n", offset); - ret =3D 0; - } else { - DRM_ERROR("used_by_firmware_in_kb is 0!\n"); - ret =3D -EINVAL; - } - - return ret; + adev->fw_vram_usage.mem_train_support =3D true; + return 0; } diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/= amdgpu/amdgpu_ttm.c index 2ff63d0414c9..ce5cb854bdb9 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c @@ -1705,7 +1705,11 @@ static int amdgpu_ttm_training_reserve_vram_init(str= uct amdgpu_device *adev) return 0; } - ctx->c2p_train_data_offset =3D adev->fw_vram_usage.mem_train_fb_loc= ; + ctx->c2p_train_data_offset =3D adev->gmc.mc_vram_size; + if ((ctx->c2p_train_data_offset & (ONE_MiB - 1)) < (4 * ONE_KiB + 1= ) ) { + ctx->c2p_train_data_offset -=3D ONE_MiB; + } + ctx->c2p_train_data_offset &=3D ~(ONE_MiB - 1); ctx->p2c_train_data_offset =3D (adev->gmc.mc_vram_size - GDDR6_MEM= _TRAINING_OFFSET); ctx->train_data_size =3D GDDR6_MEM_TRAINING_DATA_SIZE_IN_BYTES; diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h b/drivers/gpu/drm/amd/= amdgpu/amdgpu_ttm.h index f1ebd424510c..19eb3e8456c7 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h @@ -66,6 +66,13 @@ struct amdgpu_copy_mem { unsigned long offset; }; +/* Definitions for constance */ +enum amdgpu_internal_constants +{ + ONE_KiB =3D 0x400, + ONE_MiB =3D 0x100000, +}; + extern const struct ttm_mem_type_manager_func amdgpu_gtt_mgr_func; extern const struct ttm_mem_type_manager_func amdgpu_vram_mgr_func; diff --git a/drivers/gpu/drm/amd/include/atomfirmware.h b/drivers/gpu/drm/a= md/include/atomfirmware.h index dd7cbc00a0aa..70146518174c 100644 --- a/drivers/gpu/drm/amd/include/atomfirmware.h +++ b/drivers/gpu/drm/amd/include/atomfirmware.h @@ -672,20 +672,6 @@ struct vram_usagebyfirmware_v2_1 uint16_t used_by_driver_in_kb; }; -/* This is part of vram_usagebyfirmware_v2_1 */ -struct vram_reserve_block -{ - uint32_t start_address_in_kb; - uint16_t used_by_firmware_in_kb; - uint16_t used_by_driver_in_kb; -}; - -/* Definitions for constance */ -enum atomfirmware_internal_constants -{ - ONE_KiB =3D 0x400, - ONE_MiB =3D 0x100000, -}; /* ************************************************************************= *** -- 2.17.1 --_000_MN2PR12MB3296E3ACC90169776F9E090EA2530MN2PR12MB3296namp_ Content-Type: text/html; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable

[AMD Official Use Only - Internal Distribution Only]



From: Tianci Yin <tianci= .yin@amd.com>
Sent: Wednesday, December 18, 2019 10:21 AM
To: amd-gfx@lists.freedesktop.org <amd-gfx@lists.freedesktop.org&= gt;
Cc: Tuikov, Luben <Luben.Tuikov@amd.com>; Koenig, Christian &l= t;Christian.Koenig@amd.com>; Deucher, Alexander <Alexander.Deucher@am= d.com>; Zhang, Hawking <Hawking.Zhang@amd.com>; Xu, Feifei <Fei= fei.Xu@amd.com>; Yuan, Xiaojie <Xiaojie.Yuan@amd.com>; Long, Gang <Gang.Long@amd.com>; Wang, Kevin(Yang) <Kevin1.Wang@amd.com&= gt;; Yin, Tianci (Rico) <Tianci.Yin@amd.com>
Subject: [PATCH 1/2] drm/amdgpu: update the method to get fb_loc of = memory training
 
From: "Tianci.Yin" <tianci.yin@amd.co= m>

The method of getting fb_loc changed from parsing VBIOS to
taking certain offset from top of VRAM

Change-Id: I053b42fdb1d822722fa7980b2cd9f86b3fdce539
---
 drivers/gpu/drm/amd/amdgpu/amdgpu.h     &nbs= p;     |  3 +-
 .../gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c  | 36 ++---= --------------
 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c     =   |  6 +++-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h     =   |  7 ++++
 drivers/gpu/drm/amd/include/atomfirmware.h    | 14 ---= -----
 5 files changed, 16 insertions(+), 50 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdg= pu/amdgpu.h
index a78a363b1d71..fa2cf8e7bc07 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -642,9 +642,8 @@ struct amdgpu_fw_vram_usage {
         struct amdgpu_bo *reserved= _bo;
         void *va;
 
-       /* Offset on the top of VRAM, used as= c2p write buffer.
+       /* GDDR6 training support flag.          */
-       u64 mem_train_fb_loc;
         bool mem_train_support;  };
 
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c b/drivers/gpu= /drm/amd/amdgpu/amdgpu_atomfirmware.c
index ff4eb96bdfb5..009cb0b03d13 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c
@@ -528,13 +528,9 @@ static int gddr6_mem_train_support(struct amdgpu_d= evice *adev)
 int amdgpu_atomfirmware_get_mem_train_fb_loc(struct amdgpu_device *ad= ev)
 {
         struct atom_context *ctx = =3D adev->mode_info.atom_context;
-       unsigned char *bios =3D ctx->bios;=
-       struct vram_reserve_block *reserved_b= lock;
-       int index, block_number;
+       int index;
         uint8_t frev, crev;
         uint16_t data_offset, size= ;
-       uint32_t start_address_in_kb;
-       uint64_t offset;
         int ret;
 
         adev->fw_vram_usage.mem= _train_support =3D false;
@@ -569,32 +565,6 @@ int amdgpu_atomfirmware_get_mem_train_fb_loc(struc= t amdgpu_device *adev)
[kevin]:
this function is not return any address after chan= ge,
i think we'd better to rename this function to ano= ther is well.
the code can be merge to function gddr6_mem_t= rain_support().

        &n= bsp;        return -EINVAL;
         }
 
-       reserved_block =3D (struct vram_reser= ve_block *)
-            &n= bsp;  (bios + data_offset + sizeof(struct atom_common_table_he= ader));
-       block_number =3D ((unsigned int)size = - sizeof(struct atom_common_table_header))
-            &n= bsp;  / sizeof(struct vram_reserve_block);
-       reserved_block +=3D (block_number= > 0) ? block_number-1 : 0;
-       DRM_DEBUG("block_number:0x%04x, = last block: 0x%08xkb sz, %dkb fw, %dkb drv.\n",
-            &n= bsp;    block_number,
-            &n= bsp;    le32_to_cpu(reserved_block->start_address_in_kb),=
-            &n= bsp;    le16_to_cpu(reserved_block->used_by_firmware_in_k= b),
-            &n= bsp;    le16_to_cpu(reserved_block->used_by_driver_in_kb)= );
-       if (reserved_block->used_by_firmwa= re_in_kb > 0) {
-            &n= bsp;  start_address_in_kb =3D le32_to_cpu(reserved_block->start_add= ress_in_kb);
-            &n= bsp;  offset =3D (uint64_t)start_address_in_kb * ONE_KiB;
-            &n= bsp;  if ((offset & (ONE_MiB - 1)) < (4 * ONE_KiB + 1) ) {<= br> -            &n= bsp;          offset -=3D ONE_= MiB;
-            &n= bsp;  }
-
-            &n= bsp;  offset &=3D ~(ONE_MiB - 1);
-            &n= bsp;  adev->fw_vram_usage.mem_train_fb_loc =3D offset;
-            &n= bsp;  adev->fw_vram_usage.mem_train_support =3D true;
-            &n= bsp;  DRM_DEBUG("mem_train_fb_loc:0x%09llx.\n", offset);
-            &n= bsp;  ret =3D 0;
-       } else {
-            &n= bsp;  DRM_ERROR("used_by_firmware_in_kb is 0!\n");
-            &n= bsp;  ret =3D -EINVAL;
-       }
-
-       return ret;
+       adev->fw_vram_usage.mem_train_= support =3D true;
+       return 0;
 }
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/= amdgpu/amdgpu_ttm.c
index 2ff63d0414c9..ce5cb854bdb9 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@ -1705,7 +1705,11 @@ static int amdgpu_ttm_training_reserve_vram_init= (struct amdgpu_device *adev)
            &nb= sp;    return 0;
         }
 
-       ctx->c2p_train_data_offset =3D ade= v->fw_vram_usage.mem_train_fb_loc;
+       ctx->c2p_train_data_offset =3D= adev->gmc.mc_vram_size;
+       if ((ctx->c2p_train_data_offse= t & (ONE_MiB - 1)) < (4 * ONE_KiB + 1) ) {
+           &nbs= p;   ctx->c2p_train_data_offset -=3D ONE_MiB;
+       }
+       ctx->c2p_train_data_offset &am= p;=3D ~(ONE_MiB - 1);
         ctx->p2c_train_data_off= set =3D (adev->gmc.mc_vram_size - GDDR6_MEM_TRAINING_OFFSET);
         ctx->train_data_size = =3D GDDR6_MEM_TRAINING_DATA_SIZE_IN_BYTES;
 
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h b/drivers/gpu/drm/amd/= amdgpu/amdgpu_ttm.h
index f1ebd424510c..19eb3e8456c7 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h
@@ -66,6 +66,13 @@ struct amdgpu_copy_mem {
         unsigned long  &= nbsp;           &nbs= p;    offset;
 };
 
+/* Definitions for constance */
+enum amdgpu_internal_constants
+{
+       ONE_KiB =3D 0x400,
+       ONE_MiB =3D 0x100000,
+};
+
 extern const struct ttm_mem_type_manager_func amdgpu_gtt_mgr_func;  extern const struct ttm_mem_type_manager_func amdgpu_vram_mgr_func;  
diff --git a/drivers/gpu/drm/amd/include/atomfirmware.h b/drivers/gpu/drm/a= md/include/atomfirmware.h
index dd7cbc00a0aa..70146518174c 100644
--- a/drivers/gpu/drm/amd/include/atomfirmware.h
+++ b/drivers/gpu/drm/amd/include/atomfirmware.h
@@ -672,20 +672,6 @@ struct vram_usagebyfirmware_v2_1
   uint16_t  used_by_driver_in_kb;
 };
 
-/* This is part of vram_usagebyfirmware_v2_1 */
-struct vram_reserve_block
-{
-       uint32_t start_address_in_kb;
-       uint16_t used_by_firmware_in_kb;
-       uint16_t used_by_driver_in_kb;
-};
-
-/* Definitions for constance */
-enum atomfirmware_internal_constants
-{
-       ONE_KiB =3D 0x400,
-       ONE_MiB =3D 0x100000,
-};
 
 /*
   **************************************************************= *************
--
2.17.1

--_000_MN2PR12MB3296E3ACC90169776F9E090EA2530MN2PR12MB3296namp_-- --===============1308352572== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx --===============1308352572==--