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 1DB92C36014 for ; Wed, 2 Apr 2025 09:29:48 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D9CE310E72E; Wed, 2 Apr 2025 09:29:47 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="BiNihdID"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.17]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0014D10E72B for ; Wed, 2 Apr 2025 09:29:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1743586186; x=1775122186; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Aogr4B6tpyJ3PtOmi7p9ptTBsXdBdUXagl1d4SeylCM=; b=BiNihdIDtSyMncm9FH0+5VAgz3qXEpboy5R/o8QHeY/SHn1sq/SdDZo+ 7O9hU6HtjSZc39vwuc3Nyn2nmhG0PbudkyCu6bhD6mC4WZ8gpiKJmbsKT jQFJNrrEF6oL3qFcvq560I7fs/eCHs0TEs2Yi/KksJemW8VADldgrGGgv QtktHulyNMucBjoc7MIxc5gwplE8+kPSULwhKrhuo+ka2Lxq1ZB0RZn/8 pHUoVpzXzE5xwA8WsG5HDZtMgrKGDkVTIbFPtasY05Y5tcVlPJoT59HbU 0yfRhkUjoOiS70EfdK/sV9y4oTSg8cSHK8cAoF2v3R7WYDS3FKK7LHyiP w==; X-CSE-ConnectionGUID: N1KbaSD2SOKKcW+Xb6IOIQ== X-CSE-MsgGUID: iakSe37mQ8qeqlqRovFxcQ== X-IronPort-AV: E=McAfee;i="6700,10204,11391"; a="44824869" X-IronPort-AV: E=Sophos;i="6.14,181,1736841600"; d="scan'208";a="44824869" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by fmvoesa111.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Apr 2025 02:29:46 -0700 X-CSE-ConnectionGUID: b1FNNG7KS8CKJypYM5ptQA== X-CSE-MsgGUID: vHU5lvvuRGqfX6Rf+kg0Og== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,181,1736841600"; d="scan'208";a="126538406" Received: from oandoniu-mobl3.ger.corp.intel.com (HELO mwauld-desk.intel.com) ([10.245.245.252]) by orviesa010-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Apr 2025 02:29:45 -0700 From: Matthew Auld To: intel-xe@lists.freedesktop.org Cc: Satyanarayana K V P , =?UTF-8?q?Thomas=20Hellstr=C3=B6m?= , Matthew Brost Subject: [PATCH v5 6/7] drm/xe: allow non-contig VRAM kernel BO Date: Wed, 2 Apr 2025 10:29:28 +0100 Message-ID: <20250402092921.79918-15-matthew.auld@intel.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250402092921.79918-9-matthew.auld@intel.com> References: <20250402092921.79918-9-matthew.auld@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" If the kernel bo doesn't care about vmap(), either directly or indirectly with save/restore then we don't need to force contig for such buffers. Signed-off-by: Matthew Auld Cc: Satyanarayana K V P Cc: Thomas Hellström Cc: Matthew Brost Reviewed-by: Satyanarayana K V P --- drivers/gpu/drm/xe/xe_bo.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/xe/xe_bo.c b/drivers/gpu/drm/xe/xe_bo.c index 29e5849a9ae3..c337790c81ae 100644 --- a/drivers/gpu/drm/xe/xe_bo.c +++ b/drivers/gpu/drm/xe/xe_bo.c @@ -191,11 +191,18 @@ static void try_add_system(struct xe_device *xe, struct xe_bo *bo, static bool force_contiguous(u32 bo_flags) { + if (bo_flags & XE_BO_FLAG_STOLEN) + return true; /* users expect this */ + else if (bo_flags & XE_BO_FLAG_PINNED && + !(bo_flags & XE_BO_FLAG_PINNED_LATE_RESTORE)) + return true; /* needs vmap */ + /* * For eviction / restore on suspend / resume objects pinned in VRAM * must be contiguous, also only contiguous BOs support xe_bo_vmap. */ - return bo_flags & (XE_BO_FLAG_PINNED | XE_BO_FLAG_GGTT); + return bo_flags & XE_BO_FLAG_NEEDS_CPU_ACCESS && + bo_flags & XE_BO_FLAG_PINNED; } static void add_vram(struct xe_device *xe, struct xe_bo *bo, -- 2.49.0