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 6E41CCD37BE for ; Mon, 11 May 2026 21:42:13 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3047010E8FA; Mon, 11 May 2026 21:42:13 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="UA0o8onj"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.10]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3F76110E8F8; Mon, 11 May 2026 21:42: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=1778535732; x=1810071732; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=sucQ2jBPAExWC81O+bpDiV0ZrA9nZ9nAXT+/AUg7rDA=; b=UA0o8onjjvGCro7Smr8PPaAmPBCwVlodEVE2J7l+sTrl8S69Wr86a3g0 R+hwthv9I2OMte7rlFzOxPUUbZ0X91y/a4uYa7SeQTqWu05T2Eb+omNa6 tWw4/anyI6Yxqhn3SAzqrowlDpVAHa4gnYW/nn51SFX5hiJy+Zdw0z3u2 S8QCnPUmyeNgbHLdAPBK87csR+vwur/Yi1LNOCFi4NHWDE/772lo4iMBY rv8SFub5FCwO5h8FpzBnZ9Pd8ryUIWj1zgsCA58Ncz+KUybrqdZ/ftbts PY1b++PWwG/rqTy7WcD2gDBARwYjcorg4gdKPRxI84KrOOJVve9s4ufDy A==; X-CSE-ConnectionGUID: 7kXV5HGTRe+rqChdKlIkIQ== X-CSE-MsgGUID: wE5T09Q6QUOtBg+EHA/EOA== X-IronPort-AV: E=McAfee;i="6800,10657,11783"; a="90816890" X-IronPort-AV: E=Sophos;i="6.23,229,1770624000"; d="scan'208";a="90816890" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by fmvoesa104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 May 2026 14:42:12 -0700 X-CSE-ConnectionGUID: CDMBpD39QO6kajCZrIIUgw== X-CSE-MsgGUID: LkiaRaELRLG51jN0Df09vg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.23,229,1770624000"; d="scan'208";a="275702933" Received: from hrotuna-mobl2.ger.corp.intel.com (HELO localhost) ([10.245.245.104]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 May 2026 14:42:10 -0700 From: Ville Syrjala To: intel-gfx@lists.freedesktop.org Cc: intel-xe@lists.freedesktop.org Subject: [PATCH 11/14] drm/xe: s/bar2/lmembar/ Date: Tue, 12 May 2026 00:41:19 +0300 Message-ID: <20260511214122.8468-12-ville.syrjala@linux.intel.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260511214122.8468-1-ville.syrjala@linux.intel.com> References: <20260511214122.8468-1-ville.syrjala@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Organization: Intel Finland Oy - BIC 0357606-4 - c/o Alberga Business Park, 6 krs Bertel Jungin Aukio 5, 02600 Espoo, Finland 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" From: Ville Syrjälä The local memory BAR has a name (LMEMBAR). Use that instead of referring to it by its BAR register index. Signed-off-by: Ville Syrjälä --- drivers/gpu/drm/xe/xe_ttm_stolen_mgr.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_ttm_stolen_mgr.c b/drivers/gpu/drm/xe/xe_ttm_stolen_mgr.c index 5e9070739e65..60f39efb02d0 100644 --- a/drivers/gpu/drm/xe/xe_ttm_stolen_mgr.c +++ b/drivers/gpu/drm/xe/xe_ttm_stolen_mgr.c @@ -61,7 +61,7 @@ static u32 get_wopcm_size(struct xe_device *xe) return wopcm_size; } -static u64 detect_bar2_dgfx(struct xe_device *xe, struct xe_ttm_stolen_mgr *mgr) +static u64 detect_lmembar_dgfx(struct xe_device *xe, struct xe_ttm_stolen_mgr *mgr) { struct xe_vram_region *tile_vram = xe_device_get_root_tile(xe)->mem.vram; resource_size_t tile_io_start = xe_vram_region_io_start(tile_vram); @@ -102,7 +102,7 @@ static u64 detect_bar2_dgfx(struct xe_device *xe, struct xe_ttm_stolen_mgr *mgr) return ALIGN_DOWN(stolen_size, SZ_1M); } -static u32 detect_bar2_integrated(struct xe_device *xe, struct xe_ttm_stolen_mgr *mgr) +static u32 detect_lmembar_integrated(struct xe_device *xe, struct xe_ttm_stolen_mgr *mgr) { struct pci_dev *pdev = to_pci_dev(xe->drm.dev); struct xe_gt *media_gt = xe_device_get_root_tile(xe)->media_gt; @@ -212,9 +212,9 @@ int xe_ttm_stolen_mgr_init(struct xe_device *xe) if (IS_SRIOV_VF(xe)) stolen_size = 0; else if (IS_DGFX(xe)) - stolen_size = detect_bar2_dgfx(xe, mgr); + stolen_size = detect_lmembar_dgfx(xe, mgr); else if (GRAPHICS_VERx100(xe) >= 1270) - stolen_size = detect_bar2_integrated(xe, mgr); + stolen_size = detect_lmembar_integrated(xe, mgr); else stolen_size = detect_stolen(xe, mgr); @@ -262,9 +262,9 @@ u64 xe_ttm_stolen_io_offset(struct xe_bo *bo, u32 offset) return mgr->io_base + (bo->ttm.resource->start << PAGE_SHIFT) + offset; } -static int __xe_ttm_stolen_io_mem_reserve_bar2(struct xe_device *xe, - struct xe_ttm_stolen_mgr *mgr, - struct ttm_resource *mem) +static int __xe_ttm_stolen_io_mem_reserve_lmembar(struct xe_device *xe, + struct xe_ttm_stolen_mgr *mgr, + struct ttm_resource *mem) { if (!mgr->io_base) return -EIO; @@ -321,7 +321,7 @@ int xe_ttm_stolen_io_mem_reserve(struct xe_device *xe, struct ttm_resource *mem) if (xe_ttm_stolen_cpu_access_needs_ggtt(xe)) return __xe_ttm_stolen_io_mem_reserve_stolen(xe, mgr, mem); else - return __xe_ttm_stolen_io_mem_reserve_bar2(xe, mgr, mem); + return __xe_ttm_stolen_io_mem_reserve_lmembar(xe, mgr, mem); } u64 xe_ttm_stolen_gpu_offset(struct xe_device *xe) -- 2.52.0