mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-08-31 03:35:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

drm/xe: Don't initialize tile_count in xe_info_init_early()

Browse Source 
The value of xe->info.tile_count is only really valid after
xe_info_probe_tile_count().  Any use of tile_count before that point
is invalid and, consequently, initializing it in xe_info_init_early()
is pointless.

Move the initialization to xe_info_probe_tile_count().

Reviewed-by: Dnyaneshwar Bhadane <dnyaneshwar.bhadane@intel.com>
Reviewed-by: Violet Monti <violet.monti@intel.com>
Link: https://patch.msgid.link/20260609-xe-probe-info-v1-8-21e83e188e60@intel.com
Signed-off-by: Gustavo Sousa <gustavo.sousa@intel.com>
This commit is contained in:
Gustavo Sousa
2026-06-09 17:17:40 -03:00
parent 13bebc7171
commit 723c3407fb
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/gpu/drm/xe/tests/xe_pci.c
View File

@@ -311,9 +311,10 @@ const void *xe_pci_id_gen_param(struct kunit *test, const void *prev, char *desc
}
EXPORT_SYMBOL_IF_KUNIT(xe_pci_id_gen_param);
static void fake_xe_info_probe_tile_count(struct xe_device *xe)
static void fake_xe_info_probe_tile_count(struct xe_device *xe,
const struct xe_device_desc *desc)
{
/* Nothing to do, just use the statically defined value. */
xe->info.tile_count = 1 + desc->max_remote_tiles;
}
static int fake_probe_info(struct xe_device *xe,

10
drivers/gpu/drm/xe/xe_pci.c
View File

@@ -813,7 +813,6 @@ static int xe_info_init_early(struct xe_device *xe,
xe_assert(xe, desc->max_gt_per_tile > 0);
xe_assert(xe, desc->max_gt_per_tile <= XE_MAX_GT_PER_TILE);
xe->info.max_gt_per_tile = desc->max_gt_per_tile;
xe->info.tile_count = 1 + desc->max_remote_tiles;
err = xe_tile_init_early(xe_device_get_root_tile(xe), xe, 0);
if (err)
@@ -825,13 +824,16 @@ static int xe_info_init_early(struct xe_device *xe,
/*
* Possibly override number of tile based on configuration register.
*/
static void xe_info_probe_tile_count(struct xe_device *xe)
static void xe_info_probe_tile_count(struct xe_device *xe,
const struct xe_device_desc *desc)
{
struct xe_mmio *mmio;
u8 tile_count;
u32 mtcfg;
KUNIT_STATIC_STUB_REDIRECT(xe_info_probe_tile_count, xe);
KUNIT_STATIC_STUB_REDIRECT(xe_info_probe_tile_count, xe, desc);
xe->info.tile_count = 1 + desc->max_remote_tiles;
/*
* Probe for tile count only for platforms that support multiple
@@ -1037,7 +1039,7 @@ static int xe_info_init(struct xe_device *xe,
xe->info.has_soc_remapper_telem = 0;
}
xe_info_probe_tile_count(xe);
xe_info_probe_tile_count(xe, desc);
for_each_remote_tile(tile, xe, id) {
int err;