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 3DC99C77B7E for ; Thu, 1 Jun 2023 20:30:32 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id F408F10E5C1; Thu, 1 Jun 2023 20:30:31 +0000 (UTC) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id D84CE10E5C1 for ; Thu, 1 Jun 2023 20:30:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1685651430; x=1717187430; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=VVo3N3fsEOXufQSaktAV6ebhOaWuQX33VTZNUI9mUik=; b=ZBWhEyVbn1V8vnO1SWkkfo6Tteoe7qjWHjUKStY5mlliomVZi8aXVtWS cusfoZDRKmDmJ2Ar4wy4RZqGaNduW2+3M1qXy9zBu9prNIt/Kt/tz2UhU vp0nW3CvNSbe8IlONNrqGQDB4j0eXhG3/Q/AKJUN6OnlHisW1G/Huc5S1 261WIaRgedN5Uo7/mQykAdoo7ywpvEbeFxAtDNqk3geNLaeMkMd6YjTgk BwA30czFI7Pc+F6aUYIbQdY4aVv+iYRXtHPSxCi36T0mSFqEq2x+owyg+ lAOlylGD23iK5kbGTQSktCZhuOoUUPsFyHmBEeB0z/hepYRSIsSNCWNaq g==; X-IronPort-AV: E=McAfee;i="6600,9927,10728"; a="358102497" X-IronPort-AV: E=Sophos;i="6.00,210,1681196400"; d="scan'208";a="358102497" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Jun 2023 13:30:30 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10728"; a="740493209" X-IronPort-AV: E=Sophos;i="6.00,210,1681196400"; d="scan'208";a="740493209" Received: from mdroper-desk1.fm.intel.com ([10.1.27.147]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Jun 2023 13:30:29 -0700 From: Matt Roper To: intel-xe@lists.freedesktop.org Date: Thu, 1 Jun 2023 13:29:55 -0700 Message-Id: <20230601203025.615494-2-matthew.d.roper@intel.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230601203025.615494-1-matthew.d.roper@intel.com> References: <20230601203025.615494-1-matthew.d.roper@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Intel-xe] [CI 01/31] drm/xe/mtl: Disable media GT 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: matthew.d.roper@intel.com Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" Xe incorrectly conflates the concept of 'tile' and 'GT.' Since MTL's media support is not yet functioning properly, let's just disable it completely for now while we fix the fundamental driver design. Support for media GTs on platforms like MTL will be re-added later. v2: - Drop some unrelated code cleanup that didn't belong in this patch. (Lucas) v3: - Drop unnecessary xe_gt.h include. (Gustavo) Cc: Lucas De Marchi Cc: Gustavo Sousa Reviewed-by: Matt Atwood Reviewed-by: Lucas De Marchi Acked-by: Gustavo Sousa Signed-off-by: Matt Roper --- drivers/gpu/drm/xe/xe_mmio.c | 2 -- drivers/gpu/drm/xe/xe_pci.c | 12 ------------ 2 files changed, 14 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_mmio.c b/drivers/gpu/drm/xe/xe_mmio.c index d3b57669c9a7..ef2353eef6fe 100644 --- a/drivers/gpu/drm/xe/xe_mmio.c +++ b/drivers/gpu/drm/xe/xe_mmio.c @@ -340,8 +340,6 @@ static void xe_mmio_probe_tiles(struct xe_device *xe) mtcfg = xe_mmio_read64(gt, XEHP_MTCFG_ADDR); adj_tile_count = xe->info.tile_count = REG_FIELD_GET(TILE_COUNT, mtcfg) + 1; - if (xe->info.media_verx100 >= 1300) - xe->info.tile_count *= 2; drm_info(&xe->drm, "tile_count: %d, adj_tile_count %d\n", xe->info.tile_count, adj_tile_count); diff --git a/drivers/gpu/drm/xe/xe_pci.c b/drivers/gpu/drm/xe/xe_pci.c index d8f1213ae1d6..6f0c4203fca3 100644 --- a/drivers/gpu/drm/xe/xe_pci.c +++ b/drivers/gpu/drm/xe/xe_pci.c @@ -290,21 +290,11 @@ static const struct xe_device_desc pvc_desc = { .extra_gts = pvc_gts, }; -static const struct xe_gt_desc xelpmp_gts[] = { - { - .type = XE_GT_TYPE_MEDIA, - .vram_id = 0, - .mmio_adj_limit = 0x40000, - .mmio_adj_offset = 0x380000, - }, -}; - static const struct xe_device_desc mtl_desc = { /* .graphics and .media determined via GMD_ID */ .require_force_probe = true, PLATFORM(XE_METEORLAKE), .has_display = true, - .extra_gts = xelpmp_gts, }; #undef PLATFORM @@ -566,8 +556,6 @@ static int xe_info_init(struct xe_device *xe, * treats it as the number of GTs rather than just the number of tiles. */ xe->info.tile_count = 1 + graphics_desc->max_remote_tiles; - if (MEDIA_VER(xe) >= 13) - xe->info.tile_count++; for (id = 0; id < xe->info.tile_count; ++id) { gt = xe->gt + id; -- 2.40.1