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 877A6C4829C for ; Fri, 9 Feb 2024 18:35:24 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 18CCA10F9A3; Fri, 9 Feb 2024 18:35:24 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="mt5MQzfJ"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) by gabe.freedesktop.org (Postfix) with ESMTPS id A6A0810F997 for ; Fri, 9 Feb 2024 18:35:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1707503721; x=1739039721; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=gywjjv1MiUtI+4zN/f8gXj5eUKKeXxEaqNo/Dld+9Ds=; b=mt5MQzfJNN7gOGbk54PMYR2d9+1CIErKM7+P99B4qexvkKdx3z5X9gMw U40n2jQTg7I5sHlTLS9PAa4lF3AaLzjeJhpaNltgIRikdNwHwZonzd8RQ mF1p9Dk5CiLLpYSMKDHcXnRNBmn+BV4lKnVNsbf+ntPOH8AB0VWJ4CAD5 vN9uwxGeLLG2uWOPexOpxjfxEeo4kPOGt52XgdF8jCM8Xrdcmp5HgKM+g qAs+lPs51NQpQmIRZslU0IM3Y+Rncr7bg6HOehW6VeULvxTYywjoPUoT9 I7aWrHNwQpAd7fDrnBUV6JVMemthwZHacFx8lEcg81ooCQkFwkD7zMusE Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10979"; a="12049321" X-IronPort-AV: E=Sophos;i="6.05,257,1701158400"; d="scan'208";a="12049321" Received: from orviesa003.jf.intel.com ([10.64.159.143]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Feb 2024 10:35:21 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.05,257,1701158400"; d="scan'208";a="6647779" Received: from vdegtyar-mobl1.ger.corp.intel.com (HELO mwauld-mobl1.intel.com) ([10.252.20.246]) by ORVIESA003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Feb 2024 10:35:20 -0800 From: Matthew Auld To: igt-dev@lists.freedesktop.org Cc: =?UTF-8?q?Zbigniew=20Kempczy=C5=84ski?= Subject: [PATCH i-g-t 5/8] tests/intel: replace intel_buf_init_using_handle() Date: Fri, 9 Feb 2024 18:34:30 +0000 Message-ID: <20240209183433.375099-5-matthew.auld@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240209183433.375099-1-matthew.auld@intel.com> References: <20240209183433.375099-1-matthew.auld@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" Require the original object size, if the caller created the object and convert all existing users over. Signed-off-by: Matthew Auld Cc: Zbigniew KempczyƄski --- lib/intel_bufops.c | 17 ++++++++++------- lib/intel_bufops.h | 17 ++++++++++------- tests/intel/gem_set_tiling_vs_blt.c | 7 ++++--- 3 files changed, 24 insertions(+), 17 deletions(-) diff --git a/lib/intel_bufops.c b/lib/intel_bufops.c index 914034af6..7f72f4762 100644 --- a/lib/intel_bufops.c +++ b/lib/intel_bufops.c @@ -1011,7 +1011,7 @@ void intel_buf_close(struct buf_ops *bops, struct intel_buf *buf) } /** - * intel_buf_init_using_handle + * intel_buf_init_using_handle_and_size * @bops: pointer to buf_ops * @handle: BO handle created by the caller * @buf: pointer to intel_buf structure to be filled @@ -1021,6 +1021,7 @@ void intel_buf_close(struct buf_ops *bops, struct intel_buf *buf) * @alignment: alignment of the stride for linear surfaces * @tiling: surface tiling * @compression: surface compression type + * @size: real bo size * * Function configures BO handle within intel_buf structure passed by the caller * (with all its metadata - width, height, ...). Useful if BO was created @@ -1029,14 +1030,16 @@ void intel_buf_close(struct buf_ops *bops, struct intel_buf *buf) * Note: intel_buf_close() can be used because intel_buf is aware it is not * buffer owner so it won't close it underneath. */ -void intel_buf_init_using_handle(struct buf_ops *bops, - uint32_t handle, - struct intel_buf *buf, - int width, int height, int bpp, int alignment, - uint32_t req_tiling, uint32_t compression) +void intel_buf_init_using_handle_and_size(struct buf_ops *bops, + uint32_t handle, + struct intel_buf *buf, + int width, int height, int bpp, int alignment, + uint32_t req_tiling, uint32_t compression, + uint64_t size) { + igt_assert(handle); __intel_buf_init(bops, handle, buf, width, height, bpp, alignment, - req_tiling, compression, 0, 0, -1, DEFAULT_PAT_INDEX); + req_tiling, compression, size, 0, -1, DEFAULT_PAT_INDEX); } /** diff --git a/lib/intel_bufops.h b/lib/intel_bufops.h index 54a143c5b..75ddf5d4c 100644 --- a/lib/intel_bufops.h +++ b/lib/intel_bufops.h @@ -154,7 +154,8 @@ void intel_buf_init_using_handle(struct buf_ops *bops, uint32_t handle, struct intel_buf *buf, int width, int height, int bpp, int alignment, - uint32_t req_tiling, uint32_t compression); + uint32_t req_tiling, uint32_t compression, + uint64_t size); void intel_buf_init_full(struct buf_ops *bops, uint32_t handle, struct intel_buf *buf, @@ -172,12 +173,14 @@ struct intel_buf *intel_buf_create(struct buf_ops *bops, int bpp, int alignment, uint32_t req_tiling, uint32_t compression); -struct intel_buf *intel_buf_create_using_handle(struct buf_ops *bops, - uint32_t handle, - int width, int height, - int bpp, int alignment, - uint32_t req_tiling, - uint32_t compression); +void intel_buf_init_using_handle_and_size(struct buf_ops *bops, + uint32_t handle, + struct intel_buf *buf, + int width, int height, + int bpp, int alignment, + uint32_t req_tiling, + uint32_t compression, + uint64_t size); struct intel_buf *intel_buf_create_using_handle_and_size(struct buf_ops *bops, uint32_t handle, diff --git a/tests/intel/gem_set_tiling_vs_blt.c b/tests/intel/gem_set_tiling_vs_blt.c index e9d5e3c63..9077e0f3f 100644 --- a/tests/intel/gem_set_tiling_vs_blt.c +++ b/tests/intel/gem_set_tiling_vs_blt.c @@ -138,9 +138,10 @@ static void do_test(struct buf_ops *bops, uint32_t tiling, unsigned stride, gem_munmap(ptr, TEST_SIZE); /* Reuse previously aligned in the gtt object */ - intel_buf_init_using_handle(bops, test_buf->handle, test_buf, - TEST_WIDTH(stride), TEST_HEIGHT(stride), 32, - 0, tiling, I915_COMPRESSION_NONE); + intel_buf_init_using_handle_and_size(bops, test_buf->handle, test_buf, + TEST_WIDTH(stride), TEST_HEIGHT(stride), 32, + 0, tiling, I915_COMPRESSION_NONE, + test_buf->bo_size); igt_assert_eq_u32(intel_buf_size(test_buf), TEST_SIZE); intel_buf_set_ownership(test_buf, true); intel_bb_add_intel_buf(ibb, test_buf, false); -- 2.43.0