diff options
| author | Matthew Auld <matthew.auld@intel.com> | 2023-07-10 12:40:41 +0300 |
|---|---|---|
| committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2023-12-21 19:35:22 +0300 |
| commit | c4bbc32e09ab9f74c725a8719df2b509c8ad8780 (patch) | |
| tree | ab85f5e21a8849e6c88b29d5c23538f0b62410f7 /drivers/gpu/drm/xe/xe_guc_ct.c | |
| parent | 86ed09250e068faa840dadcd175d3cd8d174f998 (diff) | |
| download | linux-c4bbc32e09ab9f74c725a8719df2b509c8ad8780.tar.xz | |
drm/xe: hold mem_access.ref for CT fast-path
Just checking xe_device_mem_access_ongoing() is not enough, we also need
to hold the reference otherwise the ref can transition from 1 -> 0 as we
enter g2h_read(), leading to warnings. While we can't do a full rpm sync
in the IRQ, we can keep the device awake if the ref is non-zero.
Introduce a new helper for this and set it to work in for the CT
fast-path.
Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Cc: Matthew Brost <matthew.brost@intel.com>
Cc: José Roberto de Souza <jose.souza@intel.com>
Reviewed-by: Matthew Brost <matthew.brost@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Diffstat (limited to 'drivers/gpu/drm/xe/xe_guc_ct.c')
| -rw-r--r-- | drivers/gpu/drm/xe/xe_guc_ct.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/xe/xe_guc_ct.c b/drivers/gpu/drm/xe/xe_guc_ct.c index e71d069158dc..dcce6ed34370 100644 --- a/drivers/gpu/drm/xe/xe_guc_ct.c +++ b/drivers/gpu/drm/xe/xe_guc_ct.c @@ -1044,7 +1044,8 @@ void xe_guc_ct_fast_path(struct xe_guc_ct *ct) struct xe_device *xe = ct_to_xe(ct); int len; - if (!xe_device_in_fault_mode(xe) || !xe_device_mem_access_ongoing(xe)) + if (!xe_device_in_fault_mode(xe) || + !xe_device_mem_access_get_if_ongoing(xe)) return; spin_lock(&ct->fast_lock); @@ -1054,6 +1055,8 @@ void xe_guc_ct_fast_path(struct xe_guc_ct *ct) g2h_fast_path(ct, ct->fast_msg, len); } while (len > 0); spin_unlock(&ct->fast_lock); + + xe_device_mem_access_put(xe); } /* Returns less than zero on error, 0 on done, 1 on more available */ |