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 33D73C3ABBF for ; Mon, 5 May 2025 22:58:52 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E361C10E5A0; Mon, 5 May 2025 22:58:51 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="YJBe2VNW"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.16]) by gabe.freedesktop.org (Postfix) with ESMTPS id D756D10E59F for ; Mon, 5 May 2025 22:58:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1746485931; x=1778021931; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=yHclQpmhFwvSSeGlMvpfUlRtKRROjQbK78l3tjn7xvA=; b=YJBe2VNWchDc8I87VZvpbYHoOkhYsRK8giKipUecaaVEkxpcGOUSz6CA 18s1FJat/IEAx5humXjtis6n/rMm73nYtziP5hrli891CsfBkWOL2sSCw AJ8CsNQwDFdB+K5mfMVTnEwR1WNUglXzFauTLHQ/4N8KW5m1lbUjzbzz0 IgpuAGxxDyAH61fyMf8MSF6fHgtAb9l9AFhKBoMKI2cKXONEK+YLgeuu4 f2hDw6Dh6el9eWMj2IaHybRIJS9iEMVv0Xja7dYRUp/l/FRZj2KfM2vgv li4S8brXVqGbJhdJIeFq52VrEDPniANwJL3IRmK7GhwKyUxtxGXCs8VHx g==; X-CSE-ConnectionGUID: 2GLBGyqVT9KAd2GInIbydA== X-CSE-MsgGUID: tD/GeIprR1yxFoOwehEAuw== X-IronPort-AV: E=McAfee;i="6700,10204,11424"; a="35740154" X-IronPort-AV: E=Sophos;i="6.15,264,1739865600"; d="scan'208";a="35740154" Received: from fmviesa001.fm.intel.com ([10.60.135.141]) by fmvoesa110.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 May 2025 15:58:51 -0700 X-CSE-ConnectionGUID: EOreY3TaRj+zp3lpwYI5DA== X-CSE-MsgGUID: +4tbeCybSW6FG5Nj3pW1mw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.15,264,1739865600"; d="scan'208";a="166467821" Received: from unerlige-desk1.jf.intel.com ([10.165.21.138]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 May 2025 15:58:50 -0700 From: Umesh Nerlige Ramappa To: intel-xe@lists.freedesktop.org, Lucas De Marchi , matthew.brost@intel.com Subject: [PATCH v3 2/4] drm/xe: Save the gt pointer in lrc and drop the tile Date: Mon, 5 May 2025 15:58:54 -0700 Message-ID: <20250505225852.1994431-8-umesh.nerlige.ramappa@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250505225852.1994431-6-umesh.nerlige.ramappa@intel.com> References: <20250505225852.1994431-6-umesh.nerlige.ramappa@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" Save the gt pointer in the lrc so that it can used for gt based helpers. Signed-off-by: Umesh Nerlige Ramappa Reviewed-by: Matthew Brost --- drivers/gpu/drm/xe/xe_lrc.c | 4 ++-- drivers/gpu/drm/xe/xe_lrc_types.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_lrc.c b/drivers/gpu/drm/xe/xe_lrc.c index 015b00a73c0b..9d9be9383207 100644 --- a/drivers/gpu/drm/xe/xe_lrc.c +++ b/drivers/gpu/drm/xe/xe_lrc.c @@ -867,7 +867,7 @@ static void *empty_lrc_data(struct xe_hw_engine *hwe) static void xe_lrc_set_ppgtt(struct xe_lrc *lrc, struct xe_vm *vm) { - u64 desc = xe_vm_pdp4_descriptor(vm, lrc->tile); + u64 desc = xe_vm_pdp4_descriptor(vm, gt_to_tile(lrc->gt)); xe_lrc_write_ctx_reg(lrc, CTX_PDP0_UDW, upper_32_bits(desc)); xe_lrc_write_ctx_reg(lrc, CTX_PDP0_LDW, lower_32_bits(desc)); @@ -900,6 +900,7 @@ static int xe_lrc_init(struct xe_lrc *lrc, struct xe_hw_engine *hwe, int err; kref_init(&lrc->refcount); + lrc->gt = gt; lrc->flags = 0; lrc_size = ring_size + xe_gt_lrc_size(gt, hwe->class); if (xe_gt_has_indirect_ring_state(gt)) @@ -921,7 +922,6 @@ static int xe_lrc_init(struct xe_lrc *lrc, struct xe_hw_engine *hwe, return PTR_ERR(lrc->bo); lrc->size = lrc_size; - lrc->tile = gt_to_tile(hwe->gt); lrc->ring.size = ring_size; lrc->ring.tail = 0; lrc->ctx_timestamp = 0; diff --git a/drivers/gpu/drm/xe/xe_lrc_types.h b/drivers/gpu/drm/xe/xe_lrc_types.h index 71ecb453f811..cd38586ae989 100644 --- a/drivers/gpu/drm/xe/xe_lrc_types.h +++ b/drivers/gpu/drm/xe/xe_lrc_types.h @@ -25,8 +25,8 @@ struct xe_lrc { /** @size: size of lrc including any indirect ring state page */ u32 size; - /** @tile: tile which this LRC belongs to */ - struct xe_tile *tile; + /** @gt: gt which this LRC belongs to */ + struct xe_gt *gt; /** @flags: LRC flags */ #define XE_LRC_FLAG_INDIRECT_RING_STATE 0x1 -- 2.43.0