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 DA38BEB64DC for ; Fri, 14 Jul 2023 14:48:40 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B1C2810E8B4; Fri, 14 Jul 2023 14:48:40 +0000 (UTC) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id BFE2410E8B1 for ; Fri, 14 Jul 2023 14:48:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1689346117; x=1720882117; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=6LpzOXKbSBjoBNER1ZlAoRJ2UYya1TriCe1TCQDTpb8=; b=PrIafkzo7Z0GBuFjX1ll+FLgTPf32z/XaJESlKjekDAAqQb3tBF42WXu dQjVn01Pl6cfd3OHSFIPkxZg6oa47prBMOrXJJ+f3SnD+k5403dlD122a bzYPyRSRw9e9oFWhYW6lXZ/G30FXcmJTeeodfAM+IAPGB5SfOmISAz28f +ABcbe5p0MvhLj3Z7PAS/fE3yS40KEg0vRPucZrNkuLPLYXawKCrIbW0P EvXBEzKw39K0MKjvwtxwwgVW//m4sCTUgJyRubFqPhfGBPZEgqIBZ3vlL vgsh39M2gAI1tJnjKuYpmPyIIjwn+HvNDPk5AlDLMRQG3607siymDRQLG g==; X-IronPort-AV: E=McAfee;i="6600,9927,10771"; a="345086782" X-IronPort-AV: E=Sophos;i="6.01,205,1684825200"; d="scan'208";a="345086782" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jul 2023 07:48:37 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10771"; a="752064298" X-IronPort-AV: E=Sophos;i="6.01,205,1684825200"; d="scan'208";a="752064298" Received: from joejardi-mobl3.ger.corp.intel.com (HELO mwauld-desk1.intel.com) ([10.252.28.242]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jul 2023 07:48:35 -0700 From: Matthew Auld To: intel-xe@lists.freedesktop.org Date: Fri, 14 Jul 2023 15:48:18 +0100 Message-ID: <20230714144814.574873-8-matthew.auld@intel.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230714144814.574873-5-matthew.auld@intel.com> References: <20230714144814.574873-5-matthew.auld@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Intel-xe] [PATCH v7 3/3] drm/xe: fully turn on small-bar support 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: , Cc: Lucas De Marchi Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" This allows vram_size > io_size, instead of just clamping the vram size to the BAR size, now that the driver supports it. Signed-off-by: Matthew Auld Cc: Gwan-gyeong Mun Cc: Lucas De Marchi Cc: Michael J. Ruhl Reviewed-by: Maarten Lankhorst Reviewed-by: Gwan-gyeong Mun --- drivers/gpu/drm/xe/xe_mmio.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_mmio.c b/drivers/gpu/drm/xe/xe_mmio.c index 779f0a18a815..fe19534c4ed2 100644 --- a/drivers/gpu/drm/xe/xe_mmio.c +++ b/drivers/gpu/drm/xe/xe_mmio.c @@ -261,11 +261,6 @@ int xe_mmio_probe_vram(struct xe_device *xe) if (err) return err; - /* small bar issues will only cover root tile sizes */ - if (xe->mem.vram.io_size < vram_size) - drm_warn(&xe->drm, "Restricting VRAM size to PCI resource size (0x%llx->0x%llx)\n", - vram_size, (u64)xe->mem.vram.io_size); - drm_info(&xe->drm, "VISIBLE VRAM: %pa, %pa\n", &xe->mem.vram.io_start, &xe->mem.vram.io_size); @@ -287,9 +282,7 @@ int xe_mmio_probe_vram(struct xe_device *xe) } tile->mem.vram.base = tile_offset; - - /* small bar can limit the visible size. size accordingly */ - tile->mem.vram.usable_size = min_t(u64, vram_size, io_size); + tile->mem.vram.usable_size = vram_size; tile->mem.vram.mapping = xe->mem.vram.mapping + tile_offset; drm_info(&xe->drm, "VRAM[%u, %u]: %pa, %pa\n", id, tile->id, @@ -304,7 +297,7 @@ int xe_mmio_probe_vram(struct xe_device *xe) available_size += vram_size; if (total_size > xe->mem.vram.io_size) { - drm_warn(&xe->drm, "VRAM: %pa is larger than resource %pa\n", + drm_info(&xe->drm, "VRAM: %pa is larger than resource %pa\n", &total_size, &xe->mem.vram.io_size); } -- 2.41.0