From: Matthew Brost <matthew.brost@intel.com>
To: intel-xe@lists.freedesktop.org
Subject: [PATCH 04/11] drm/xe: Fix tile fini sequence
Date: Fri, 9 Aug 2024 18:55:37 -0700 [thread overview]
Message-ID: <20240810015544.3443258-5-matthew.brost@intel.com> (raw)
In-Reply-To: <20240810015544.3443258-1-matthew.brost@intel.com>
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>
---
drivers/gpu/drm/xe/xe_mmio.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/xe/xe_mmio.c b/drivers/gpu/drm/xe/xe_mmio.c
index bdcc7282385c..f5bdb540e823 100644
--- 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;
}
/*
@@ -146,9 +147,11 @@ int xe_mmio_probe_tiles(struct xe_device *xe)
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)
--
2.34.1
next prev parent reply other threads:[~2024-08-10 1:54 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-10 1:55 [PATCH 00/11] Fix error paths in driver load Matthew Brost
2024-08-10 1:55 ` [PATCH 01/11] drm/xe: use devm instead of drmm for managed bo Matthew Brost
2024-08-10 1:55 ` [PATCH 02/11] drm/xe/uc: Use managed bo for HuC and GSC objects Matthew Brost
2024-08-10 1:55 ` [PATCH 03/11] drm/xe/uc: Use devm to register cleanup that includes exec_queues Matthew Brost
2024-08-10 1:55 ` Matthew Brost [this message]
2024-08-10 1:55 ` [PATCH 05/11] drm/xe: Add driver load error injection Matthew Brost
2024-08-10 1:55 ` [PATCH 06/11] drm/xe: Move ggtt_fini to devm managed Matthew Brost
2024-08-10 1:55 ` [PATCH 07/11] drm/xe: Set firmware state to loadable before registering guc_fini_hw Matthew Brost
2024-08-10 1:55 ` [PATCH 08/11] drm/xe: Drop warn on xe_guc_pc_gucrc_disable in guc pc fini Matthew Brost
2024-08-10 1:55 ` [PATCH 09/11] drm/xe: Move hw_engine_fini to devm managed Matthew Brost
2024-08-10 1:55 ` [PATCH 10/11] drm/xe: Move HuC init before GuC init Matthew Brost
2024-08-10 1:55 ` [PATCH 11/11] drm/xe: Update xe_sa to use xe_managed_bo_create_pin_map Matthew Brost
2024-08-10 2:01 ` ✓ CI.Patch_applied: success for Fix error paths in driver load Patchwork
2024-08-10 2:01 ` ✗ CI.checkpatch: warning " Patchwork
2024-08-10 2:01 ` ✗ CI.KUnit: failure " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240810015544.3443258-5-matthew.brost@intel.com \
--to=matthew.brost@intel.com \
--cc=intel-xe@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox