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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id DD929C10F07 for ; Thu, 7 Dec 2023 14:12:26 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A8B9C10E8BA; Thu, 7 Dec 2023 14:12:26 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5EE6E10E8BA for ; Thu, 7 Dec 2023 14:12:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1701958344; x=1733494344; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=bXQeo+s4tVAf3ezfJHRSzPn6ix60jb8coF9rFp15+QM=; b=nk7jtCf70wgJUHQ+RHzRTS/4rHIWDC1GPzDfBrV+B5vajYvZA+rV0W3U uxrTipCVbSN45VETqt4XEsEaHfV+GUcVPwgZJ/svElBXNN0p1vQlUXmIQ 53J7uwcK05hPe0JdpM9Zvd1wH1g+gk5dui9HkykrrMJD9E4Lek+sBNkyE njVU4pOScLdrdtDoSnCHhcNgUfmO8tNm+w82BF9boTsqSSboD5XRVK9iw E8bFWqHWK8sL7Q6cTcSpm/FJwikQ5+Ug7gJoWINGCw6xcDnU+a6tq5kod TMM3RrPcc3S6OVP8geoAi0lSDiJ1RBhtGw82DGB+HIjtl9z/D+PXtC/Ss g==; X-IronPort-AV: E=McAfee;i="6600,9927,10917"; a="12947583" X-IronPort-AV: E=Sophos;i="6.04,256,1695711600"; d="scan'208";a="12947583" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Dec 2023 06:12:24 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10917"; a="721479792" X-IronPort-AV: E=Sophos;i="6.04,256,1695711600"; d="scan'208";a="721479792" Received: from jpoulsen-mobl.ger.corp.intel.com (HELO fedora..) ([10.249.254.234]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Dec 2023 06:12:21 -0800 From: =?UTF-8?q?Thomas=20Hellstr=C3=B6m?= To: intel-xe@lists.freedesktop.org Subject: [PATCH 15/16] drm/xe: Adjust to commit "drm/gpuvm: add an abstraction for a VM/BO combination" Date: Thu, 7 Dec 2023 15:11:55 +0100 Message-ID: <20231207141157.26014-16-thomas.hellstrom@linux.intel.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231207141157.26014-1-thomas.hellstrom@linux.intel.com> References: <20231207141157.26014-1-thomas.hellstrom@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: intel-xe@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Xe graphics driver List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" Signed-off-by: Thomas Hellström --- drivers/gpu/drm/xe/xe_bo.c | 11 +++++++---- drivers/gpu/drm/xe/xe_vm.c | 33 ++++++++++++++++++++++++++------- 2 files changed, 33 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_bo.c b/drivers/gpu/drm/xe/xe_bo.c index ad9d8793db3e..7e25c8b7a01a 100644 --- a/drivers/gpu/drm/xe/xe_bo.c +++ b/drivers/gpu/drm/xe/xe_bo.c @@ -470,6 +470,7 @@ static int xe_bo_trigger_rebind(struct xe_device *xe, struct xe_bo *bo, struct dma_fence *fence; struct drm_gpuva *gpuva; struct drm_gem_object *obj = &bo->ttm.base; + struct drm_gpuvm_bo *vm_bo; int ret = 0; dma_resv_assert_held(bo->ttm.base.resv); @@ -482,11 +483,12 @@ static int xe_bo_trigger_rebind(struct xe_device *xe, struct xe_bo *bo, dma_resv_iter_end(&cursor); } - drm_gem_for_each_gpuva(gpuva, obj) { - struct xe_vma *vma = gpuva_to_vma(gpuva); - struct xe_vm *vm = xe_vma_vm(vma); + drm_gem_for_each_gpuvm_bo(vm_bo, obj) { + drm_gpuvm_bo_for_each_va(gpuva, vm_bo) { + struct xe_vma *vma = gpuva_to_vma(gpuva); + struct xe_vm *vm = xe_vma_vm(vma); - trace_xe_vma_evict(vma); + trace_xe_vma_evict(vma); if (xe_vm_in_fault_mode(vm)) { /* Wait for pending binds / unbinds. */ @@ -540,6 +542,7 @@ static int xe_bo_trigger_rebind(struct xe_device *xe, struct xe_bo *bo, if (vm_resv_locked) dma_resv_unlock(xe_vm_resv(vm)); } + } } return ret; diff --git a/drivers/gpu/drm/xe/xe_vm.c b/drivers/gpu/drm/xe/xe_vm.c index 6c8a84026af4..f71285e8ef10 100644 --- a/drivers/gpu/drm/xe/xe_vm.c +++ b/drivers/gpu/drm/xe/xe_vm.c @@ -911,12 +911,21 @@ static struct xe_vma *xe_vma_create(struct xe_vm *vm, vma->pat_index = pat_index; if (bo) { + struct drm_gpuvm_bo *vm_bo; + xe_bo_assert_held(bo); + vm_bo = drm_gpuvm_bo_obtain(vma->gpuva.vm, &bo->ttm.base); + if (IS_ERR(vm_bo)) { + kfree(vma); + return ERR_CAST(vm_bo); + } + drm_gem_object_get(&bo->ttm.base); vma->gpuva.gem.obj = &bo->ttm.base; vma->gpuva.gem.offset = bo_offset_or_userptr; - drm_gpuva_link(&vma->gpuva); + drm_gpuva_link(&vma->gpuva, vm_bo); + drm_gpuvm_bo_put(vm_bo); } else /* userptr or null */ { if (!is_null) { u64 size = end - start + 1; @@ -998,16 +1007,19 @@ static struct xe_vma * bo_has_vm_references_locked(struct xe_bo *bo, struct xe_vm *vm, struct xe_vma *ignore) { - struct drm_gpuva *gpuva; + struct drm_gpuvm_bo *vm_bo; + struct drm_gpuva *va; struct drm_gem_object *obj = &bo->ttm.base; xe_bo_assert_held(bo); - drm_gem_for_each_gpuva(gpuva, obj) { - struct xe_vma *vma = gpuva_to_vma(gpuva); + drm_gem_for_each_gpuvm_bo(vm_bo, obj) { + drm_gpuvm_bo_for_each_va(va, vm_bo) { + struct xe_vma *vma = gpuva_to_vma(va); - if (vma != ignore && xe_vma_vm(vma) == vm) - return vma; + if (vma != ignore && xe_vma_vm(vma) == vm) + return vma; + } } return NULL; @@ -2156,6 +2168,7 @@ vm_bind_ioctl_ops_create(struct xe_vm *vm, struct xe_bo *bo, struct drm_gpuva_ops *ops; struct drm_gpuva_op *__op; struct xe_vma_op *op; + struct drm_gpuvm_bo *vm_bo; int err; lockdep_assert_held_write(&vm->lock); @@ -2183,7 +2196,13 @@ vm_bind_ioctl_ops_create(struct xe_vm *vm, struct xe_bo *bo, err = xe_bo_lock(bo, true); if (err) return ERR_PTR(err); - ops = drm_gpuvm_gem_unmap_ops_create(&vm->gpuvm, obj); + + vm_bo = drm_gpuvm_bo_find(&vm->gpuvm, obj); + if (!vm_bo) + break; + + ops = drm_gpuvm_bo_unmap_ops_create(vm_bo); + drm_gpuvm_bo_put(vm_bo); xe_bo_unlock(bo); break; default: -- 2.42.0