Commit 23be0e6e authored by Rodrigo Vivi's avatar Rodrigo Vivi

drm/xe: Convert gt_reset from mem_access to xe_pm_runtime

We need to ensure that device is in D0 on any kind of GT reset.
We are likely already protected by outer bounds like exec,
but if exec/sched ref gets dropped on a hang, we might transition
to D3 before we are able to perform the gt_reset and recover.
Suggested-by: default avatarMatthew Brost <matthew.brost@intel.com>
Reviewed-by: default avatarMatthew Auld <matthew.auld@intel.com>
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240222163937.138342-13-rodrigo.vivi@intel.com
parent 5d118681
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
#include "xe_migrate.h" #include "xe_migrate.h"
#include "xe_mmio.h" #include "xe_mmio.h"
#include "xe_pat.h" #include "xe_pat.h"
#include "xe_pm.h"
#include "xe_mocs.h" #include "xe_mocs.h"
#include "xe_reg_sr.h" #include "xe_reg_sr.h"
#include "xe_ring_ops.h" #include "xe_ring_ops.h"
...@@ -644,9 +645,9 @@ static int gt_reset(struct xe_gt *gt) ...@@ -644,9 +645,9 @@ static int gt_reset(struct xe_gt *gt)
goto err_fail; goto err_fail;
} }
xe_pm_runtime_get(gt_to_xe(gt));
xe_gt_sanitize(gt); xe_gt_sanitize(gt);
xe_device_mem_access_get(gt_to_xe(gt));
err = xe_force_wake_get(gt_to_fw(gt), XE_FORCEWAKE_ALL); err = xe_force_wake_get(gt_to_fw(gt), XE_FORCEWAKE_ALL);
if (err) if (err)
goto err_msg; goto err_msg;
...@@ -670,8 +671,8 @@ static int gt_reset(struct xe_gt *gt) ...@@ -670,8 +671,8 @@ static int gt_reset(struct xe_gt *gt)
goto err_out; goto err_out;
err = xe_force_wake_put(gt_to_fw(gt), XE_FORCEWAKE_ALL); err = xe_force_wake_put(gt_to_fw(gt), XE_FORCEWAKE_ALL);
xe_device_mem_access_put(gt_to_xe(gt));
XE_WARN_ON(err); XE_WARN_ON(err);
xe_pm_runtime_put(gt_to_xe(gt));
xe_gt_info(gt, "reset done\n"); xe_gt_info(gt, "reset done\n");
...@@ -681,7 +682,7 @@ static int gt_reset(struct xe_gt *gt) ...@@ -681,7 +682,7 @@ static int gt_reset(struct xe_gt *gt)
XE_WARN_ON(xe_force_wake_put(gt_to_fw(gt), XE_FORCEWAKE_ALL)); XE_WARN_ON(xe_force_wake_put(gt_to_fw(gt), XE_FORCEWAKE_ALL));
err_msg: err_msg:
XE_WARN_ON(xe_uc_start(&gt->uc)); XE_WARN_ON(xe_uc_start(&gt->uc));
xe_device_mem_access_put(gt_to_xe(gt)); xe_pm_runtime_put(gt_to_xe(gt));
err_fail: err_fail:
xe_gt_err(gt, "reset failed (%pe)\n", ERR_PTR(err)); xe_gt_err(gt, "reset failed (%pe)\n", ERR_PTR(err));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment