diff --git a/drivers/gpu/drm/xe/xe_device_types.h b/drivers/gpu/drm/xe/xe_device_types.h index 1a95b1587c86..9a212dbdb8a4 100644 --- a/drivers/gpu/drm/xe/xe_device_types.h +++ b/drivers/gpu/drm/xe/xe_device_types.h @@ -258,8 +258,8 @@ struct xe_device { u8 has_sriov:1; /** @enable_display: display enabled */ u8 enable_display:1; - /** @bypass_mtcfg: Bypass Multi-Tile configuration from MTCFG register */ - u8 bypass_mtcfg:1; + /** @skip_mtcfg: skip Multi-Tile configuration from MTCFG register */ + u8 skip_mtcfg:1; /** @skip_pcode: skip access to PCODE uC */ u8 skip_pcode:1; /** @supports_mmio_ext: supports MMIO extension/s */ diff --git a/drivers/gpu/drm/xe/xe_mmio.c b/drivers/gpu/drm/xe/xe_mmio.c index 0f846272e39c..883610fc0abf 100644 --- a/drivers/gpu/drm/xe/xe_mmio.c +++ b/drivers/gpu/drm/xe/xe_mmio.c @@ -330,7 +330,7 @@ static void xe_mmio_probe_tiles(struct xe_device *xe) if (tile_count == 1) goto add_mmio_ext; - if (!xe->info.bypass_mtcfg) { + if (!xe->info.skip_mtcfg) { mtcfg = xe_mmio_read64_2x32(gt, XEHP_MTCFG_ADDR); tile_count = REG_FIELD_GET(TILE_COUNT, mtcfg) + 1; if (tile_count < xe->info.tile_count) { diff --git a/drivers/gpu/drm/xe/xe_pci.c b/drivers/gpu/drm/xe/xe_pci.c index 57eecaac53b5..1f3b2ce7c044 100644 --- a/drivers/gpu/drm/xe/xe_pci.c +++ b/drivers/gpu/drm/xe/xe_pci.c @@ -62,7 +62,7 @@ struct xe_device_desc { u8 has_llc:1; u8 has_sriov:1; - u8 bypass_mtcfg:1; + u8 skip_mtcfg:1; u8 skip_pcode:1; u8 supports_mmio_ext:1; u8 skip_guc_pc:1; @@ -581,7 +581,7 @@ static int xe_info_init(struct xe_device *xe, xe->info.media_name = media_desc ? media_desc->name : "none"; xe->info.has_llc = desc->has_llc; xe->info.has_sriov = desc->has_sriov; - xe->info.bypass_mtcfg = desc->bypass_mtcfg; + xe->info.skip_mtcfg = desc->skip_mtcfg; xe->info.skip_pcode = desc->skip_pcode; xe->info.supports_mmio_ext = desc->supports_mmio_ext; xe->info.tile_mmio_ext_size = graphics_desc->tile_mmio_ext_size;