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 B6F25C87FDE for ; Mon, 1 May 2023 07:51:18 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2E38C10E406; Mon, 1 May 2023 07:51:18 +0000 (UTC) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id C488810E3BF for ; Mon, 1 May 2023 07:51:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1682927473; x=1714463473; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=GGM81wkRvSMeljT95Eun8/CRn8HdGVx85rYCSvjP5ZM=; b=fpKylnKkh6CV+9c7EFgoxhrQUcQIrGc75j74CjYSqOYfTUu9dTEIylMp g7zRWl11m2mbl9yTmG6kCkX/cfoklmtIbY+aOxf5wkjHQjeO5FmUFR9GC WNQsC0rWaPjGobpHrPauO6hTu1jEkpmsNYAu9/zbmYmn1Pw4TlJJF8yXj HDCayG1j67iMXzvKw91GKvPCPwQKawTLOnExD5E+DljP4NWCSOfLA7i/h UPCPi4mQnvidCpNSQNoYpp4Ejl/zxfJL4JnhldkB8l88nEdRyDKQqzpN5 w5dWrj2EY+OlwUcP9Lh3S04/8As1SPM7DB2cc/7iD/k1g3Q0jNdAvSWGl g==; X-IronPort-AV: E=McAfee;i="6600,9927,10696"; a="346910734" X-IronPort-AV: E=Sophos;i="5.99,239,1677571200"; d="scan'208";a="346910734" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 May 2023 00:51:12 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10696"; a="870095263" X-IronPort-AV: E=Sophos;i="5.99,239,1677571200"; d="scan'208";a="870095263" Received: from lstrano-desk.jf.intel.com ([10.24.89.184]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 May 2023 00:51:11 -0700 From: Matthew Brost To: Date: Mon, 1 May 2023 00:51:12 -0700 Message-Id: <20230501075114.3108352-29-matthew.brost@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230501075114.3108352-1-matthew.brost@intel.com> References: <20230501075114.3108352-1-matthew.brost@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Intel-xe] [PATCH 28/30] drm/xe: Allow dma-fences as in-syncs for compute / faulting VM 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" This is allowed per the dma-fencing rules. Signed-off-by: Matthew Brost --- drivers/gpu/drm/xe/xe_sync.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_sync.c b/drivers/gpu/drm/xe/xe_sync.c index 99f1ed87196d..1e4e4acb2c4a 100644 --- a/drivers/gpu/drm/xe/xe_sync.c +++ b/drivers/gpu/drm/xe/xe_sync.c @@ -105,6 +105,7 @@ int xe_sync_entry_parse(struct xe_device *xe, struct xe_file *xef, { struct drm_xe_sync sync_in; int err; + bool signal; if (copy_from_user(&sync_in, sync_user, sizeof(*sync_user))) return -EFAULT; @@ -113,9 +114,10 @@ int xe_sync_entry_parse(struct xe_device *xe, struct xe_file *xef, ~(SYNC_FLAGS_TYPE_MASK | DRM_XE_SYNC_SIGNAL))) return -EINVAL; + signal = sync_in.flags & DRM_XE_SYNC_SIGNAL; switch (sync_in.flags & SYNC_FLAGS_TYPE_MASK) { case DRM_XE_SYNC_SYNCOBJ: - if (XE_IOCTL_ERR(xe, no_dma_fences)) + if (XE_IOCTL_ERR(xe, no_dma_fences && signal)) return -ENOTSUPP; if (XE_IOCTL_ERR(xe, upper_32_bits(sync_in.addr))) @@ -125,7 +127,7 @@ int xe_sync_entry_parse(struct xe_device *xe, struct xe_file *xef, if (XE_IOCTL_ERR(xe, !sync->syncobj)) return -ENOENT; - if (!(sync_in.flags & DRM_XE_SYNC_SIGNAL)) { + if (!signal) { sync->fence = drm_syncobj_fence_get(sync->syncobj); if (XE_IOCTL_ERR(xe, !sync->fence)) return -EINVAL; @@ -133,7 +135,7 @@ int xe_sync_entry_parse(struct xe_device *xe, struct xe_file *xef, break; case DRM_XE_SYNC_TIMELINE_SYNCOBJ: - if (XE_IOCTL_ERR(xe, no_dma_fences)) + if (XE_IOCTL_ERR(xe, no_dma_fences && signal)) return -ENOTSUPP; if (XE_IOCTL_ERR(xe, upper_32_bits(sync_in.addr))) @@ -146,7 +148,7 @@ int xe_sync_entry_parse(struct xe_device *xe, struct xe_file *xef, if (XE_IOCTL_ERR(xe, !sync->syncobj)) return -ENOENT; - if (sync_in.flags & DRM_XE_SYNC_SIGNAL) { + if (signal) { sync->chain_fence = dma_fence_chain_alloc(); if (!sync->chain_fence) return -ENOMEM; @@ -168,7 +170,7 @@ int xe_sync_entry_parse(struct xe_device *xe, struct xe_file *xef, break; case DRM_XE_SYNC_USER_FENCE: - if (XE_IOCTL_ERR(xe, !(sync_in.flags & DRM_XE_SYNC_SIGNAL))) + if (XE_IOCTL_ERR(xe, !signal)) return -ENOTSUPP; if (XE_IOCTL_ERR(xe, sync_in.addr & 0x7)) -- 2.34.1