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 853A5C2BA18 for ; Tue, 18 Jun 2024 05:23:52 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 40C5710E56D; Tue, 18 Jun 2024 05:23:52 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="RQMsvdJJ"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.13]) by gabe.freedesktop.org (Postfix) with ESMTPS id B1B2010E56D for ; Tue, 18 Jun 2024 05:23:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1718688232; x=1750224232; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=PqhP8c6tC+LVPFRrvylJSq6XFaSAIaAnc9m1yUrauq8=; b=RQMsvdJJzD+UHOeKaEVlykPH8fK9qy+8C5L77BTBIsoIbcGKOvCZDi2O YtL76lA1Nnr02SSHik7PddnAyKYDX8JnLnTmlQUh1lFFa3jdaMQhfM/6D MLzRTzpaRzAABawKV2GkwNh0Zh0IwtiXzAoEz3msgs+hzBAplXR2yWOqm GC49viUUJ6e1SBuIOvm0eeI29jyMrjU+zrGAPtxRSShbjd6uQp58akKHU LBWMrMlByHFoQRHCbSWe3i7qionVHx6hVN++8hYNyWlTat7c7pTBU29Od qmsNhLHzsbmQII4Gi/3dEHWr4m0WNprdIYMUGZzHBrOyNDrJ8uvuGaxSW Q==; X-CSE-ConnectionGUID: ulclDdyMSQ6u8E/kjHzgQQ== X-CSE-MsgGUID: OoK+vIQWRjOR5N5vEfLnVg== X-IronPort-AV: E=McAfee;i="6700,10204,11106"; a="26660070" X-IronPort-AV: E=Sophos;i="6.08,246,1712646000"; d="scan'208";a="26660070" Received: from fmviesa010.fm.intel.com ([10.60.135.150]) by orvoesa105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Jun 2024 22:23:52 -0700 X-CSE-ConnectionGUID: YaBCpYqJRAeCJX22iafwFQ== X-CSE-MsgGUID: swkY5z2kT166rf3+ujq96A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,246,1712646000"; d="scan'208";a="41525183" Received: from bergbenj-mobl1.ger.corp.intel.com (HELO localhost) ([10.245.246.150]) by fmviesa010-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Jun 2024 22:23:50 -0700 From: =?UTF-8?q?Zbigniew=20Kempczy=C5=84ski?= To: igt-dev@lists.freedesktop.org Cc: =?UTF-8?q?Zbigniew=20Kempczy=C5=84ski?= , Juha-Pekka Heikkila Subject: [PATCH i-g-t v2 03/12] lib/intel_bufops: Add linear-to-none copy path Date: Tue, 18 Jun 2024 07:23:26 +0200 Message-Id: <20240618052335.152588-4-zbigniew.kempczynski@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240618052335.152588-1-zbigniew.kempczynski@intel.com> References: <20240618052335.152588-1-zbigniew.kempczynski@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: igt-dev@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development mailing list for IGT GPU Tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" At first glance copying linear to linear (none) is not necessary as ordinary memcpy() may be used. But adding this makes iterating over all possible tilings much easier. In the upcoming patch I'm going to introduce tiling detection tool which iterates over all tilings where linear copy is also exercised. Signed-off-by: Zbigniew Kempczyński Cc: Juha-Pekka Heikkila Reviewed-by: Juha-Pekka Heikkila --- lib/intel_bufops.c | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/lib/intel_bufops.c b/lib/intel_bufops.c index b4ccf4c093..30ba2547dc 100644 --- a/lib/intel_bufops.c +++ b/lib/intel_bufops.c @@ -292,6 +292,17 @@ static unsigned long swizzle_addr(void *ptr, uint32_t swizzle) } } +static void *linear_ptr(void *ptr, + unsigned int x, unsigned int y, + unsigned int stride, unsigned int cpp) +{ + int pos; + + pos = (stride/cpp * y + x) * cpp; + + return ptr + pos; +} + static void *x_ptr(void *ptr, unsigned int x, unsigned int y, unsigned int stride, unsigned int cpp) @@ -418,6 +429,9 @@ static tile_fn __get_tile_fn_ptr(int tiling) tile_fn fn = NULL; switch (tiling) { + case I915_TILING_NONE: + fn = linear_ptr; + break; case I915_TILING_X: fn = x_ptr; break; @@ -598,6 +612,13 @@ static void __copy_linear_to(int fd, struct intel_buf *buf, munmap(map, buf->surface[0].size); } +static void copy_linear_to_none(struct buf_ops *bops, struct intel_buf *buf, + uint32_t *linear) +{ + DEBUGFN(); + __copy_linear_to(bops->fd, buf, linear, I915_TILING_NONE, 0); +} + static void copy_linear_to_x(struct buf_ops *bops, struct intel_buf *buf, uint32_t *linear) { @@ -655,6 +676,13 @@ static void __copy_to_linear(int fd, struct intel_buf *buf, munmap(map, buf->surface[0].size); } +static void copy_none_to_linear(struct buf_ops *bops, struct intel_buf *buf, + uint32_t *linear) +{ + DEBUGFN(); + __copy_to_linear(bops->fd, buf, linear, I915_TILING_NONE, 0); +} + static void copy_x_to_linear(struct buf_ops *bops, struct intel_buf *buf, uint32_t *linear) { @@ -1653,13 +1681,14 @@ static struct buf_ops *__buf_ops_create(int fd, bool check_idempotency) bops->driver == INTEL_DRIVER_I915 ? "i915" : "xe"); if (bops->driver == INTEL_DRIVER_XE) { + bops->linear_to = copy_linear_to_none; + bops->to_linear = copy_none_to_linear; bops->linear_to_x = copy_linear_to_x; bops->x_to_linear = copy_x_to_linear; bops->linear_to_y = copy_linear_to_y; bops->y_to_linear = copy_y_to_linear; bops->linear_to_tile4 = copy_linear_to_tile4; bops->tile4_to_linear = copy_tile4_to_linear; - bops->linear_to_yf = NULL; bops->yf_to_linear = NULL; bops->linear_to_ys = NULL; @@ -1869,6 +1898,10 @@ bool buf_ops_set_software_tiling(struct buf_ops *bops, } switch (tiling) { + case I915_TILING_NONE: + igt_debug("-> use SW on tiling NONE\n"); + break; + case I915_TILING_X: if (use_software_tiling) { bool supported = buf_ops_has_tiling_support(bops, tiling); -- 2.34.1