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 E42E3C10F1A for ; Thu, 9 May 2024 05:34:13 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 923CC10E191; Thu, 9 May 2024 05:34:13 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="Tex/JxKJ"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.9]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8176E10E191 for ; Thu, 9 May 2024 05:34:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1715232853; x=1746768853; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ne/CrNYd26L/zucSX3liymTGHA0A8DNEp+4QfT6wEzU=; b=Tex/JxKJLMfv1Vm8KnCCDNKwS38I1oB0mQiwsTGwIiM3f1ngDAGS3oxY hwk7bS5LllzH+kUNxBuy+9ZnMQMH07RNfNs4MbxeJ/UgBclYKtCiuaN5r RjVyG+rxWz27oOtiYo+gaV1ZIrKlBYYe/KZkzNpaQEFYIM+UbeDVKPfik 7QdOQQgBveTkFp3X31szpv6IlhlyoAqHj3dz0E0v44mYrQlDDGYnshldH hwu6asro/Dkzt4MWVXNA62RHJqXlN9A92pKBWNFKa7DbJyxg77PFPwDD2 88fP5C0B+hojaxkhSm9BsaY/N7jimXHT/RpwpBCx41521aw9H8vqnQuDX w==; X-CSE-ConnectionGUID: IfujSztMSQid4fpb12OZMw== X-CSE-MsgGUID: 8TrYtOL6Qk+kUEelyp1Oig== X-IronPort-AV: E=McAfee;i="6600,9927,11067"; a="21802853" X-IronPort-AV: E=Sophos;i="6.08,146,1712646000"; d="scan'208";a="21802853" Received: from fmviesa006.fm.intel.com ([10.60.135.146]) by fmvoesa103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 May 2024 22:34:12 -0700 X-CSE-ConnectionGUID: ngarzth0T3S+Divazv3YtQ== X-CSE-MsgGUID: zDuu3A4hTeeRRsDaaJQXow== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,146,1712646000"; d="scan'208";a="29187158" Received: from unknown (HELO localhost) ([10.245.246.122]) by fmviesa006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 May 2024 22:34:11 -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 v5 01/11] lib/intel_bufops: Store devid on buffer ops creation Date: Thu, 9 May 2024 07:33:49 +0200 Message-Id: <20240509053359.449885-2-zbigniew.kempczynski@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240509053359.449885-1-zbigniew.kempczynski@intel.com> References: <20240509053359.449885-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" As I need devid to diverge intel-buf init code lets store it in bufops structure. This field is commonly used so add function which returns it. Signed-off-by: Zbigniew Kempczyński Reviewed-by: Juha-Pekka Heikkila --- lib/intel_bufops.c | 20 +++++++++++++++++--- lib/intel_bufops.h | 1 + 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/lib/intel_bufops.c b/lib/intel_bufops.c index 51fdf50adb..43d6dd5b43 100644 --- a/lib/intel_bufops.c +++ b/lib/intel_bufops.c @@ -114,6 +114,7 @@ struct buf_ops { int gen_start; int gen_end; unsigned int intel_gen; + uint32_t devid; uint32_t supported_tiles; uint32_t supported_hw_tiles; uint32_t swizzle_x; @@ -1499,12 +1500,11 @@ static bool probe_hw_tiling(struct buf_ops *bops, uint32_t tiling, { uint64_t size = 256 * 256; uint32_t handle, buf_tiling, buf_swizzle, phys_swizzle; - uint32_t devid, stride; + uint32_t stride; int ret; bool is_set = false; - devid = intel_get_drm_devid(bops->fd); - stride = get_stride(devid, tiling); + stride = get_stride(bops->devid, tiling); handle = gem_create(bops->fd, size); /* Single shot, if no fences are available we fail immediately */ @@ -1616,6 +1616,7 @@ static struct buf_ops *__buf_ops_create(int fd, bool check_idempotency) bops->fd = fd; bops->intel_gen = generation; + bops->devid = devid; bops->driver = is_i915_device(fd) ? INTEL_DRIVER_I915 : is_xe_device(fd) ? INTEL_DRIVER_XE : 0; igt_assert(bops->driver); @@ -1785,6 +1786,19 @@ int buf_ops_get_fd(struct buf_ops *bops) return bops->fd; } +/** + * buf_ops_get_devid + * @bops: pointer to buf_ops + * + * Returns: device id + */ +uint32_t buf_ops_get_devid(struct buf_ops *bops) +{ + igt_assert(bops); + + return bops->devid; +} + /** * buf_ops_get_driver * @bops: pointer to buf_ops diff --git a/lib/intel_bufops.h b/lib/intel_bufops.h index b959a8cc8e..84e71d41a2 100644 --- a/lib/intel_bufops.h +++ b/lib/intel_bufops.h @@ -118,6 +118,7 @@ struct buf_ops *buf_ops_create(int fd); struct buf_ops *buf_ops_create_with_selftest(int fd); void buf_ops_destroy(struct buf_ops *bops); int buf_ops_get_fd(struct buf_ops *bops); +uint32_t buf_ops_get_devid(struct buf_ops *bops); enum intel_driver buf_ops_get_driver(struct buf_ops *bops); bool buf_ops_set_software_tiling(struct buf_ops *bops, -- 2.34.1