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 B4897C433EF for ; Tue, 1 Mar 2022 15:15:55 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1612B10E606; Tue, 1 Mar 2022 15:15:55 +0000 (UTC) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by gabe.freedesktop.org (Postfix) with ESMTPS id E5E6210E582; Tue, 1 Mar 2022 15:15:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1646147753; x=1677683753; h=message-id:date:subject:to:cc:references:from: in-reply-to:content-transfer-encoding:mime-version; bh=3H5OTyJj2GLfbRsB4svxRxAzw+VTbmhhiG1/cIlIvuU=; b=gXyvlpL95S0xVQ5EDq62/g80FOJVq00ISfhTg7q0ZT8PUESiGnhtKJWY hdIZ7zxyjfTKBYCgwpQC3nxoU48MWurHM39E+jZfxOuPcBSCR6RK99M55 2WsGH3ZXumHwR4jsJzYA7vMUvALzW8eGIGyVlwC+EO+lEncRdiIu08DUe amBgxeDayX/DifhygcGfutPo0/H4Rl2fPgNnqsw1EZdQLpe8hPmRKoEO+ DvGsRZaowuc0c81V+5xXB7ImTXVg0sYBY1d8AAFSTS6QMl5u5//HRxAd1 lBq5blS8HzB02WEu3F4AEk9iEo11HzjGMabsl99zUTMl5npmiM1/B1iAJ Q==; X-IronPort-AV: E=McAfee;i="6200,9189,10272"; a="236658960" X-IronPort-AV: E=Sophos;i="5.90,146,1643702400"; d="scan'208";a="236658960" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Mar 2022 07:15:53 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.90,146,1643702400"; d="scan'208";a="778480854" Received: from orsmsx603.amr.corp.intel.com ([10.22.229.16]) by fmsmga006.fm.intel.com with ESMTP; 01 Mar 2022 07:15:52 -0800 Received: from orsmsx611.amr.corp.intel.com (10.22.229.24) by ORSMSX603.amr.corp.intel.com (10.22.229.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.21; Tue, 1 Mar 2022 07:15:52 -0800 Received: from orsmsx604.amr.corp.intel.com (10.22.229.17) by ORSMSX611.amr.corp.intel.com (10.22.229.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.21; Tue, 1 Mar 2022 07:15:51 -0800 Received: from orsedg603.ED.cps.intel.com (10.7.248.4) by orsmsx604.amr.corp.intel.com (10.22.229.17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.21 via Frontend Transport; Tue, 1 Mar 2022 07:15:51 -0800 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (104.47.66.45) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2308.20; Tue, 1 Mar 2022 07:15:51 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kH2K+IW6QQGLpy0WHd5dMplEm1fYUJqsASsOPzblFvD59rv+BK7Rk8XRIOkW15pdffEJipeEWx4agi1SAY2uiHAh8YWYdBsIiiu6T5g4FovFbp08obZZ5OUMgZyCv0tJJLFNCDwHEawvaS2nP3dOld1wN5C4HLoi59psOFN4raIdB5A/zgIcb6PiqHYcAUB6eVFzeuTZX7WnYfllQ0p9gOwWTDAtMPLaQeoLYo718PQzGmlSMPakm+r1PEcl4Or+fYDwCI3tRGT3+qio1aG5agM/J2+vQlaQF9POoKTRBkDSMLHlNSXEV+ou2n82vVpe7ilVbcYUDeXokjBQKMz47w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=8wh5iEvJhBrg8OfoHfdaDBTghT7rgtyOoHTwx1NM52o=; b=gwygGt7vOMVevppejT4UL28mIw4nWCb9/KcM7XzyTiGWkkcsHDhKxnGW+0dDbtbJu0bKpPZkx2YOdwWBXuylbkjvFPG6qj8eyuVyScLwEGDJUsMyo4SJBxHuTPcEQTs5wLbE0TRR77EZavYfBy7cqbR025WvNyYgefFy3M1H5P8zKlf7gGR8CP0KdF6BtdP12T75J0r/wKOX9NrkWf+OWN2qY9ZS+K5DE0a3EjLcShiqKJzf0zGvUxb+cONB671iTO96AmnOPpAxS9wJaUiEPBwDQmhH+/VGtXlFtokGd8mcepIs2tU/oaIe3uM/fGHIFFzYFHHfU5UUt+qAowpEyw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; Received: from DM6PR11MB3180.namprd11.prod.outlook.com (2603:10b6:5:9::13) by BYAPR11MB2983.namprd11.prod.outlook.com (2603:10b6:a03:88::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.13; Tue, 1 Mar 2022 15:15:48 +0000 Received: from DM6PR11MB3180.namprd11.prod.outlook.com ([fe80::11f6:76fa:fc62:6511]) by DM6PR11MB3180.namprd11.prod.outlook.com ([fe80::11f6:76fa:fc62:6511%6]) with mapi id 15.20.5038.014; Tue, 1 Mar 2022 15:15:48 +0000 Message-ID: <730e317a-8672-c13b-fa8d-713e9e7bd0d7@intel.com> Date: Tue, 1 Mar 2022 16:15:42 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Firefox/91.0 Thunderbird/91.6.1 Content-Language: en-US To: Andi Shyti , Intel GFX , DRI Devel References: <20220217144158.21555-1-andi.shyti@linux.intel.com> <20220217144158.21555-3-andi.shyti@linux.intel.com> From: Andrzej Hajda Organization: Intel Technology Poland sp. z o.o. - ul. Slowackiego 173, 80-298 Gdansk - KRS 101882 - NIP 957-07-52-316 In-Reply-To: <20220217144158.21555-3-andi.shyti@linux.intel.com> Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 8bit X-ClientProxiedBy: AS8P189CA0021.EURP189.PROD.OUTLOOK.COM (2603:10a6:20b:31f::25) To DM6PR11MB3180.namprd11.prod.outlook.com (2603:10b6:5:9::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9f1d4299-89ef-474d-03a6-08d9fb965d78 X-MS-TrafficTypeDiagnostic: BYAPR11MB2983:EE_ X-LD-Processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5EZQZOc8d6h2fDLI3tZRc3KZ+O7AX9dfm69UQCC35m//maHKxACPPWWEbK9O5UxFVTDI57K9rfYzIdfY1GHFj9GnE8QYy1dfjEKkRn3cqR6zs7VMkteCLQBXNQbkITe99fKZBTcA2AfWn5nyzsYv2Zw+bFmSGkLb3jko9obSD3r8ULqjtj58lxB64QtIfzGrJzqeOFad11/SEddU2XkThl3nEOT0D8F48PA8oA9tOaN5BMNzwenzi5p3pl0RPEj8Odr/RnDyvD1XxIiUJfdSlz/jIYbS5R5HcjZyIfU1rq7yEkmblQKDsiQQ1diPViJVtP9ypyTib3kRp83rGYnXQ96aLuP/3JLnf0JhNWTbSikOCFiTdkbIFNPAq2G41qkNXcUERUyaLswcW2xCGV62ucRxzDp6nMU0oAfxuPiFuZ4MJEmfVMxyAaKBuMNIW+gsfSczN9ng4oEI+h/PFH4WzhjNhjMdY/Sdl7SXu8lGvCp7mT4I37Ts27iufZNObk67cXfIjvHqLn8ea5dpKWAoyq3Q1VeKdCsxcluOm3hV939M5cdtXQoXl/JUuVm6DxQ+FcVoMQmuR5zXG9zkxwMAd16Xh3S6ypsMTMD9JeuXQOS+NwGawMZYEGyfZ0zOZLUEou8uQ/aP0nLEVPrHeDGSgoceSYGHCue4TV7ibW5eVpxtRVKm80dw1/89MmTbJPw3QUxzMSZVKnV3KEgA3Et4DUde3Bn2HESG6HmbnDyc9sE= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM6PR11MB3180.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(366004)(54906003)(110136005)(316002)(8936002)(31686004)(6486002)(66476007)(66556008)(4326008)(8676002)(2906002)(26005)(508600001)(31696002)(86362001)(36756003)(30864003)(6666004)(44832011)(66946007)(36916002)(5660300002)(6512007)(53546011)(82960400001)(6506007)(38100700002)(2616005)(83380400001)(186003)(43740500002)(45980500001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?aVY2aEFTUUdDSE9jd25vSVZUbnFqN0NRS0pIR3IwZ3FkM29XNG9QODdJbFNw?= =?utf-8?B?S0FBbEpvUFZrY0hPSXJDVkZMc2MwUE5tSnYyOUtNWEttNGU4dEhuNUpKMkxn?= =?utf-8?B?UEFqL0o4dlVCaytWVVZuZ3lQa1Y2bmozWUFEQ2hMb3lVTUhhWjlqMDJ3UTFJ?= =?utf-8?B?WjFxYnRiVE5Zb01MMkVQSkFRQmw2SjhlMXBybjhSdSt3NEZYMmFDbTlzeXA3?= =?utf-8?B?ZUY3ZWRSNFVBOWg1UWxyNjZpQmhXQjM3aUFMS3FUcjRoMnd3NVdpa0hVSFIy?= =?utf-8?B?TzZOTnNTd1NMN21LYUExd041T04zTXNLZ0NoMmFYSjdZbWNDcnhvZVZZb2NR?= =?utf-8?B?YmcxRGdZdHZEd0dId2hkbmZuWFZMTlVuTU00T3p2MVlJaktlYUR1VDJ0TnZW?= =?utf-8?B?c1ZiSWJHdWxoMXVDZzNRZHNEZVcrend4RVZUM1lra281NE9LWm5aV21MMUZj?= =?utf-8?B?N013ZEZBakk4RG9NcEFkR3VUVEwxdWtoV290YTk2ZHJkTUx5Z3NJM2UyZmJJ?= =?utf-8?B?Ky80SVNBQm54QVBENW9zZVFOMjdzUHphU3pPZ3dMWFNIQTNuNDA0aHdQY2ho?= =?utf-8?B?cVhMbEsvNktYS2hzekpmV3ZVTXVIVGs0Q0NxNC9jTDF0M25TYVpTWlIySmxl?= =?utf-8?B?b05EVlplZ2g2S1IzRTd1TzlqSkNXNUZPMytNN2d2UHRJKzdEYTJSb0JJVmxu?= =?utf-8?B?eC93WmxWNmt3aHQySG1aYzZ6bEFOeUU4eUxiblE4Q1p4dEFNVGF2aWdub3RJ?= =?utf-8?B?SU9lZXhpc3Y0cjRSQTJaeitDNlFOdDRkTXZVRlZaZkRqRndUL2Q1bUc3Z3Jm?= =?utf-8?B?TkpLSXpLRE1mcW9lTkhiNlhUK0RWSTFFOURxenM2S3V4Y3l4MlhDMmJlaERR?= =?utf-8?B?N1F6SzVXeVNBdnZwdnJzSEc1dHF4Snc1cno5ZlE2S1ZEWHBESnVWUlJ4eTRC?= =?utf-8?B?VWZhZmtyaTBDTzZ3d2JZR3B0VFZLS0hLaGJyWE1vK3NKY3lGQVlGYlJsdDBV?= =?utf-8?B?MWtUUGc2cE1nNnVYa0pHM2paRXJYWExBUTBZVk1sQisranczOER2MCtRL1pk?= =?utf-8?B?WnlLdFJxcU1ZaVZkOUUyVlVQdmVYTkM5NnlRQTNKTHVBQjBGSXJpeDN5elBU?= =?utf-8?B?SVZjK3E4UUdKaU0wZm9JcExxbmM2bTFwVnRUcjk1elFycHRZT2VCQWFueTJD?= =?utf-8?B?aCs0QW9RRk5vbmgzRjJIYnZyY2kwY0hKSXFFUVRWMW5kaTBxZE1DelB4R0Iy?= =?utf-8?B?UTdWUTJDcDFLUXM3Y3RXR0FGdlYxclpQU29OSWQ2L2lGV0diUEFtbjZ2cDBv?= =?utf-8?B?S3liNUNtTHBCQnVkcU91NStkbGt3QU1GU0IrbEZBdTFyVXBOZzliMUNTekZi?= =?utf-8?B?S0NJTUxtMW5KS0VLS0hWSVR3S09MRkdrczJSSDd1dmRYWHlRUGtValJVbGo2?= =?utf-8?B?V2FDMXdEN09vd0ZjcU5MWUZLR2w1OUswWmtPL1ZucXF2TVo3YkxqV3ZyODRH?= =?utf-8?B?THZlV01PSFJRT0dLeUR2Y3R1c2NQUE9ZenNFeXVsTitIREJYZkVVTHRSbmxW?= =?utf-8?B?ZlRnM0lRVkxva2hOVm5YbFFZT1U4Y3JYRGVCRzZlWWE2cU5qbEtpR0lOTFdo?= =?utf-8?B?bUJvSEtZZjFVUmdQdVVZTVRCbmMzZ1VQamVDQlkrMkNHaXViTEVuOWdqYzBN?= =?utf-8?B?OTFFTTBEU2ZDZVZwQWVGbmhjY3R6em95N1Z3RmlzS0hhWktVZEN1WmJ4a0d6?= =?utf-8?B?ZHQyUkk5M3J6S1o5NlNTaXMvbEtXY1N0MVU1VUlOQkVFeXl0T2RWVUVIZFgz?= =?utf-8?B?bDcvZGM2QmpJb1FmSVRNci9ER3lqMm1NT0NjenNkK0F3Q25Cc2szaVE5Z1Jh?= =?utf-8?B?RWtoSU13ekZ1VWdFUnlLbGp6WTJ1aXN5T2dGZ0FFVU5rdm1QWmI4YytaYWNw?= =?utf-8?B?MXViVkJ1MTdnVVNhaHovem9MUW14eVRGZXRIWEF1c1NUcThHd3AzT0lyMU1E?= =?utf-8?B?N2VXbGI4WUU5c2MwaU9OU2d6RENuY2RHZDRTMThGNXlwdEZoWmVnSzJFYnZm?= =?utf-8?B?UEdNYy8zQWw1MUFjMTFFZ0tKdnQxWlNyUG41N0NLK3lEZjJMYjJLSU5Qa1R4?= =?utf-8?B?QmdXUkNKSFNacFNHRnVYQnZNcHl3dE10RlA5S0MrbEMrckxzNDN6bVBGcEw3?= =?utf-8?Q?/CLCKYmLrPe/c6TdyHGA2sQ=3D?= X-MS-Exchange-CrossTenant-Network-Message-Id: 9f1d4299-89ef-474d-03a6-08d9fb965d78 X-MS-Exchange-CrossTenant-AuthSource: DM6PR11MB3180.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Mar 2022 15:15:48.2854 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: mVEtiRp3KqB5Kf91YhVZYBWczldMnJCoCls8HRR4YTE0thV0WtVMOs8JMzplINlM1fMqJYsnCW4xJhZgwTzXFQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB2983 X-OriginatorOrg: intel.com Subject: Re: [Intel-gfx] [PATCH v5 2/7] drm/i915: Prepare for multiple GTs X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Lucas De Marchi , Chris Wilson , Matthew Auld Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On 17.02.2022 15:41, Andi Shyti wrote: > From: Tvrtko Ursulin > > On a multi-tile platform, each tile has its own registers + GGTT > space, and BAR 0 is extended to cover all of them. > > Up to four GTs are supported in i915->gt[], with slot zero > shadowing the existing i915->gt0 to enable source compatibility > with legacy driver paths. A for_each_gt macro is added to iterate > over the GTs and will be used by upcoming patches that convert > various parts of the driver to be multi-gt aware. > > Only the primary/root tile is initialized for now; the other > tiles will be detected and plugged in by future patches once the > necessary infrastructure is in place to handle them. > > Signed-off-by: Abdiel Janulgue > Signed-off-by: Daniele Ceraolo Spurio > Signed-off-by: Tvrtko Ursulin > Signed-off-by: Matt Roper > Signed-off-by: Andi Shyti > Cc: Daniele Ceraolo Spurio > Cc: Joonas Lahtinen > Cc: Matthew Auld > Reviewed-by: Matt Roper > --- > drivers/gpu/drm/i915/gt/intel_gt.c | 135 ++++++++++++++++-- > drivers/gpu/drm/i915/gt/intel_gt.h | 16 ++- > drivers/gpu/drm/i915/gt/intel_gt_pm.c | 9 +- > drivers/gpu/drm/i915/gt/intel_gt_types.h | 7 + > drivers/gpu/drm/i915/i915_driver.c | 29 ++-- > drivers/gpu/drm/i915/i915_drv.h | 6 + > drivers/gpu/drm/i915/intel_memory_region.h | 3 + > drivers/gpu/drm/i915/intel_uncore.c | 12 +- > drivers/gpu/drm/i915/intel_uncore.h | 3 +- > .../gpu/drm/i915/selftests/mock_gem_device.c | 7 +- > 10 files changed, 182 insertions(+), 45 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gt/intel_gt.c b/drivers/gpu/drm/i915/gt/intel_gt.c > index db171e85f4df..8c64b81e9ec9 100644 > --- a/drivers/gpu/drm/i915/gt/intel_gt.c > +++ b/drivers/gpu/drm/i915/gt/intel_gt.c > @@ -29,7 +29,7 @@ > #include "intel_uncore.h" > #include "shmem_utils.h" > > -void __intel_gt_init_early(struct intel_gt *gt, struct drm_i915_private *i915) > +static void __intel_gt_init_early(struct intel_gt *gt) > { > spin_lock_init(>->irq_lock); > > @@ -51,19 +51,29 @@ void __intel_gt_init_early(struct intel_gt *gt, struct drm_i915_private *i915) > intel_rps_init_early(>->rps); > } > > -void intel_gt_init_early(struct intel_gt *gt, struct drm_i915_private *i915) > +/* Preliminary initialization of Tile 0 */ > +void intel_root_gt_init_early(struct drm_i915_private *i915) > { > + struct intel_gt *gt = to_gt(i915); > + > gt->i915 = i915; > gt->uncore = &i915->uncore; > + > + __intel_gt_init_early(gt); > } > > -int intel_gt_probe_lmem(struct intel_gt *gt) > +static int intel_gt_probe_lmem(struct intel_gt *gt) > { > struct drm_i915_private *i915 = gt->i915; > + unsigned int instance = gt->info.id; > struct intel_memory_region *mem; > int id; > int err; > > + id = INTEL_REGION_LMEM_0 + instance; > + if (drm_WARN_ON(&i915->drm, id >= INTEL_REGION_STOLEN_SMEM)) Do we need to check id correctness? wouldn't be enough to check it on initialization of gt->info.id. If yes, maybe (id > INTEL_REGION_LMEM_3) would be more readable, or (info.id < MAX_GT),  up to you. > + return -ENODEV; > + > mem = intel_gt_setup_lmem(gt); > if (mem == ERR_PTR(-ENODEV)) > mem = intel_gt_setup_fake_lmem(gt); > @@ -78,9 +88,8 @@ int intel_gt_probe_lmem(struct intel_gt *gt) > return err; > } > > - id = INTEL_REGION_LMEM_0; > - > mem->id = id; > + mem->instance = instance; > > intel_memory_region_set_name(mem, "local%u", mem->instance); > > @@ -795,16 +804,21 @@ void intel_gt_driver_release(struct intel_gt *gt) > intel_gt_fini_buffer_pool(gt); > } > > -void intel_gt_driver_late_release(struct intel_gt *gt) > +void intel_gt_driver_late_release(struct drm_i915_private *i915) > { > + struct intel_gt *gt; > + unsigned int id; > + > /* We need to wait for inflight RCU frees to release their grip */ > rcu_barrier(); > > - intel_uc_driver_late_release(>->uc); > - intel_gt_fini_requests(gt); > - intel_gt_fini_reset(gt); > - intel_gt_fini_timelines(gt); > - intel_engines_free(gt); > + for_each_gt(gt, i915, id) { > + intel_uc_driver_late_release(>->uc); > + intel_gt_fini_requests(gt); > + intel_gt_fini_reset(gt); > + intel_gt_fini_timelines(gt); > + intel_engines_free(gt); > + } > } > > /** > @@ -913,6 +927,105 @@ u32 intel_gt_read_register_fw(struct intel_gt *gt, i915_reg_t reg) > return intel_uncore_read_fw(gt->uncore, reg); > } > > +static int intel_gt_tile_setup(struct intel_gt *gt, phys_addr_t phys_addr) > +{ > + unsigned int id = gt->info.id; > + int ret; > + > + if (id) { > + struct intel_uncore_mmio_debug *mmio_debug; > + struct intel_uncore *uncore; > + > + uncore = kzalloc(sizeof(*uncore), GFP_KERNEL); > + if (!gt->uncore) > + return -ENOMEM; s/gt->uncore/uncore/ > + > + mmio_debug = kzalloc(sizeof(*mmio_debug), GFP_KERNEL); > + if (!mmio_debug) { > + kfree(uncore); > + return -ENOMEM; > + } > + > + gt->uncore = uncore; > + gt->uncore->debug = mmio_debug; > + > + __intel_gt_init_early(gt); > + } > + > + intel_uncore_init_early(gt->uncore, gt); > + > + ret = intel_uncore_setup_mmio(gt->uncore, phys_addr); > + if (ret) > + return ret; > + > + gt->phys_addr = phys_addr; > + > + return 0; > +} > + > +static void > +intel_gt_tile_cleanup(struct intel_gt *gt) > +{ > + intel_uncore_cleanup_mmio(gt->uncore); > + > + if (gt->info.id) { > + kfree(gt->uncore); > + kfree(gt); What about gt->uncore->debug ? > + } > +} > + > +int intel_gt_probe_all(struct drm_i915_private *i915) > +{ > + struct pci_dev *pdev = to_pci_dev(i915->drm.dev); > + struct intel_gt *gt = &i915->gt0; > + phys_addr_t phys_addr; > + unsigned int mmio_bar; > + int ret; > + > + mmio_bar = GRAPHICS_VER(i915) == 2 ? 1 : 0; > + phys_addr = pci_resource_start(pdev, mmio_bar); > + > + /* > + * We always have at least one primary GT on any device > + * and it has been already initialized early during probe > + * in i915_driver_probe() > + */ > + ret = intel_gt_tile_setup(gt, phys_addr); > + if (ret) > + return ret; > + > + i915->gt[0] = gt; > + > + /* TODO: add more tiles */ > + return 0; > +} > + > +int intel_gt_tiles_init(struct drm_i915_private *i915) > +{ > + struct intel_gt *gt; > + unsigned int id; > + int ret; > + > + for_each_gt(gt, i915, id) { > + ret = intel_gt_probe_lmem(gt); > + if (ret) > + return ret; > + } > + > + return 0; > +} > + > +void intel_gt_release_all(struct drm_i915_private *i915) > +{ > + struct intel_gt *gt; > + unsigned int id; > + > + for_each_gt(gt, i915, id) { > + intel_gt_tile_cleanup(gt); > + i915->gt[id] = NULL; > + } > +} > + > void intel_gt_info_print(const struct intel_gt_info *info, > struct drm_printer *p) > { > diff --git a/drivers/gpu/drm/i915/gt/intel_gt.h b/drivers/gpu/drm/i915/gt/intel_gt.h > index 2dad46c3eff2..915d6192079b 100644 > --- a/drivers/gpu/drm/i915/gt/intel_gt.h > +++ b/drivers/gpu/drm/i915/gt/intel_gt.h > @@ -34,10 +34,8 @@ static inline struct intel_gt *huc_to_gt(struct intel_huc *huc) > return container_of(huc, struct intel_gt, uc.huc); > } > > -void intel_gt_init_early(struct intel_gt *gt, struct drm_i915_private *i915); > -void __intel_gt_init_early(struct intel_gt *gt, struct drm_i915_private *i915); > +void intel_root_gt_init_early(struct drm_i915_private *i915); > int intel_gt_assign_ggtt(struct intel_gt *gt); > -int intel_gt_probe_lmem(struct intel_gt *gt); > int intel_gt_init_mmio(struct intel_gt *gt); > int __must_check intel_gt_init_hw(struct intel_gt *gt); > int intel_gt_init(struct intel_gt *gt); > @@ -47,7 +45,7 @@ void intel_gt_driver_unregister(struct intel_gt *gt); > void intel_gt_driver_remove(struct intel_gt *gt); > void intel_gt_driver_release(struct intel_gt *gt); > > -void intel_gt_driver_late_release(struct intel_gt *gt); > +void intel_gt_driver_late_release(struct drm_i915_private *i915); > > int intel_gt_wait_for_idle(struct intel_gt *gt, long timeout); > > @@ -86,6 +84,16 @@ static inline bool intel_gt_needs_read_steering(struct intel_gt *gt, > > u32 intel_gt_read_register_fw(struct intel_gt *gt, i915_reg_t reg); > > +int intel_gt_probe_all(struct drm_i915_private *i915); > +int intel_gt_tiles_init(struct drm_i915_private *i915); > +void intel_gt_release_all(struct drm_i915_private *i915); > + > +#define for_each_gt(gt__, i915__, id__) \ > + for ((id__) = 0; \ > + (id__) < I915_MAX_GT; \ > + (id__)++) \ > + for_each_if(((gt__) = (i915__)->gt[(id__)])) > + > void intel_gt_info_print(const struct intel_gt_info *info, > struct drm_printer *p); > > diff --git a/drivers/gpu/drm/i915/gt/intel_gt_pm.c b/drivers/gpu/drm/i915/gt/intel_gt_pm.c > index c0fa41e4c803..e66479d33bc3 100644 > --- a/drivers/gpu/drm/i915/gt/intel_gt_pm.c > +++ b/drivers/gpu/drm/i915/gt/intel_gt_pm.c > @@ -128,7 +128,14 @@ static const struct intel_wakeref_ops wf_ops = { > > void intel_gt_pm_init_early(struct intel_gt *gt) > { > - intel_wakeref_init(>->wakeref, gt->uncore->rpm, &wf_ops); > + /* > + * We access the runtime_pm structure via gt->i915 here rather than > + * gt->uncore as we do elsewhere in the file because gt->uncore is not > + * yet initialized for all tiles at this point in the driver startup. > + * runtime_pm is per-device rather than per-tile, so this is still the > + * correct structure. > + */ > + intel_wakeref_init(>->wakeref, >->i915->runtime_pm, &wf_ops); > seqcount_mutex_init(>->stats.lock, >->wakeref.mutex); > } > > diff --git a/drivers/gpu/drm/i915/gt/intel_gt_types.h b/drivers/gpu/drm/i915/gt/intel_gt_types.h > index f20687796490..89fad770b2d4 100644 > --- a/drivers/gpu/drm/i915/gt/intel_gt_types.h > +++ b/drivers/gpu/drm/i915/gt/intel_gt_types.h > @@ -182,7 +182,14 @@ struct intel_gt { > > const struct intel_mmio_range *steering_table[NUM_STEERING_TYPES]; > > + /* > + * Base of per-tile GTTMMADR where we can derive the MMIO and the GGTT. > + */ > + phys_addr_t phys_addr; > + > struct intel_gt_info { > + unsigned int id; > + > intel_engine_mask_t engine_mask; > > u32 l3bank_mask; > diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c > index 1c67ff735f18..144f989e4fef 100644 > --- a/drivers/gpu/drm/i915/i915_driver.c > +++ b/drivers/gpu/drm/i915/i915_driver.c > @@ -320,9 +320,8 @@ static int i915_driver_early_probe(struct drm_i915_private *dev_priv) > intel_device_info_subplatform_init(dev_priv); > intel_step_init(dev_priv); > > - intel_gt_init_early(to_gt(dev_priv), dev_priv); > + /* All tiles share a single mmio_debug */ So why are we allocating mmio_debug in intel_gt_tile_setup ? > intel_uncore_mmio_debug_init_early(&dev_priv->mmio_debug); > - intel_uncore_init_early(&dev_priv->uncore, to_gt(dev_priv)); > > spin_lock_init(&dev_priv->irq_lock); > spin_lock_init(&dev_priv->gpu_error.lock); > @@ -353,7 +352,7 @@ static int i915_driver_early_probe(struct drm_i915_private *dev_priv) > > intel_wopcm_init_early(&dev_priv->wopcm); > > - __intel_gt_init_early(to_gt(dev_priv), dev_priv); > + intel_root_gt_init_early(dev_priv); > > i915_gem_init_early(dev_priv); > > @@ -374,7 +373,7 @@ static int i915_driver_early_probe(struct drm_i915_private *dev_priv) > > err_gem: > i915_gem_cleanup_early(dev_priv); > - intel_gt_driver_late_release(to_gt(dev_priv)); > + intel_gt_driver_late_release(dev_priv); > intel_region_ttm_device_fini(dev_priv); > err_ttm: > vlv_suspend_cleanup(dev_priv); > @@ -393,7 +392,7 @@ static void i915_driver_late_release(struct drm_i915_private *dev_priv) > intel_irq_fini(dev_priv); > intel_power_domains_cleanup(dev_priv); > i915_gem_cleanup_early(dev_priv); > - intel_gt_driver_late_release(to_gt(dev_priv)); > + intel_gt_driver_late_release(dev_priv); > intel_region_ttm_device_fini(dev_priv); > vlv_suspend_cleanup(dev_priv); > i915_workqueues_cleanup(dev_priv); > @@ -424,13 +423,9 @@ static int i915_driver_mmio_probe(struct drm_i915_private *dev_priv) > if (ret < 0) > return ret; > > - ret = intel_uncore_setup_mmio(&dev_priv->uncore); > - if (ret < 0) > - goto err_bridge; > - > ret = intel_uncore_init_mmio(&dev_priv->uncore); > if (ret) > - goto err_mmio; > + return ret; > > /* Try to make sure MCHBAR is enabled before poking at it */ > intel_setup_mchbar(dev_priv); > @@ -448,9 +443,6 @@ static int i915_driver_mmio_probe(struct drm_i915_private *dev_priv) > err_uncore: > intel_teardown_mchbar(dev_priv); > intel_uncore_fini_mmio(&dev_priv->uncore); > -err_mmio: > - intel_uncore_cleanup_mmio(&dev_priv->uncore); > -err_bridge: > pci_dev_put(dev_priv->bridge_dev); > > return ret; > @@ -464,7 +456,6 @@ static void i915_driver_mmio_release(struct drm_i915_private *dev_priv) > { > intel_teardown_mchbar(dev_priv); > intel_uncore_fini_mmio(&dev_priv->uncore); > - intel_uncore_cleanup_mmio(&dev_priv->uncore); > pci_dev_put(dev_priv->bridge_dev); > } > > @@ -597,7 +588,7 @@ static int i915_driver_hw_probe(struct drm_i915_private *dev_priv) > if (ret) > goto err_ggtt; > > - ret = intel_gt_probe_lmem(to_gt(dev_priv)); > + ret = intel_gt_tiles_init(dev_priv); > if (ret) > goto err_mem_regions; > > @@ -862,10 +853,14 @@ int i915_driver_probe(struct pci_dev *pdev, const struct pci_device_id *ent) > > intel_vgpu_detect(i915); > > - ret = i915_driver_mmio_probe(i915); > + ret = intel_gt_probe_all(i915); > if (ret < 0) > goto out_runtime_pm_put; > > + ret = i915_driver_mmio_probe(i915); > + if (ret < 0) > + goto out_tiles_cleanup; > + > ret = i915_driver_hw_probe(i915); > if (ret < 0) > goto out_cleanup_mmio; > @@ -922,6 +917,8 @@ int i915_driver_probe(struct pci_dev *pdev, const struct pci_device_id *ent) > i915_ggtt_driver_late_release(i915); > out_cleanup_mmio: > i915_driver_mmio_release(i915); > +out_tiles_cleanup: > + intel_gt_release_all(i915); > out_runtime_pm_put: > enable_rpm_wakeref_asserts(&i915->runtime_pm); > i915_driver_late_release(i915); > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > index 418091484e02..88a83cd81ddd 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -805,6 +805,12 @@ struct drm_i915_private { > /* Abstract the submission mechanism (legacy ringbuffer or execlists) away */ > struct intel_gt gt0; > > + /* > + * i915->gt[0] == &i915->gt0 > + */ > +#define I915_MAX_GT 4 > + struct intel_gt *gt[I915_MAX_GT]; > + > struct { > struct i915_gem_contexts { > spinlock_t lock; /* locks list */ > diff --git a/drivers/gpu/drm/i915/intel_memory_region.h b/drivers/gpu/drm/i915/intel_memory_region.h > index 95db0a8029e2..9548335344be 100644 > --- a/drivers/gpu/drm/i915/intel_memory_region.h > +++ b/drivers/gpu/drm/i915/intel_memory_region.h > @@ -30,6 +30,9 @@ enum intel_memory_type { > enum intel_region_id { > INTEL_REGION_SMEM = 0, > INTEL_REGION_LMEM_0, > + INTEL_REGION_LMEM_1, > + INTEL_REGION_LMEM_2, > + INTEL_REGION_LMEM_3, > INTEL_REGION_STOLEN_SMEM, > INTEL_REGION_STOLEN_LMEM, > INTEL_REGION_UNKNOWN, /* Should be last */ > diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c > index dd8fdd5863de..75d9fa21923e 100644 > --- a/drivers/gpu/drm/i915/intel_uncore.c > +++ b/drivers/gpu/drm/i915/intel_uncore.c > @@ -2039,14 +2039,11 @@ static int i915_pmic_bus_access_notifier(struct notifier_block *nb, > return NOTIFY_OK; > } > > -int intel_uncore_setup_mmio(struct intel_uncore *uncore) > +int intel_uncore_setup_mmio(struct intel_uncore *uncore, phys_addr_t phys_addr) > { > struct drm_i915_private *i915 = uncore->i915; > - struct pci_dev *pdev = to_pci_dev(i915->drm.dev); > - int mmio_bar; > int mmio_size; > > - mmio_bar = GRAPHICS_VER(i915) == 2 ? 1 : 0; > /* > * Before gen4, the registers and the GTT are behind different BARs. > * However, from gen4 onwards, the registers and the GTT are shared > @@ -2063,7 +2060,7 @@ int intel_uncore_setup_mmio(struct intel_uncore *uncore) > else > mmio_size = 2 * 1024 * 1024; > > - uncore->regs = pci_iomap(pdev, mmio_bar, mmio_size); > + uncore->regs = ioremap(phys_addr, mmio_size); > if (uncore->regs == NULL) { > drm_err(&i915->drm, "failed to map registers\n"); > return -EIO; > @@ -2074,9 +2071,8 @@ int intel_uncore_setup_mmio(struct intel_uncore *uncore) > > void intel_uncore_cleanup_mmio(struct intel_uncore *uncore) > { > - struct pci_dev *pdev = to_pci_dev(uncore->i915->drm.dev); > - > - pci_iounmap(pdev, uncore->regs); > + if (uncore->regs) > + iounmap(uncore->regs); 'if' is not necessary, up to you. Regards Andrzej > } > > void intel_uncore_init_early(struct intel_uncore *uncore, > diff --git a/drivers/gpu/drm/i915/intel_uncore.h b/drivers/gpu/drm/i915/intel_uncore.h > index 6ff56d673e2b..de53c961fadb 100644 > --- a/drivers/gpu/drm/i915/intel_uncore.h > +++ b/drivers/gpu/drm/i915/intel_uncore.h > @@ -29,6 +29,7 @@ > #include > #include > #include > +#include > > #include "i915_reg_defs.h" > > @@ -219,7 +220,7 @@ void > intel_uncore_mmio_debug_init_early(struct intel_uncore_mmio_debug *mmio_debug); > void intel_uncore_init_early(struct intel_uncore *uncore, > struct intel_gt *gt); > -int intel_uncore_setup_mmio(struct intel_uncore *uncore); > +int intel_uncore_setup_mmio(struct intel_uncore *uncore, phys_addr_t phys_addr); > int intel_uncore_init_mmio(struct intel_uncore *uncore); > void intel_uncore_prune_engine_fw_domains(struct intel_uncore *uncore, > struct intel_gt *gt); > diff --git a/drivers/gpu/drm/i915/selftests/mock_gem_device.c b/drivers/gpu/drm/i915/selftests/mock_gem_device.c > index 573d9b2e1a4a..f72436c5d596 100644 > --- a/drivers/gpu/drm/i915/selftests/mock_gem_device.c > +++ b/drivers/gpu/drm/i915/selftests/mock_gem_device.c > @@ -73,7 +73,7 @@ static void mock_device_release(struct drm_device *dev) > destroy_workqueue(i915->wq); > > intel_region_ttm_device_fini(i915); > - intel_gt_driver_late_release(to_gt(i915)); > + intel_gt_driver_late_release(i915); > intel_memory_regions_driver_release(i915); > > drm_mode_config_cleanup(&i915->drm); > @@ -180,8 +180,7 @@ struct drm_i915_private *mock_gem_device(void) > spin_lock_init(&i915->gpu_error.lock); > > i915_gem_init__mm(i915); > - intel_gt_init_early(to_gt(i915), i915); > - __intel_gt_init_early(to_gt(i915), i915); > + intel_root_gt_init_early(i915); > mock_uncore_init(&i915->uncore, i915); > atomic_inc(&to_gt(i915)->wakeref.count); /* disable; no hw support */ > to_gt(i915)->awake = -ENODEV; > @@ -229,7 +228,7 @@ struct drm_i915_private *mock_gem_device(void) > err_drv: > intel_region_ttm_device_fini(i915); > err_ttm: > - intel_gt_driver_late_release(to_gt(i915)); > + intel_gt_driver_late_release(i915); > intel_memory_regions_driver_release(i915); > drm_mode_config_cleanup(&i915->drm); > mock_destroy_device(i915);