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 CA25DCAC5BB for ; Fri, 26 Sep 2025 20:09:24 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5BDA610EAE3; Fri, 26 Sep 2025 20:09:24 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="G6OzTgtd"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.13]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4611C10E139 for ; Fri, 26 Sep 2025 20:09: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=1758917361; x=1790453361; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=9TCDBk20AFAx3rt3j41HWMMHSAmbyMzcs3A4BzToigY=; b=G6OzTgtdjBcrP6mNWnnhMkcn/MB1TK7E7ohqr3bMxX1CroiV/xT77biD gCVb2gWWRF3p2VnN5k8dy9Xg/H00lSgu7eXBYCXFRax4N3MoCXu4kPUrT zi0mTQVNMHJoRR7Fu9p1msNuW0X0kWHrgIrha5mcZlhcHD9s1SPN7/yWh SNcGJ7om/GHBSzH4wcLzpahR6MkmTnxhdYx1SmbSR4N7CPeyamcplbEon tTiL/s8bz+KxhMoz1lrB8tzhZTJp/toRd7PQuwgwaTCOmbwDAxFZLkEJX Z3m8hxQLYZ0Lj1bkJwNcKCgcu3FNUfXz0MHTh9qxWXYDAwUviif8zEwkY g==; X-CSE-ConnectionGUID: lnRsH3noR+Og3Hww3dJaiQ== X-CSE-MsgGUID: /2gSu2VyR9e3dJArZakrmw== X-IronPort-AV: E=McAfee;i="6800,10657,11565"; a="72352469" X-IronPort-AV: E=Sophos;i="6.18,295,1751266800"; d="scan'208";a="72352469" Received: from fmviesa006.fm.intel.com ([10.60.135.146]) by orvoesa105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Sep 2025 13:09:21 -0700 X-CSE-ConnectionGUID: 5R4zD9MkQ9eeBWVPLlMfYg== X-CSE-MsgGUID: vMSXAdoNS6ez+5YyZckhqA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.18,295,1751266800"; d="scan'208";a="177634944" Received: from dut4086lnl.fm.intel.com ([10.105.10.69]) by fmviesa006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Sep 2025 13:09:19 -0700 From: Jonathan Cavitt To: intel-xe@lists.freedesktop.org Cc: jonathan.cavitt@intel.com, saurabhg.gupta@intel.com, alex.zuo@intel.com, michal.wajdeczko@intel.com, matthew.d.roper@intel.com Subject: [PATCH v2 5/5] drm/xe/tests: Use xe_root_mmio_gt instead of xe_device_get_gt Date: Fri, 26 Sep 2025 20:09:23 +0000 Message-ID: <20250926200917.164618-12-jonathan.cavitt@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250926200917.164618-7-jonathan.cavitt@intel.com> References: <20250926200917.164618-7-jonathan.cavitt@intel.com> MIME-Version: 1.0 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" The xe test code expects GT0 to always be available as a part of the test setup, so there's no reason to use xe_device_get_gt over xe_root_mmio_gt, especially since the former may fail in some cases. Replace all instances of xe_device_get_gt(xe, 0) with xe_root_mmio_gt(xe) in the xe test code. v2: Reword commit message (Michal) Signed-off-by: Jonathan Cavitt Cc: Michal Wajdeczko --- drivers/gpu/drm/xe/tests/xe_guc_buf_kunit.c | 2 +- drivers/gpu/drm/xe/tests/xe_guc_db_mgr_test.c | 2 +- drivers/gpu/drm/xe/tests/xe_guc_g2g_test.c | 2 +- drivers/gpu/drm/xe/tests/xe_guc_id_mgr_test.c | 2 +- drivers/gpu/drm/xe/tests/xe_guc_relay_test.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/xe/tests/xe_guc_buf_kunit.c b/drivers/gpu/drm/xe/tests/xe_guc_buf_kunit.c index d266882adc0e..33dbcb262204 100644 --- a/drivers/gpu/drm/xe/tests/xe_guc_buf_kunit.c +++ b/drivers/gpu/drm/xe/tests/xe_guc_buf_kunit.c @@ -63,7 +63,7 @@ static int guc_buf_test_init(struct kunit *test) xe_kunit_helper_xe_device_test_init(test); ggtt = xe_device_get_root_tile(test->priv)->mem.ggtt; - guc = &xe_device_get_gt(test->priv, 0)->uc.guc; + guc = &xe_root_mmio_gt(test->priv)->uc.guc; KUNIT_ASSERT_EQ(test, 0, xe_ggtt_init_kunit(ggtt, DUT_GGTT_START, diff --git a/drivers/gpu/drm/xe/tests/xe_guc_db_mgr_test.c b/drivers/gpu/drm/xe/tests/xe_guc_db_mgr_test.c index a87a7b4b040a..59a7c2d57fe2 100644 --- a/drivers/gpu/drm/xe/tests/xe_guc_db_mgr_test.c +++ b/drivers/gpu/drm/xe/tests/xe_guc_db_mgr_test.c @@ -13,7 +13,7 @@ static int guc_dbm_test_init(struct kunit *test) struct xe_guc_db_mgr *dbm; xe_kunit_helper_xe_device_test_init(test); - dbm = &xe_device_get_gt(test->priv, 0)->uc.guc.dbm; + dbm = &xe_root_mmio_gt(test->priv)->uc.guc.dbm; mutex_init(dbm_mutex(dbm)); test->priv = dbm; diff --git a/drivers/gpu/drm/xe/tests/xe_guc_g2g_test.c b/drivers/gpu/drm/xe/tests/xe_guc_g2g_test.c index 3b213fcae916..d211dfa09538 100644 --- a/drivers/gpu/drm/xe/tests/xe_guc_g2g_test.c +++ b/drivers/gpu/drm/xe/tests/xe_guc_g2g_test.c @@ -355,7 +355,7 @@ static void g2g_distribute(struct kunit *test, struct xe_device *xe, struct xe_b struct xe_gt *root_gt, *gt; int i; - root_gt = xe_device_get_gt(xe, 0); + root_gt = xe_root_mmio_gt(xe); root_gt->uc.guc.g2g.bo = bo; root_gt->uc.guc.g2g.owned = true; kunit_info(test, "[%d.%d] Assigned 0x%p\n", gt_to_tile(root_gt)->id, root_gt->info.id, bo); diff --git a/drivers/gpu/drm/xe/tests/xe_guc_id_mgr_test.c b/drivers/gpu/drm/xe/tests/xe_guc_id_mgr_test.c index ee30a1939eb0..3c84bcacd0ac 100644 --- a/drivers/gpu/drm/xe/tests/xe_guc_id_mgr_test.c +++ b/drivers/gpu/drm/xe/tests/xe_guc_id_mgr_test.c @@ -13,7 +13,7 @@ static int guc_id_mgr_test_init(struct kunit *test) struct xe_guc_id_mgr *idm; xe_kunit_helper_xe_device_test_init(test); - idm = &xe_device_get_gt(test->priv, 0)->uc.guc.submission_state.idm; + idm = &xe_root_mmio_gt(test->priv)->uc.guc.submission_state.idm; mutex_init(idm_mutex(idm)); test->priv = idm; diff --git a/drivers/gpu/drm/xe/tests/xe_guc_relay_test.c b/drivers/gpu/drm/xe/tests/xe_guc_relay_test.c index 13701451b923..645c8b6de3db 100644 --- a/drivers/gpu/drm/xe/tests/xe_guc_relay_test.c +++ b/drivers/gpu/drm/xe/tests/xe_guc_relay_test.c @@ -38,7 +38,7 @@ static int relay_test_init(struct kunit *test) xe = test->priv; KUNIT_ASSERT_EQ(test, xe_sriov_init(xe), 0); - relay = &xe_device_get_gt(xe, 0)->uc.guc.relay; + relay = &xe_root_mmio_gt(xe)->uc.guc.relay; kunit_activate_static_stub(test, relay_get_totalvfs, replacement_relay_get_totalvfs); -- 2.43.0