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=-15.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham 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 CB65BC2B9F4 for ; Mon, 14 Jun 2021 12:15:06 +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 75B5E611CE for ; Mon, 14 Jun 2021 12:15:06 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 75B5E611CE Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine 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 20E7F89C52; Mon, 14 Jun 2021 12:15:06 +0000 (UTC) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2044.outbound.protection.outlook.com [40.107.220.44]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1E6CF89C52 for ; Mon, 14 Jun 2021 12:15:05 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=K7rkPhe+ox0Tan+YQQfC9tVftKs90sN0U/Gcxxh/E9ViDevHxRq74vUctxIAvF0pgDyAsDeOzB3LipVS6seyTRYNNdnwDBbs7y+aNhD2fZRef5VV+PxPwbMl2NpZ4RYXUSZTYeLEhyV8gCPGY1dSitGQMsnyUdplhLyGtypb4raeQWDe1i9iNgtvfUlNYXvRU/m0oaW0d639D1UYTbBhbNKDyrc3F/AkDmX+RQSGaFh6QzcWU9XNMvWIUqY/kDyxvhS3uqmPvYjFG/Xjf02rMKgzZUOFejC5yTEZjUm6+EElsrFwLexVz9YIHkgKYPmf8C6CFd+1xecTJqAjN0uRLg== 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=rEyiUdMQfQ27yvNyUtpNuo0071LU5UzwmGDkIPoHJTU=; b=DDlZl3t8Jf/P4ilYZsw/6Hli4AF81GA19jxyfLvcldXCxKJoxr81RjPND0IVUHGXJnATQU8kBeQUR1f0Bhfp+hpxOPU5HwDd43H4XEg/X59NHHunciir0NHoqTdnnbohXS2Ik1gaKrig1gXdQZu6Q98dH80j+z7HxcvEWRCx3KxjV3mK2ohZP9QBTWkbk2fC08wdLAA/8G0jAE3666Cb3jAJ/RxLw72U5w917preaV7dpKhToXpsxxvLq4v3W1G+A/nidtUNTX9X7caB0x7J6o3LugTT4E5+LPaTbHhb6pTgCVUZyxdpVHClk0RZ41DoUK9cXuXEWK+GZmyFdGHGIQ== 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=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=rEyiUdMQfQ27yvNyUtpNuo0071LU5UzwmGDkIPoHJTU=; b=hzR3ybkwQ6D5DxSFPOZtnRN13/7bSCtqxDuUU8zRbLpMXrQS6V9fRv/KLoUkahgwC+7eZHgJLCoU0x+XmtrWUc38M+gFNBL59XN8ZtFr4yRxLfiddg/i8TJcYKurfSJx5xm1wFYlZrCrSLzJGgOR4hPM4SjXTvwrmYWQAlV7dMY= Authentication-Results: lists.freedesktop.org; dkim=none (message not signed) header.d=none; lists.freedesktop.org; dmarc=none action=none header.from=amd.com; Received: from MN2PR12MB3775.namprd12.prod.outlook.com (2603:10b6:208:159::19) by MN2PR12MB4318.namprd12.prod.outlook.com (2603:10b6:208:1d8::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21; Mon, 14 Jun 2021 12:15:02 +0000 Received: from MN2PR12MB3775.namprd12.prod.outlook.com ([fe80::6c9e:1e08:7617:f756]) by MN2PR12MB3775.namprd12.prod.outlook.com ([fe80::6c9e:1e08:7617:f756%5]) with mapi id 15.20.4219.025; Mon, 14 Jun 2021 12:15:02 +0000 Subject: Re: [PATCH 1/1] drm/amdgpu: remove amdgpu_vm_pt To: Nirmoy Das , amd-gfx@lists.freedesktop.org References: <20210610172412.4113-1-nirmoy.das@amd.com> From: =?UTF-8?Q?Christian_K=c3=b6nig?= Message-ID: <41fb5e0b-8194-6037-b59d-2c0f5dddf474@amd.com> Date: Mon, 14 Jun 2021 14:14:57 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.1 In-Reply-To: <20210610172412.4113-1-nirmoy.das@amd.com> Content-Language: en-US X-Originating-IP: [2a02:908:1252:fb60:e8cf:b51d:4c59:9c81] X-ClientProxiedBy: PR3P193CA0005.EURP193.PROD.OUTLOOK.COM (2603:10a6:102:50::10) To MN2PR12MB3775.namprd12.prod.outlook.com (2603:10b6:208:159::19) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from [IPv6:2a02:908:1252:fb60:e8cf:b51d:4c59:9c81] (2a02:908:1252:fb60:e8cf:b51d:4c59:9c81) by PR3P193CA0005.EURP193.PROD.OUTLOOK.COM (2603:10a6:102:50::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.20 via Frontend Transport; Mon, 14 Jun 2021 12:15:01 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a55f61c8-2385-4229-251c-08d92f2e090c X-MS-TrafficTypeDiagnostic: MN2PR12MB4318: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:83; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +PPB0pZeujMET78SJ6/XdjG2eMKxJ6Y1YQUcr+u00maYK/mvijExrynOF3WI4K7wc5HdpE24kwb6Q/iewPdWzc7/Z2ZcgaHuPDxIzRB0Ip0Ot1QcqIjPpYH73MCAiBHdwED/1fLVAxMJC6PLN7y+FhjtLmoAPkk4BO0zN1XufWQORpHutk+A6ccQg59T96+yiIxXv3lyiAzg4aBjps/x7aqKWC/OVAm/phWOAJCgA+m02lhOsUkOoWDN3/AmjqpIbOqMgpraaWq87sc7KUFVcK4KIRJMUSytc9XnxPxT8JQas4kUHYIOKdlWqM3oXgeeBTm7jpRSsy/E5Yff71n+R5ifmNS4xFu3Pqb6mTkOhzk+uaraBdLKApvuHkxgqTLrwD2FGIJ/I6p18DG4634INJUCBIKzWYVC6/NzHuJHJxk3u+3t7IMZpCSEiWEkz8aczQGsqlEqG4xWaFx8Fm7CO3agUpK7UoCPurx/vXpneEKuRNZEg7q6d5C+2KpvvfaNB2p7vm5ZHBozHPEFuYmEE9h08SYtnRj0Cm7OvKzadcfZHIH2IoF4/mQtF6rtU6jhIMmYOR74QAWQ7ksle1VtPKev5NfJrJdU7SwDRSh22yiXcS87hzGsEP597ViclGNjXbgnSSGnE/oepD9Ak+7Qi4SDOk4A5PnaOOnyueAGA1N2Rnn10k3HswQ8lkz+nL9C X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:MN2PR12MB3775.namprd12.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(136003)(396003)(366004)(39860400002)(376002)(346002)(8936002)(6666004)(2616005)(6486002)(86362001)(8676002)(186003)(16526019)(36756003)(31686004)(316002)(31696002)(5660300002)(2906002)(38100700002)(66556008)(83380400001)(66476007)(66946007)(478600001)(30864003)(43740500002)(45980500001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?MGRjUXRsNGEyNkF0ejB1eWcyYmlUdWhOdzRQR0Q1d2J3a0dOVFk4T0NlYktO?= =?utf-8?B?RGhnWHU1M3BGdXhDcm1VOTZLT0V6VHJQa3FvK2x1Ulg5QlVBaVF6SHRpV3I4?= =?utf-8?B?bmEyZVNEMVNvV2tOZEJBRHFoRTB6eVltSGZCdzVldVMvUFpYejAwa0o0eSt4?= =?utf-8?B?dytaM3Fxd3crSzVWQTlUQUg5MzRHK1oxWjZtcXFnVlRoY0oxbGduYVNuRnJz?= =?utf-8?B?S21pWmp5d3dLWHpJSVk3cWZNb1Q5TmlsL2Y4c3ZnbURtZ3RYTFNKZVRzNC9U?= =?utf-8?B?ZUpOYUU5ai94QmNxcmlyaVBtSmtpNlcyOFJ4VGFFdFpyb3g2UEgvWVBxeWww?= =?utf-8?B?aVJFZUthN1FwWFQzcWdiSWxaREkyZVplLzR2Vlh4ZlZYMWNVaUFWdmJpODRX?= =?utf-8?B?RmFBNzZOeThCZ05vc1ZjUDk2VW5zQWFUUnIyU1dOb2M4d0JMcFBPSUxlOHA4?= =?utf-8?B?LzlNYXgxMGd4RU5IQWZ4WXhTWUdOZFBsN0o1WlJ3eE5pcmxOL3hpVlVRblZP?= =?utf-8?B?SzdlTWFIbm5TTHl5OEplaFZYdUxZMFJsUjlZdnd1czBSUE5uaU82ZUNhUkty?= =?utf-8?B?c2dXRVFFU00ya0NLMUZvWkdtWWJHUXFuZExGTDY0QnJQM2VSWW5aWFo4d2p3?= =?utf-8?B?ekgxTHU0aDIwSzQrUjhtbkdlVGJrV2xGK2d4L0NyOXg4MzlZOEUrRzkrMzNi?= =?utf-8?B?TmVFcU5mc1pURUdXY2dNaEMzM0RtMElybUNkN2RLTDUxK2Rhd0JTSm52QjBt?= =?utf-8?B?TjZ6RnM5OC9SK21TZjZyd0tMY0R4QWw3VkNORFc0d2t1RUxjQVhpN2Rycjgz?= =?utf-8?B?SFUvbWl5Q0QxM1prQnlSQ012cENTckM0WS9Eb0JZN0g1RDNjQTV4a0NxSEZY?= =?utf-8?B?QVA4aXNEVjB5N3lQL1N2eG40Y1JIbmoxWWVxZnZNVkV2QTdXcUZyV0EvQmw5?= =?utf-8?B?MW5JakptSkVXcERtWmptRXJzSFFFandHNVFkNnFjOUpTTkMyMkRFMFFEdUhI?= =?utf-8?B?a1RKd3dxNHR6OXVic0ZVVEVpODR6TmhROTdBL1BIQTNUdW56NWk4YkNPeTA1?= =?utf-8?B?MjdqRm4xTy9LY2RyVmdCaEhrRkJaY1Y3YUJSM3NhVVRRaVRHdXh5UkZpS1Uz?= =?utf-8?B?WG53YXFOUHNrOTlucE05aUhFbDBJbWI2Mng1SmNhREVBTGx2YXNYS0pkN0dm?= =?utf-8?B?eTcvVzJRMlRYN2tRcTlnc0NRcUJSdU1OT1hRQ1k2dFJUQ3kwVlRIRmtVVHk5?= =?utf-8?B?Qk1xU2p3VFZMZFJVcXZNY1dkV29ocHV4ejM2OFNOM2lZb1E3SFh3Q2NXMVRX?= =?utf-8?B?Z0ZiY1p2Njg0MGhLblZiYzlWTlUxeW9SYml1Nm5Ba1RXcjhSUmp0VDkwMW1T?= =?utf-8?B?ejVtM08wckN6MGZUbFJESDFQWnRRMld4S3ZtT29tYmpwNHhjOUtvVVV6N0NP?= =?utf-8?B?SDRCNFFvV1ZYVEtadWhuYXZtQzFZNU80ZEJ2SGZxdmZQdC9wVnVhUksyQjEv?= =?utf-8?B?T2VsVldpMEE2LzJqMjdrMysreEpGSUpUQU5xYlcvMXdpc2N5NzhHUFNzQmdx?= =?utf-8?B?cEZ4Mi9RZEVmVit5cnhsQ3dudDNHbmdUNHJZbmRKTFNteElCQ0Y5ZEQzeDJw?= =?utf-8?B?bko4RUVTTE9KWVRTWUt0N3YvRGMrbU90bzVnSllOU0xiWExycGpzSHhkbTU5?= =?utf-8?B?em1NYnQwK2xoNU5SaW5XYjJyK3hrWEJhSDh6bUZqSDNpbHE4WkhkaDRZSXBV?= =?utf-8?B?VHlNM0d0OGloRklYd3hxUTR1dmVjSkRYbm55SUVCTnJGeEM4bGw0YkYvaE5a?= =?utf-8?B?MzVhTUEzTndpdElob1RvMGdKdC9tTTQxRWtJbGRIQWJmLzFDUldyVVU1ZlZi?= =?utf-8?Q?oj2qlhOV+IwRU?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: a55f61c8-2385-4229-251c-08d92f2e090c X-MS-Exchange-CrossTenant-AuthSource: MN2PR12MB3775.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jun 2021 12:15:01.9406 (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: iCrJOhuQEDjzy/0eppg2h4XqMC7TVRMgxylpz3/sqCrb+K/ft3w4/D07NThpF8rx X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4318 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: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: amd-gfx-bounces@lists.freedesktop.org Sender: "amd-gfx" Am 10.06.21 um 19:24 schrieb Nirmoy Das: > Page table entries are now in embedded in VM BO, so > we do not need struct amdgpu_vm_pt. This patch replaces > struct amdgpu_vm_pt with struct amdgpu_vm_bo_base. Even struct amdgpu_vm_bo_base should be removed at some point, but for now that's ok. > > Signed-off-by: Nirmoy Das > --- > .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 26 +-- > drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 2 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 4 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 2 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c | 4 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 12 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 2 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 2 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 164 ++++++++---------- > drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 9 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 2 +- > drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 2 +- > 12 files changed, 105 insertions(+), 126 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c > index fb6bcc386de1..f96598279593 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c > @@ -356,7 +356,7 @@ static int amdgpu_amdkfd_validate_vm_bo(void *_unused, struct amdgpu_bo *bo) > */ > static int vm_validate_pt_pd_bos(struct amdgpu_vm *vm) > { > - struct amdgpu_bo *pd = vm->root.base.bo; > + struct amdgpu_bo *pd = vm->root.bo; > struct amdgpu_device *adev = amdgpu_ttm_adev(pd->tbo.bdev); > int ret; > > @@ -372,7 +372,7 @@ static int vm_validate_pt_pd_bos(struct amdgpu_vm *vm) > return ret; > } > > - vm->pd_phys_addr = amdgpu_gmc_pd_addr(vm->root.base.bo); > + vm->pd_phys_addr = amdgpu_gmc_pd_addr(vm->root.bo); > > if (vm->use_cpu_for_update) { > ret = amdgpu_bo_kmap(pd, NULL); > @@ -387,7 +387,7 @@ static int vm_validate_pt_pd_bos(struct amdgpu_vm *vm) > > static int vm_update_pds(struct amdgpu_vm *vm, struct amdgpu_sync *sync) > { > - struct amdgpu_bo *pd = vm->root.base.bo; > + struct amdgpu_bo *pd = vm->root.bo; > struct amdgpu_device *adev = amdgpu_ttm_adev(pd->tbo.bdev); > int ret; > > @@ -1153,7 +1153,7 @@ static int process_sync_pds_resv(struct amdkfd_process_info *process_info, > > list_for_each_entry(peer_vm, &process_info->vm_list_head, > vm_list_node) { > - struct amdgpu_bo *pd = peer_vm->root.base.bo; > + struct amdgpu_bo *pd = peer_vm->root.bo; > > ret = amdgpu_sync_resv(NULL, sync, pd->tbo.base.resv, > AMDGPU_SYNC_NE_OWNER, > @@ -1220,7 +1220,7 @@ static int init_kfd_vm(struct amdgpu_vm *vm, void **process_info, > vm->process_info = *process_info; > > /* Validate page directory and attach eviction fence */ > - ret = amdgpu_bo_reserve(vm->root.base.bo, true); > + ret = amdgpu_bo_reserve(vm->root.bo, true); > if (ret) > goto reserve_pd_fail; > ret = vm_validate_pt_pd_bos(vm); > @@ -1228,16 +1228,16 @@ static int init_kfd_vm(struct amdgpu_vm *vm, void **process_info, > pr_err("validate_pt_pd_bos() failed\n"); > goto validate_pd_fail; > } > - ret = amdgpu_bo_sync_wait(vm->root.base.bo, > + ret = amdgpu_bo_sync_wait(vm->root.bo, > AMDGPU_FENCE_OWNER_KFD, false); > if (ret) > goto wait_pd_fail; > - ret = dma_resv_reserve_shared(vm->root.base.bo->tbo.base.resv, 1); > + ret = dma_resv_reserve_shared(vm->root.bo->tbo.base.resv, 1); > if (ret) > goto reserve_shared_fail; > - amdgpu_bo_fence(vm->root.base.bo, > + amdgpu_bo_fence(vm->root.bo, > &vm->process_info->eviction_fence->base, true); > - amdgpu_bo_unreserve(vm->root.base.bo); > + amdgpu_bo_unreserve(vm->root.bo); > > /* Update process info */ > mutex_lock(&vm->process_info->lock); > @@ -1251,7 +1251,7 @@ static int init_kfd_vm(struct amdgpu_vm *vm, void **process_info, > reserve_shared_fail: > wait_pd_fail: > validate_pd_fail: > - amdgpu_bo_unreserve(vm->root.base.bo); > + amdgpu_bo_unreserve(vm->root.bo); > reserve_pd_fail: > vm->process_info = NULL; > if (info) { > @@ -1306,7 +1306,7 @@ void amdgpu_amdkfd_gpuvm_destroy_cb(struct amdgpu_device *adev, > struct amdgpu_vm *vm) > { > struct amdkfd_process_info *process_info = vm->process_info; > - struct amdgpu_bo *pd = vm->root.base.bo; > + struct amdgpu_bo *pd = vm->root.bo; > > if (!process_info) > return; > @@ -1362,7 +1362,7 @@ void amdgpu_amdkfd_gpuvm_release_process_vm(struct kgd_dev *kgd, void *drm_priv) > uint64_t amdgpu_amdkfd_gpuvm_get_process_page_dir(void *drm_priv) > { > struct amdgpu_vm *avm = drm_priv_to_vm(drm_priv); > - struct amdgpu_bo *pd = avm->root.base.bo; > + struct amdgpu_bo *pd = avm->root.bo; > struct amdgpu_device *adev = amdgpu_ttm_adev(pd->tbo.bdev); > > if (adev->asic_type < CHIP_VEGA10) > @@ -2389,7 +2389,7 @@ int amdgpu_amdkfd_gpuvm_restore_process_bos(void *info, struct dma_fence **ef) > /* Attach eviction fence to PD / PT BOs */ > list_for_each_entry(peer_vm, &process_info->vm_list_head, > vm_list_node) { > - struct amdgpu_bo *bo = peer_vm->root.base.bo; > + struct amdgpu_bo *bo = peer_vm->root.bo; > > amdgpu_bo_fence(bo, &process_info->eviction_fence->base, true); > } > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c > index 1476236f5c7c..76fe5b71e35d 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c > @@ -832,7 +832,7 @@ static int amdgpu_cs_vm_handling(struct amdgpu_cs_parser *p) > if (r) > return r; > > - p->job->vm_pd_addr = amdgpu_gmc_pd_addr(vm->root.base.bo); > + p->job->vm_pd_addr = amdgpu_gmc_pd_addr(vm->root.bo); > > if (amdgpu_vm_debug) { > /* Invalidate all BOs to test for userspace bugs */ > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c > index a9bbb0034e1e..536005bff24a 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c > @@ -1304,11 +1304,11 @@ static int amdgpu_debugfs_vm_info_show(struct seq_file *m, void *unused) > > seq_printf(m, "pid:%d\tProcess:%s ----------\n", > vm->task_info.pid, vm->task_info.process_name); > - r = amdgpu_bo_reserve(vm->root.base.bo, true); > + r = amdgpu_bo_reserve(vm->root.bo, true); > if (r) > break; > amdgpu_debugfs_vm_bo_info(vm, m); > - amdgpu_bo_unreserve(vm->root.base.bo); > + amdgpu_bo_unreserve(vm->root.bo); > } > > mutex_unlock(&dev->filelist_mutex); > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c > index baa980a477d9..94d4d3256cb4 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c > @@ -493,7 +493,7 @@ amdgpu_dma_buf_move_notify(struct dma_buf_attachment *attach) > > for (bo_base = bo->vm_bo; bo_base; bo_base = bo_base->next) { > struct amdgpu_vm *vm = bo_base->vm; > - struct dma_resv *resv = vm->root.base.bo->tbo.base.resv; > + struct dma_resv *resv = vm->root.bo->tbo.base.resv; > > if (ticket) { > /* When we get an error here it means that somebody > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c > index dbebbe16e3b3..d94c5419ec25 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c > @@ -69,13 +69,13 @@ void amdgpu_show_fdinfo(struct seq_file *m, struct file *f) > dev = PCI_SLOT(adev->pdev->devfn); > fn = PCI_FUNC(adev->pdev->devfn); > > - ret = amdgpu_bo_reserve(fpriv->vm.root.base.bo, false); > + ret = amdgpu_bo_reserve(fpriv->vm.root.bo, false); > if (ret) { > DRM_ERROR("Fail to reserve bo\n"); > return; > } > amdgpu_vm_get_memory(&fpriv->vm, &vram_mem, >t_mem, &cpu_mem); > - amdgpu_bo_unreserve(fpriv->vm.root.base.bo); > + amdgpu_bo_unreserve(fpriv->vm.root.bo); > seq_printf(m, "pdev:\t%04x:%02x:%02x.%d\npasid:\t%u\n", domain, bus, > dev, fn, fpriv->vm.pasid); > seq_printf(m, "vram mem:\t%llu kB\n", vram_mem/1024UL); > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c > index b7c424291702..65521c8b9b1c 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c > @@ -129,7 +129,7 @@ static int amdgpu_gem_object_open(struct drm_gem_object *obj, > return -EPERM; > > if (abo->flags & AMDGPU_GEM_CREATE_VM_ALWAYS_VALID && > - abo->tbo.base.resv != vm->root.base.bo->tbo.base.resv) > + abo->tbo.base.resv != vm->root.bo->tbo.base.resv) > return -EPERM; > > r = amdgpu_bo_reserve(abo, false); > @@ -265,11 +265,11 @@ int amdgpu_gem_create_ioctl(struct drm_device *dev, void *data, > } > > if (flags & AMDGPU_GEM_CREATE_VM_ALWAYS_VALID) { > - r = amdgpu_bo_reserve(vm->root.base.bo, false); > + r = amdgpu_bo_reserve(vm->root.bo, false); > if (r) > return r; > > - resv = vm->root.base.bo->tbo.base.resv; > + resv = vm->root.bo->tbo.base.resv; > } > > initial_domain = (u32)(0xffffffff & args->in.domains); > @@ -298,9 +298,9 @@ int amdgpu_gem_create_ioctl(struct drm_device *dev, void *data, > if (!r) { > struct amdgpu_bo *abo = gem_to_amdgpu_bo(gobj); > > - abo->parent = amdgpu_bo_ref(vm->root.base.bo); > + abo->parent = amdgpu_bo_ref(vm->root.bo); > } > - amdgpu_bo_unreserve(vm->root.base.bo); > + amdgpu_bo_unreserve(vm->root.bo); > } > if (r) > return r; > @@ -787,7 +787,7 @@ int amdgpu_gem_op_ioctl(struct drm_device *dev, void *data, > } > for (base = robj->vm_bo; base; base = base->next) > if (amdgpu_xgmi_same_hive(amdgpu_ttm_adev(robj->tbo.bdev), > - amdgpu_ttm_adev(base->vm->root.base.bo->tbo.bdev))) { > + amdgpu_ttm_adev(base->vm->root.bo->tbo.bdev))) { > r = -EINVAL; > amdgpu_bo_unreserve(robj); > goto out; > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c > index 131ae2a17abf..cbb932f97355 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c > @@ -1261,7 +1261,7 @@ void amdgpu_driver_postclose_kms(struct drm_device *dev, > } > > pasid = fpriv->vm.pasid; > - pd = amdgpu_bo_ref(fpriv->vm.root.base.bo); > + pd = amdgpu_bo_ref(fpriv->vm.root.bo); > > amdgpu_ctx_mgr_fini(&fpriv->ctx_mgr); > amdgpu_vm_fini(adev, &fpriv->vm); > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h > index fa75251148be..e36b84516b4e 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h > @@ -126,7 +126,7 @@ struct amdgpu_bo_user { > struct amdgpu_bo_vm { > struct amdgpu_bo bo; > struct amdgpu_bo *shadow; > - struct amdgpu_vm_pt entries[]; > + struct amdgpu_vm_bo_base entries[]; > }; > > static inline struct amdgpu_bo *ttm_to_amdgpu_bo(struct ttm_buffer_object *tbo) > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c > index 3b6c0b48d0b1..7cddddd77ae2 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c > @@ -331,7 +331,7 @@ static void amdgpu_vm_bo_base_init(struct amdgpu_vm_bo_base *base, > base->next = bo->vm_bo; > bo->vm_bo = base; > > - if (bo->tbo.base.resv != vm->root.base.bo->tbo.base.resv) > + if (bo->tbo.base.resv != vm->root.bo->tbo.base.resv) > return; > > vm->bulk_moveable = false; > @@ -360,14 +360,14 @@ static void amdgpu_vm_bo_base_init(struct amdgpu_vm_bo_base *base, > * Helper to get the parent entry for the child page table. NULL if we are at > * the root page directory. > */ > -static struct amdgpu_vm_pt *amdgpu_vm_pt_parent(struct amdgpu_vm_pt *pt) > +static struct amdgpu_vm_bo_base *amdgpu_vm_pt_parent(struct amdgpu_vm_bo_base *pt) > { > - struct amdgpu_bo *parent = pt->base.bo->parent; > + struct amdgpu_bo *parent = pt->bo->parent; > > if (!parent) > return NULL; > > - return container_of(parent->vm_bo, struct amdgpu_vm_pt, base); > + return parent->vm_bo; > } > > /* > @@ -375,8 +375,8 @@ static struct amdgpu_vm_pt *amdgpu_vm_pt_parent(struct amdgpu_vm_pt *pt) > */ > struct amdgpu_vm_pt_cursor { > uint64_t pfn; > - struct amdgpu_vm_pt *parent; > - struct amdgpu_vm_pt *entry; > + struct amdgpu_vm_bo_base *parent; > + struct amdgpu_vm_bo_base *entry; > unsigned level; > }; > > @@ -415,17 +415,17 @@ static bool amdgpu_vm_pt_descendant(struct amdgpu_device *adev, > { > unsigned mask, shift, idx; > > - if (!cursor->entry->entries) > + if (!(cursor->level < AMDGPU_VM_PTB) || !cursor->entry || Rather make that cursor->level == AMDGPU_VM_PTB. Apart from that looks good to me, Christian. > + !cursor->entry->bo) > return false; > > - BUG_ON(!cursor->entry->base.bo); > mask = amdgpu_vm_entries_mask(adev, cursor->level); > shift = amdgpu_vm_level_shift(adev, cursor->level); > > ++cursor->level; > idx = (cursor->pfn >> shift) & mask; > cursor->parent = cursor->entry; > - cursor->entry = &cursor->entry->entries[idx]; > + cursor->entry = &to_amdgpu_bo_vm(cursor->entry->bo)->entries[idx]; > return true; > } > > @@ -452,7 +452,7 @@ static bool amdgpu_vm_pt_sibling(struct amdgpu_device *adev, > shift = amdgpu_vm_level_shift(adev, cursor->level - 1); > num_entries = amdgpu_vm_num_entries(adev, cursor->level - 1); > > - if (cursor->entry == &cursor->parent->entries[num_entries - 1]) > + if (cursor->entry == &to_amdgpu_bo_vm(cursor->parent->bo)->entries[num_entries - 1]) > return false; > > cursor->pfn += 1ULL << shift; > @@ -538,7 +538,7 @@ static void amdgpu_vm_pt_first_dfs(struct amdgpu_device *adev, > * True when the search should continue, false otherwise. > */ > static bool amdgpu_vm_pt_continue_dfs(struct amdgpu_vm_pt_cursor *start, > - struct amdgpu_vm_pt *entry) > + struct amdgpu_vm_bo_base *entry) > { > return entry && (!start || entry != start->entry); > } > @@ -589,7 +589,7 @@ void amdgpu_vm_get_pd_bo(struct amdgpu_vm *vm, > struct amdgpu_bo_list_entry *entry) > { > entry->priority = 0; > - entry->tv.bo = &vm->root.base.bo->tbo; > + entry->tv.bo = &vm->root.bo->tbo; > /* Two for VM updates, one for TTM and one for the CS job */ > entry->tv.num_shared = 4; > entry->user_pages = NULL; > @@ -621,7 +621,7 @@ void amdgpu_vm_del_from_lru_notify(struct ttm_buffer_object *bo) > for (bo_base = abo->vm_bo; bo_base; bo_base = bo_base->next) { > struct amdgpu_vm *vm = bo_base->vm; > > - if (abo->tbo.base.resv == vm->root.base.bo->tbo.base.resv) > + if (abo->tbo.base.resv == vm->root.bo->tbo.base.resv) > vm->bulk_moveable = false; > } > > @@ -779,11 +779,11 @@ static int amdgpu_vm_clear_bo(struct amdgpu_device *adev, > entries -= ats_entries; > > } else { > - struct amdgpu_vm_pt *pt; > + struct amdgpu_vm_bo_base *pt; > > - pt = container_of(ancestor->vm_bo, struct amdgpu_vm_pt, base); > + pt = ancestor->vm_bo; > ats_entries = amdgpu_vm_num_ats_entries(adev); > - if ((pt - vm->root.entries) >= ats_entries) { > + if ((pt - to_amdgpu_bo_vm(vm->root.bo)->entries) >= ats_entries) { > ats_entries = 0; > } else { > ats_entries = entries; > @@ -900,8 +900,8 @@ static int amdgpu_vm_pt_create(struct amdgpu_device *adev, > > bp.type = ttm_bo_type_kernel; > bp.no_wait_gpu = immediate; > - if (vm->root.base.bo) > - bp.resv = vm->root.base.bo->tbo.base.resv; > + if (vm->root.bo) > + bp.resv = vm->root.bo->tbo.base.resv; > > r = amdgpu_bo_create_vm(adev, &bp, vmbo); > if (r) > @@ -960,19 +960,13 @@ static int amdgpu_vm_alloc_pts(struct amdgpu_device *adev, > struct amdgpu_vm_pt_cursor *cursor, > bool immediate) > { > - struct amdgpu_vm_pt *entry = cursor->entry; > + struct amdgpu_vm_bo_base *entry = cursor->entry; > struct amdgpu_bo *pt_bo; > struct amdgpu_bo_vm *pt; > int r; > > - if (entry->base.bo) { > - if (cursor->level < AMDGPU_VM_PTB) > - entry->entries = > - to_amdgpu_bo_vm(entry->base.bo)->entries; > - else > - entry->entries = NULL; > + if (entry->bo) > return 0; > - } > > r = amdgpu_vm_pt_create(adev, vm, cursor->level, immediate, &pt); > if (r) > @@ -982,13 +976,8 @@ static int amdgpu_vm_alloc_pts(struct amdgpu_device *adev, > * freeing them up in the wrong order. > */ > pt_bo = &pt->bo; > - pt_bo->parent = amdgpu_bo_ref(cursor->parent->base.bo); > - amdgpu_vm_bo_base_init(&entry->base, vm, pt_bo); > - if (cursor->level < AMDGPU_VM_PTB) > - entry->entries = pt->entries; > - else > - entry->entries = NULL; > - > + pt_bo->parent = amdgpu_bo_ref(cursor->parent->bo); > + amdgpu_vm_bo_base_init(entry, vm, pt_bo); > r = amdgpu_vm_clear_bo(adev, vm, pt, immediate); > if (r) > goto error_free_pt; > @@ -1006,18 +995,17 @@ static int amdgpu_vm_alloc_pts(struct amdgpu_device *adev, > * > * @entry: PDE to free > */ > -static void amdgpu_vm_free_table(struct amdgpu_vm_pt *entry) > +static void amdgpu_vm_free_table(struct amdgpu_vm_bo_base *entry) > { > struct amdgpu_bo *shadow; > > - if (entry->base.bo) { > - shadow = amdgpu_bo_shadowed(entry->base.bo); > - entry->base.bo->vm_bo = NULL; > - list_del(&entry->base.vm_status); > - amdgpu_bo_unref(&shadow); > - amdgpu_bo_unref(&entry->base.bo); > - } > - entry->entries = NULL; > + if (!entry->bo) > + return; > + shadow = amdgpu_bo_shadowed(entry->bo); > + entry->bo->vm_bo = NULL; > + list_del(&entry->vm_status); > + amdgpu_bo_unref(&shadow); > + amdgpu_bo_unref(&entry->bo); > } > > /** > @@ -1034,7 +1022,7 @@ static void amdgpu_vm_free_pts(struct amdgpu_device *adev, > struct amdgpu_vm_pt_cursor *start) > { > struct amdgpu_vm_pt_cursor cursor; > - struct amdgpu_vm_pt *entry; > + struct amdgpu_vm_bo_base *entry; > > vm->bulk_moveable = false; > > @@ -1302,10 +1290,10 @@ uint64_t amdgpu_vm_map_gart(const dma_addr_t *pages_addr, uint64_t addr) > */ > static int amdgpu_vm_update_pde(struct amdgpu_vm_update_params *params, > struct amdgpu_vm *vm, > - struct amdgpu_vm_pt *entry) > + struct amdgpu_vm_bo_base *entry) > { > - struct amdgpu_vm_pt *parent = amdgpu_vm_pt_parent(entry); > - struct amdgpu_bo *bo = parent->base.bo, *pbo; > + struct amdgpu_vm_bo_base *parent = amdgpu_vm_pt_parent(entry); > + struct amdgpu_bo *bo = parent->bo, *pbo; > uint64_t pde, pt, flags; > unsigned level; > > @@ -1313,8 +1301,8 @@ static int amdgpu_vm_update_pde(struct amdgpu_vm_update_params *params, > pbo = pbo->parent; > > level += params->adev->vm_manager.root_level; > - amdgpu_gmc_get_pde_for_bo(entry->base.bo, level, &pt, &flags); > - pde = (entry - parent->entries) * 8; > + amdgpu_gmc_get_pde_for_bo(entry->bo, level, &pt, &flags); > + pde = (entry - to_amdgpu_bo_vm(parent->bo)->entries) * 8; > return vm->update_funcs->update(params, to_amdgpu_bo_vm(bo), pde, pt, > 1, 0, flags); > } > @@ -1331,11 +1319,11 @@ static void amdgpu_vm_invalidate_pds(struct amdgpu_device *adev, > struct amdgpu_vm *vm) > { > struct amdgpu_vm_pt_cursor cursor; > - struct amdgpu_vm_pt *entry; > + struct amdgpu_vm_bo_base *entry; > > for_each_amdgpu_vm_pt_dfs_safe(adev, vm, NULL, cursor, entry) > - if (entry->base.bo && !entry->base.moved) > - amdgpu_vm_bo_relocated(&entry->base); > + if (entry->bo && !entry->moved) > + amdgpu_vm_bo_relocated(entry); > } > > /** > @@ -1369,11 +1357,12 @@ int amdgpu_vm_update_pdes(struct amdgpu_device *adev, > return r; > > while (!list_empty(&vm->relocated)) { > - struct amdgpu_vm_pt *entry; > + struct amdgpu_vm_bo_base *entry; > > - entry = list_first_entry(&vm->relocated, struct amdgpu_vm_pt, > - base.vm_status); > - amdgpu_vm_bo_idle(&entry->base); > + entry = list_first_entry(&vm->relocated, > + struct amdgpu_vm_bo_base, > + vm_status); > + amdgpu_vm_bo_idle(entry); > > r = amdgpu_vm_update_pde(¶ms, vm, entry); > if (r) > @@ -1553,7 +1542,7 @@ static int amdgpu_vm_update_ptes(struct amdgpu_vm_update_params *params, > continue; > } > > - pt = cursor.entry->base.bo; > + pt = cursor.entry->bo; > if (!pt) { > /* We need all PDs and PTs for mapping something, */ > if (flags & AMDGPU_PTE_VALID) > @@ -1565,7 +1554,7 @@ static int amdgpu_vm_update_ptes(struct amdgpu_vm_update_params *params, > if (!amdgpu_vm_pt_ancestor(&cursor)) > return -EINVAL; > > - pt = cursor.entry->base.bo; > + pt = cursor.entry->bo; > shift = parent_shift; > frag_end = max(frag_end, ALIGN(frag_start + 1, > 1ULL << shift)); > @@ -1620,7 +1609,7 @@ static int amdgpu_vm_update_ptes(struct amdgpu_vm_update_params *params, > */ > while (cursor.pfn < frag_start) { > /* Make sure previous mapping is freed */ > - if (cursor.entry->base.bo) { > + if (cursor.entry->bo) { > params->table_freed = true; > amdgpu_vm_free_pts(adev, params->vm, &cursor); > } > @@ -1699,7 +1688,7 @@ int amdgpu_vm_bo_update_mapping(struct amdgpu_device *adev, > if (!unlocked && !dma_fence_is_signaled(vm->last_unlocked)) { > struct dma_fence *tmp = dma_fence_get_stub(); > > - amdgpu_bo_fence(vm->root.base.bo, vm->last_unlocked, true); > + amdgpu_bo_fence(vm->root.bo, vm->last_unlocked, true); > swap(vm->last_unlocked, tmp); > dma_fence_put(tmp); > } > @@ -1844,7 +1833,7 @@ int amdgpu_vm_bo_update(struct amdgpu_device *adev, struct amdgpu_bo_va *bo_va, > > if (clear || !bo) { > mem = NULL; > - resv = vm->root.base.bo->tbo.base.resv; > + resv = vm->root.bo->tbo.base.resv; > } else { > struct drm_gem_object *obj = &bo->tbo.base; > > @@ -1875,7 +1864,7 @@ int amdgpu_vm_bo_update(struct amdgpu_device *adev, struct amdgpu_bo_va *bo_va, > } > > if (clear || (bo && bo->tbo.base.resv == > - vm->root.base.bo->tbo.base.resv)) > + vm->root.bo->tbo.base.resv)) > last_update = &vm->last_update; > else > last_update = &bo_va->last_pt_update; > @@ -1917,7 +1906,7 @@ int amdgpu_vm_bo_update(struct amdgpu_device *adev, struct amdgpu_bo_va *bo_va, > * the evicted list so that it gets validated again on the > * next command submission. > */ > - if (bo && bo->tbo.base.resv == vm->root.base.bo->tbo.base.resv) { > + if (bo && bo->tbo.base.resv == vm->root.bo->tbo.base.resv) { > uint32_t mem_type = bo->tbo.mem.mem_type; > > if (!(bo->preferred_domains & > @@ -2054,7 +2043,7 @@ static void amdgpu_vm_free_mapping(struct amdgpu_device *adev, > */ > static void amdgpu_vm_prt_fini(struct amdgpu_device *adev, struct amdgpu_vm *vm) > { > - struct dma_resv *resv = vm->root.base.bo->tbo.base.resv; > + struct dma_resv *resv = vm->root.bo->tbo.base.resv; > struct dma_fence *excl, **shared; > unsigned i, shared_count; > int r; > @@ -2101,7 +2090,7 @@ int amdgpu_vm_clear_freed(struct amdgpu_device *adev, > struct amdgpu_vm *vm, > struct dma_fence **fence) > { > - struct dma_resv *resv = vm->root.base.bo->tbo.base.resv; > + struct dma_resv *resv = vm->root.bo->tbo.base.resv; > struct amdgpu_bo_va_mapping *mapping; > uint64_t init_pte_value = 0; > struct dma_fence *f = NULL; > @@ -2260,7 +2249,7 @@ static void amdgpu_vm_bo_insert_map(struct amdgpu_device *adev, > if (mapping->flags & AMDGPU_PTE_PRT) > amdgpu_vm_prt_get(adev); > > - if (bo && bo->tbo.base.resv == vm->root.base.bo->tbo.base.resv && > + if (bo && bo->tbo.base.resv == vm->root.bo->tbo.base.resv && > !bo_va->base.moved) { > list_move(&bo_va->base.vm_status, &vm->moved); > } > @@ -2622,7 +2611,7 @@ void amdgpu_vm_bo_rmv(struct amdgpu_device *adev, > struct amdgpu_vm_bo_base **base; > > if (bo) { > - if (bo->tbo.base.resv == vm->root.base.bo->tbo.base.resv) > + if (bo->tbo.base.resv == vm->root.bo->tbo.base.resv) > vm->bulk_moveable = false; > > for (base = &bo_va->base.bo->vm_bo; *base; > @@ -2716,7 +2705,7 @@ void amdgpu_vm_bo_invalidate(struct amdgpu_device *adev, > for (bo_base = bo->vm_bo; bo_base; bo_base = bo_base->next) { > struct amdgpu_vm *vm = bo_base->vm; > > - if (evicted && bo->tbo.base.resv == vm->root.base.bo->tbo.base.resv) { > + if (evicted && bo->tbo.base.resv == vm->root.bo->tbo.base.resv) { > amdgpu_vm_bo_evicted(bo_base); > continue; > } > @@ -2727,7 +2716,7 @@ void amdgpu_vm_bo_invalidate(struct amdgpu_device *adev, > > if (bo->tbo.type == ttm_bo_type_kernel) > amdgpu_vm_bo_relocated(bo_base); > - else if (bo->tbo.base.resv == vm->root.base.bo->tbo.base.resv) > + else if (bo->tbo.base.resv == vm->root.bo->tbo.base.resv) > amdgpu_vm_bo_moved(bo_base); > else > amdgpu_vm_bo_invalidated(bo_base); > @@ -2857,7 +2846,7 @@ void amdgpu_vm_adjust_size(struct amdgpu_device *adev, uint32_t min_vm_size, > */ > long amdgpu_vm_wait_idle(struct amdgpu_vm *vm, long timeout) > { > - timeout = dma_resv_wait_timeout_rcu(vm->root.base.bo->tbo.base.resv, > + timeout = dma_resv_wait_timeout_rcu(vm->root.bo->tbo.base.resv, > true, true, timeout); > if (timeout <= 0) > return timeout; > @@ -2943,13 +2932,13 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm, u32 pasid) > if (r) > goto error_unreserve; > > - amdgpu_vm_bo_base_init(&vm->root.base, vm, root_bo); > + amdgpu_vm_bo_base_init(&vm->root, vm, root_bo); > > r = amdgpu_vm_clear_bo(adev, vm, root, false); > if (r) > goto error_unreserve; > > - amdgpu_bo_unreserve(vm->root.base.bo); > + amdgpu_bo_unreserve(vm->root.bo); > > if (pasid) { > unsigned long flags; > @@ -2969,12 +2958,12 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm, u32 pasid) > return 0; > > error_unreserve: > - amdgpu_bo_unreserve(vm->root.base.bo); > + amdgpu_bo_unreserve(vm->root.bo); > > error_free_root: > amdgpu_bo_unref(&root->shadow); > amdgpu_bo_unref(&root_bo); > - vm->root.base.bo = NULL; > + vm->root.bo = NULL; > > error_free_delayed: > dma_fence_put(vm->last_unlocked); > @@ -3000,17 +2989,14 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm, u32 pasid) > * 0 if this VM is clean > */ > static int amdgpu_vm_check_clean_reserved(struct amdgpu_device *adev, > - struct amdgpu_vm *vm) > + struct amdgpu_vm *vm) > { > enum amdgpu_vm_level root = adev->vm_manager.root_level; > unsigned int entries = amdgpu_vm_num_entries(adev, root); > unsigned int i = 0; > > - if (!(vm->root.entries)) > - return 0; > - > for (i = 0; i < entries; i++) { > - if (vm->root.entries[i].base.bo) > + if (to_amdgpu_bo_vm(vm->root.bo)->entries[i].bo) > return -EINVAL; > } > > @@ -3044,7 +3030,7 @@ int amdgpu_vm_make_compute(struct amdgpu_device *adev, struct amdgpu_vm *vm, > bool pte_support_ats = (adev->asic_type == CHIP_RAVEN); > int r; > > - r = amdgpu_bo_reserve(vm->root.base.bo, true); > + r = amdgpu_bo_reserve(vm->root.bo, true); > if (r) > return r; > > @@ -3072,7 +3058,7 @@ int amdgpu_vm_make_compute(struct amdgpu_device *adev, struct amdgpu_vm *vm, > if (pte_support_ats != vm->pte_support_ats) { > vm->pte_support_ats = pte_support_ats; > r = amdgpu_vm_clear_bo(adev, vm, > - to_amdgpu_bo_vm(vm->root.base.bo), > + to_amdgpu_bo_vm(vm->root.bo), > false); > if (r) > goto free_idr; > @@ -3089,7 +3075,7 @@ int amdgpu_vm_make_compute(struct amdgpu_device *adev, struct amdgpu_vm *vm, > > if (vm->use_cpu_for_update) { > /* Sync with last SDMA update/clear before switching to CPU */ > - r = amdgpu_bo_sync_wait(vm->root.base.bo, > + r = amdgpu_bo_sync_wait(vm->root.bo, > AMDGPU_FENCE_OWNER_UNDEFINED, true); > if (r) > goto free_idr; > @@ -3117,7 +3103,7 @@ int amdgpu_vm_make_compute(struct amdgpu_device *adev, struct amdgpu_vm *vm, > } > > /* Free the shadow bo for compute VM */ > - amdgpu_bo_unref(&to_amdgpu_bo_vm(vm->root.base.bo)->shadow); > + amdgpu_bo_unref(&to_amdgpu_bo_vm(vm->root.bo)->shadow); > > if (pasid) > vm->pasid = pasid; > @@ -3133,7 +3119,7 @@ int amdgpu_vm_make_compute(struct amdgpu_device *adev, struct amdgpu_vm *vm, > spin_unlock_irqrestore(&adev->vm_manager.pasid_lock, flags); > } > unreserve_bo: > - amdgpu_bo_unreserve(vm->root.base.bo); > + amdgpu_bo_unreserve(vm->root.bo); > return r; > } > > @@ -3176,7 +3162,7 @@ void amdgpu_vm_fini(struct amdgpu_device *adev, struct amdgpu_vm *vm) > > amdgpu_amdkfd_gpuvm_destroy_cb(adev, vm); > > - root = amdgpu_bo_ref(vm->root.base.bo); > + root = amdgpu_bo_ref(vm->root.bo); > amdgpu_bo_reserve(root, true); > if (vm->pasid) { > unsigned long flags; > @@ -3203,7 +3189,7 @@ void amdgpu_vm_fini(struct amdgpu_device *adev, struct amdgpu_vm *vm) > amdgpu_vm_free_pts(adev, vm, NULL); > amdgpu_bo_unreserve(root); > amdgpu_bo_unref(&root); > - WARN_ON(vm->root.base.bo); > + WARN_ON(vm->root.bo); > > drm_sched_entity_destroy(&vm->immediate); > drm_sched_entity_destroy(&vm->delayed); > @@ -3320,7 +3306,7 @@ int amdgpu_vm_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) > /* Wait vm idle to make sure the vmid set in SPM_VMID is > * not referenced anymore. > */ > - r = amdgpu_bo_reserve(fpriv->vm.root.base.bo, true); > + r = amdgpu_bo_reserve(fpriv->vm.root.bo, true); > if (r) > return r; > > @@ -3328,7 +3314,7 @@ int amdgpu_vm_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) > if (r < 0) > return r; > > - amdgpu_bo_unreserve(fpriv->vm.root.base.bo); > + amdgpu_bo_unreserve(fpriv->vm.root.bo); > amdgpu_vmid_free_reserved(adev, &fpriv->vm, AMDGPU_GFXHUB_0); > break; > default: > @@ -3401,7 +3387,7 @@ bool amdgpu_vm_handle_fault(struct amdgpu_device *adev, u32 pasid, > spin_lock(&adev->vm_manager.pasid_lock); > vm = idr_find(&adev->vm_manager.pasid_idr, pasid); > if (vm) { > - root = amdgpu_bo_ref(vm->root.base.bo); > + root = amdgpu_bo_ref(vm->root.bo); > is_compute_context = vm->is_compute_context; > } else { > root = NULL; > @@ -3426,7 +3412,7 @@ bool amdgpu_vm_handle_fault(struct amdgpu_device *adev, u32 pasid, > /* Double check that the VM still exists */ > spin_lock(&adev->vm_manager.pasid_lock); > vm = idr_find(&adev->vm_manager.pasid_idr, pasid); > - if (vm && vm->root.base.bo != root) > + if (vm && vm->root.bo != root) > vm = NULL; > spin_unlock(&adev->vm_manager.pasid_lock); > if (!vm) > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h > index 1f089da1e615..ddb85a85cbba 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h > @@ -152,13 +152,6 @@ struct amdgpu_vm_bo_base { > bool moved; > }; > > -struct amdgpu_vm_pt { > - struct amdgpu_vm_bo_base base; > - > - /* array of page tables, one for each directory entry */ > - struct amdgpu_vm_pt *entries; > -}; > - > /* provided by hw blocks that can write ptes, e.g., sdma */ > struct amdgpu_vm_pte_funcs { > /* number of dw to reserve per operation */ > @@ -284,7 +277,7 @@ struct amdgpu_vm { > struct list_head done; > > /* contains the page directory */ > - struct amdgpu_vm_pt root; > + struct amdgpu_vm_bo_base root; > struct dma_fence *last_update; > > /* Scheduler entities for page table updates */ > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c > index 422958152c2b..dbb551762805 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c > @@ -112,7 +112,7 @@ static int amdgpu_vm_sdma_commit(struct amdgpu_vm_update_params *p, > swap(p->vm->last_unlocked, f); > dma_fence_put(tmp); > } else { > - amdgpu_bo_fence(p->vm->root.base.bo, f, true); > + amdgpu_bo_fence(p->vm->root.bo, f, true); > } > > if (fence && !p->immediate) > diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_svm.c b/drivers/gpu/drm/amd/amdkfd/kfd_svm.c > index 0f18bd0dc64e..bd911b74b7f9 100644 > --- a/drivers/gpu/drm/amd/amdkfd/kfd_svm.c > +++ b/drivers/gpu/drm/amd/amdkfd/kfd_svm.c > @@ -1274,7 +1274,7 @@ static int svm_range_reserve_bos(struct svm_validate_context *ctx) > adev = (struct amdgpu_device *)pdd->dev->kgd; > vm = drm_priv_to_vm(pdd->drm_priv); > > - ctx->tv[gpuidx].bo = &vm->root.base.bo->tbo; > + ctx->tv[gpuidx].bo = &vm->root.bo->tbo; > ctx->tv[gpuidx].num_shared = 4; > list_add(&ctx->tv[gpuidx].head, &ctx->validate_list); > } _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx