drm/xe: ensure correct access_put ordering

Only call access_put after dropping the forcewake. In theory the device
could suspend, but really we want to start asserting that we have a
mem_access.ref when touching mmio.

Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Matthew Brost <matthew.brost@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

diff --git a/drivers/gpu/drm/xe/xe_gt.c b/drivers/gpu/drm/xe/xe_gt.c
index b31ef2a8ff17d715db322e831af428252dc8e7e5..3e32d38aeeea57c375b3659dac7de1f36bde1044 100644 (file)
--- a/drivers/gpu/drm/xe/xe_gt.c
+++ b/drivers/gpu/drm/xe/xe_gt.c
@@ -535,8 +535,8 @@ static int gt_reset(struct xe_gt *gt)
        if (err)
                goto err_out;
 
-       xe_device_mem_access_put(gt_to_xe(gt));
        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_gt_info(gt, "reset done\n");
@@ -579,8 +579,8 @@ void xe_gt_suspend_prepare(struct xe_gt *gt)
 
        xe_uc_stop_prepare(&gt->uc);
 
-       xe_device_mem_access_put(gt_to_xe(gt));
        XE_WARN_ON(xe_force_wake_put(gt_to_fw(gt), XE_FORCEWAKE_ALL));
+       xe_device_mem_access_put(gt_to_xe(gt));
 }
 
 int xe_gt_suspend(struct xe_gt *gt)
@@ -602,8 +602,8 @@ int xe_gt_suspend(struct xe_gt *gt)
        if (err)
                goto err_force_wake;
 
-       xe_device_mem_access_put(gt_to_xe(gt));
        XE_WARN_ON(xe_force_wake_put(gt_to_fw(gt), XE_FORCEWAKE_ALL));
+       xe_device_mem_access_put(gt_to_xe(gt));
        xe_gt_info(gt, "suspended\n");
 
        return 0;
@@ -630,8 +630,8 @@ int xe_gt_resume(struct xe_gt *gt)
        if (err)
                goto err_force_wake;
 
-       xe_device_mem_access_put(gt_to_xe(gt));
        XE_WARN_ON(xe_force_wake_put(gt_to_fw(gt), XE_FORCEWAKE_ALL));
+       xe_device_mem_access_put(gt_to_xe(gt));
        xe_gt_info(gt, "resumed\n");
 
        return 0;

diff --git a/drivers/gpu/drm/xe/xe_gt_debugfs.c b/drivers/gpu/drm/xe/xe_gt_debugfs.c
index d0092d714ffe881ed980848848ac5c5a439ea6d4..f9f653243f206d07e1582af0b6c1aa7198654bfc 100644 (file)
--- a/drivers/gpu/drm/xe/xe_gt_debugfs.c
+++ b/drivers/gpu/drm/xe/xe_gt_debugfs.c
@@ -45,8 +45,8 @@ static int hw_engines(struct seq_file *m, void *data)
        for_each_hw_engine(hwe, gt, id)
                xe_hw_engine_print(hwe, &p);
 
-       xe_device_mem_access_put(xe);
        err = xe_force_wake_put(gt_to_fw(gt), XE_FORCEWAKE_ALL);
+       xe_device_mem_access_put(xe);
        if (err)
                return err;
 

diff --git a/drivers/gpu/drm/xe/xe_guc_pc.c b/drivers/gpu/drm/xe/xe_guc_pc.c
index 0927cb669603c1d3aed203275930ad306db2fec6..91a3967fd7998d5204a24a26f67c7987832d531f 100644 (file)
--- a/drivers/gpu/drm/xe/xe_guc_pc.c
+++ b/drivers/gpu/drm/xe/xe_guc_pc.c
@@ -848,8 +848,8 @@ int xe_guc_pc_start(struct xe_guc_pc *pc)
        ret = pc_action_setup_gucrc(pc, XE_GUCRC_FIRMWARE_CONTROL);
 
 out:
-       xe_device_mem_access_put(pc_to_xe(pc));
        XE_WARN_ON(xe_force_wake_put(gt_to_fw(gt), XE_FORCEWAKE_ALL));
+       xe_device_mem_access_put(pc_to_xe(pc));
        return ret;
 }