projects
/
linux-2.6-microblaze.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7090d7f
)
drm/xe: Fix tile fini sequence
author
Matthew Brost
<matthew.brost@intel.com>
Fri, 9 Aug 2024 23:28:30 +0000
(16:28 -0700)
committer
Rodrigo Vivi
<rodrigo.vivi@intel.com>
Mon, 19 Aug 2024 14:39:11 +0000
(10:39 -0400)
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>
drivers/gpu/drm/xe/xe_mmio.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/xe/xe_mmio.c
b/drivers/gpu/drm/xe/xe_mmio.c
index
f92faad
..
83122c7
100644
(file)
--- a/
drivers/gpu/drm/xe/xe_mmio.c
+++ b/
drivers/gpu/drm/xe/xe_mmio.c
@@
-30,7
+30,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)
@@
-91,9
+92,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)