tmakin/tegra-linux-noble
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/xe/mmio: move mmio_fini over to devm

Browse Source 
BugLink: https://bugs.launchpad.net/bugs/2084005

[ Upstream commit a0b834c8957a7d2848face008a12382a0ad11ffc ]

Not valid to touch mmio once the device is removed, so make sure we
unmap on removal and not just when driver instance goes away. Also set
the mmio pointers to NULL to hopefully catch such issues more easily.

Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Cc: Andrzej Hajda <andrzej.hajda@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Andrzej Hajda <andrzej.hajda@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240522102143.128069-32-matthew.auld@intel.com
Stable-dep-of: 15939ca77d44 ("drm/xe: Fix tile fini sequence")
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Koichiro Den <koichiro.den@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
This commit is contained in:
Matthew Auld
2024-05-22 11:21:57 +01:00
committed by Mehmet Basaran
parent 98f6cbd4f5
commit 9720a035ff
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/gpu/drm/xe/xe_mmio.c
+5 -2
View File
@@ -350,13 +350,16 @@ add_mmio_ext:
}
}
static void mmio_fini(struct drm_device *drm, void *arg)
static void mmio_fini(void *arg)
{
struct xe_device *xe = arg;
pci_iounmap(to_pci_dev(xe->drm.dev), xe->mmio.regs);
if (xe->mem.vram.mapping)
iounmap(xe->mem.vram.mapping);
xe->mem.vram.mapping = NULL;
xe->mmio.regs = NULL;
}
static int xe_verify_lmem_ready(struct xe_device *xe)
@@ -394,7 +397,7 @@ int xe_mmio_init(struct xe_device *xe)
return -EIO;
}
return drmm_add_action_or_reset(&xe->drm, mmio_fini, xe);
return devm_add_action_or_reset(xe->drm.dev, mmio_fini, xe);
}
int xe_mmio_root_tile_init(struct xe_device *xe)