diff options
| author | Matthew Auld <matthew.auld@intel.com> | 2024-10-09 10:48:10 +0200 |
|---|---|---|
| committer | Matthew Auld <matthew.auld@intel.com> | 2024-10-10 10:15:59 +0200 |
| commit | a187c1b0a800565a4db6372268692aff99df7f53 (patch) | |
| tree | be1ec662e5def7a481d614a0c3cc1272f818fe5b | |
| parent | drm/xe: fix unbalanced rpm put() with fence_fini() (diff) | |
| download | linux-a187c1b0a800565a4db6372268692aff99df7f53.tar.xz linux-a187c1b0a800565a4db6372268692aff99df7f53.zip | |
drm/xe: fix unbalanced rpm put() with declare_wedged()
Technically the or_reset() means we call the action on failure, however
that would lead to unbalanced rpm put(). Move the get() earlier to fix
this. It should be extremely unlikely to ever trigger this in practice.
Fixes: 452bca0edbd0 ("drm/xe: Don't suspend device upon wedge")
Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Cc: Matthew Brost <matthew.brost@intel.com>
Cc: Nirmoy Das <nirmoy.das@intel.com>
Reviewed-by: Matthew Brost <matthew.brost@intel.com>
Reviewed-by: Nirmoy Das <nirmoy.das@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241009084808.204432-4-matthew.auld@intel.com
| -rw-r--r-- | drivers/gpu/drm/xe/xe_device.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/xe/xe_device.c b/drivers/gpu/drm/xe/xe_device.c index cd241a8e1838..962751c966d1 100644 --- a/drivers/gpu/drm/xe/xe_device.c +++ b/drivers/gpu/drm/xe/xe_device.c @@ -1016,13 +1016,13 @@ void xe_device_declare_wedged(struct xe_device *xe) return; } + xe_pm_runtime_get_noresume(xe); + if (drmm_add_action_or_reset(&xe->drm, xe_device_wedged_fini, xe)) { drm_err(&xe->drm, "Failed to register xe_device_wedged_fini clean-up. Although device is wedged.\n"); return; } - xe_pm_runtime_get_noresume(xe); - if (!atomic_xchg(&xe->wedged.flag, 1)) { xe->needs_flr_on_fini = true; drm_err(&xe->drm, |