From: Lucas De Marchi Date: Wed, 22 Feb 2023 00:27:05 +0000 (-0800) Subject: drm/xe: Remove duplicate media_ver X-Git-Tag: v6.8-rc1~21^2~13^2~925 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=e50bbbb9baf64dfe77f236636961b1ceb1b4c19d;p=linux-block.git drm/xe: Remove duplicate media_ver media_verx100 supersedes the info from media_ver. Leave media_ver in the struct xe_device_desc, used in xe_pci.c since it's easier to define common parts of the platforms like that. However all the rest of the driver should be using media_verx100 that is more future proof. Closes: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/216 Signed-off-by: Lucas De Marchi Reviewed-by: José Roberto de Souza Signed-off-by: Rodrigo Vivi --- diff --git a/drivers/gpu/drm/xe/xe_device_types.h b/drivers/gpu/drm/xe/xe_device_types.h index 4c4a912141a9..c9f74dc4c9fd 100644 --- a/drivers/gpu/drm/xe/xe_device_types.h +++ b/drivers/gpu/drm/xe/xe_device_types.h @@ -77,8 +77,6 @@ struct xe_device { u8 tile_count; /** @vm_max_level: Max VM level */ u8 vm_max_level; - /** @media_ver: Media version */ - u8 media_ver; /** @supports_usm: Supports unified shared memory */ bool supports_usm; /** @has_asid: Has address space ID */ diff --git a/drivers/gpu/drm/xe/xe_mmio.c b/drivers/gpu/drm/xe/xe_mmio.c index ba327b1e8dea..c414ece6dfe3 100644 --- a/drivers/gpu/drm/xe/xe_mmio.c +++ b/drivers/gpu/drm/xe/xe_mmio.c @@ -287,7 +287,7 @@ static void xe_mmio_probe_tiles(struct xe_device *xe) mtcfg = xe_mmio_read64(gt, XEHP_MTCFG_ADDR.reg); adj_tile_count = xe->info.tile_count = REG_FIELD_GET(TILE_COUNT, mtcfg) + 1; - if (xe->info.media_ver >= 13) + if (xe->info.media_verx100 >= 1300) xe->info.tile_count *= 2; drm_info(&xe->drm, "tile_count: %d, adj_tile_count %d\n", diff --git a/drivers/gpu/drm/xe/xe_pci.c b/drivers/gpu/drm/xe/xe_pci.c index 2b1c80bb6e46..88e28649c400 100644 --- a/drivers/gpu/drm/xe/xe_pci.c +++ b/drivers/gpu/drm/xe/xe_pci.c @@ -408,7 +408,6 @@ static int xe_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) xe->info.vram_flags = desc->vram_flags; xe->info.tile_count = desc->max_tiles; xe->info.vm_max_level = desc->vm_max_level; - xe->info.media_ver = desc->media_ver; xe->info.supports_usm = desc->supports_usm; xe->info.has_asid = desc->has_asid; xe->info.has_flat_ccs = desc->has_flat_ccs;