]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/xe: Fix tile fini sequence
authorMatthew Brost <matthew.brost@intel.com>
Fri, 9 Aug 2024 23:28:30 +0000 (16:28 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 29 Aug 2024 15:36:04 +0000 (17:36 +0200)
[ Upstream commit 15939ca77d4424f736e1e4953b4da2351cc9689d ]

Only set tile->mmio.regs to NULL if not the root tile in tile_fini. The
root tile mmio regs is setup ealier in MMIO init thus it should be set
to NULL in mmio_fini.

Fixes: dd08ebf6c352 ("drm/xe: Introduce a new DRM driver for Intel GPUs")
Signed-off-by: Matthew Brost <matthew.brost@intel.com>
Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: Himal Prasad Ghimiray <himal.prasad.ghimiray@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240809232830.3302251-1-matthew.brost@intel.com
(cherry picked from commit 3396900aa273903639a1792afa4d23dc09bec291)
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/gpu/drm/xe/xe_mmio.c

index 9d8fafdf51453e4b62246b2bedc1f238f2e6a951..beb4e276ba845a009ed6a26db9910643397b125e 100644 (file)
@@ -355,7 +355,8 @@ static void tiles_fini(void *arg)
        int id;
 
        for_each_tile(tile, xe, id)
-               tile->mmio.regs = NULL;
+               if (tile != xe_device_get_root_tile(xe))
+                       tile->mmio.regs = NULL;
 }
 
 int xe_mmio_probe_tiles(struct xe_device *xe)
@@ -416,9 +417,11 @@ add_mmio_ext:
 static void mmio_fini(void *arg)
 {
        struct xe_device *xe = arg;
+       struct xe_tile *root_tile = xe_device_get_root_tile(xe);
 
        pci_iounmap(to_pci_dev(xe->drm.dev), xe->mmio.regs);
        xe->mmio.regs = NULL;
+       root_tile->mmio.regs = NULL;
 }
 
 int xe_mmio_init(struct xe_device *xe)