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 2D0FAC76195 for ; Wed, 15 Mar 2023 15:55:40 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C384310E94B; Wed, 15 Mar 2023 15:55:39 +0000 (UTC) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by gabe.freedesktop.org (Postfix) with ESMTPS id BFC4110E971 for ; Wed, 15 Mar 2023 15:55:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1678895737; x=1710431737; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=kEW6/9JsQ8CszG0e59cy9DhwqTAm/kmEcxK5rjiNkM8=; b=D4siewqoSYgkcNGFsaANU7m8b8LxytCTDZvl7q9qMJ8FybaQcBSXap69 12YDpTGukGM1S5i1PY321PevO/Fzy/1p/ksx16ymFWw/w+o4wTpSMXR7w m08oFXTSFRxZtvfqfVhg3cQJJbrKedfKz1VdP6KI7tpV01fNy19dV+dqP ii80iOA7IzTq4nD1tulBY04VuZ/tLpTlPttHb/XSofK4I1ki3plXZfvWw 0f5yapuW592MHWoeMA29D/8oI1UxlScmN90Y1K0ixfofNhCB4sLRhp8XT IRV4/bYWfUTBU/5aFechmN5HlCmY2ZDBhlVEiN/SDfKCUC6bDC1iVg8tn w==; X-IronPort-AV: E=McAfee;i="6500,9779,10650"; a="321583082" X-IronPort-AV: E=Sophos;i="5.98,262,1673942400"; d="scan'208";a="321583082" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Mar 2023 08:55:37 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10650"; a="711973680" X-IronPort-AV: E=Sophos;i="5.98,262,1673942400"; d="scan'208";a="711973680" Received: from lbarg-mobl1.ger.corp.intel.com (HELO thellstr-mobl1.intel.com) ([10.249.254.237]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Mar 2023 08:55:33 -0700 From: =?UTF-8?q?Thomas=20Hellstr=C3=B6m?= To: intel-xe@lists.freedesktop.org Date: Wed, 15 Mar 2023 16:55:02 +0100 Message-Id: <20230315155507.43933-3-thomas.hellstrom@linux.intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230315155507.43933-1-thomas.hellstrom@linux.intel.com> References: <20230315155507.43933-1-thomas.hellstrom@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Intel-xe] [PATCH v2 2/7] drm/xe/migrate: Update cpu page-table updates 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: , Cc: matthew.auld@intel.com Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" Don't wait for GPU to be able to update page-tables using CPU. Putting ourselves to sleep may be more of a problem than using GPU for page-table updates. Also allow the vm to be NULL since the migrate kunit test uses NULL for vm. Signed-off-by: Thomas Hellström Reviewed-by: Matthew Auld --- drivers/gpu/drm/xe/xe_migrate.c | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_migrate.c b/drivers/gpu/drm/xe/xe_migrate.c index c0523d8fe944..39ed63829224 100644 --- a/drivers/gpu/drm/xe/xe_migrate.c +++ b/drivers/gpu/drm/xe/xe_migrate.c @@ -979,25 +979,13 @@ xe_migrate_update_pgtables_cpu(struct xe_migrate *m, int err; u32 i; - /* Wait on BO moves for 10 ms, then fall back to GPU job */ - if (bo) { - long wait; + if (bo && !dma_resv_test_signaled(bo->ttm.base.resv, + DMA_RESV_USAGE_KERNEL)) + return ERR_PTR(-ETIME); - wait = dma_resv_wait_timeout(bo->ttm.base.resv, - DMA_RESV_USAGE_KERNEL, - true, HZ / 100); - if (wait <= 0) - return ERR_PTR(-ETIME); - } - if (wait_vm) { - long wait; - - wait = dma_resv_wait_timeout(&vm->resv, - DMA_RESV_USAGE_BOOKKEEP, - true, HZ / 100); - if (wait <= 0) - return ERR_PTR(-ETIME); - } + if (wait_vm && !dma_resv_test_signaled(&vm->resv, + DMA_RESV_USAGE_BOOKKEEP)) + return ERR_PTR(-ETIME); if (ops->pre_commit) { err = ops->pre_commit(pt_update); @@ -1011,8 +999,10 @@ xe_migrate_update_pgtables_cpu(struct xe_migrate *m, update->ofs, update->qwords, update); } - trace_xe_vm_cpu_bind(vm); - xe_device_wmb(vm->xe); + if (vm) { + trace_xe_vm_cpu_bind(vm); + xe_device_wmb(vm->xe); + } fence = dma_fence_get_stub(); -- 2.39.2