mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-04-18 17:18:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

drm/xe/guc_pc: Reorder forcewake and xe_pm_runtime calls

Browse Source 
When the device is runtime suspended, reading some of the sysfs
entries under device/gt#/ causes a resume error
This is due to the ordering of pm_runtime and forcewake calls.
Reorder to wake up using xe_pm_runtime_get and then forcewake

v2: add goto statements (Rodrigo)

Signed-off-by: Riana Tauro <riana.tauro@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
This commit is contained in:
Riana Tauro
2023-04-20 11:26:48 +05:30
committed by Rodrigo Vivi
parent 96cb46df56
commit a180f4e13c
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/gpu/drm/xe/xe_guc_pc.c
View File

@@ -370,15 +370,14 @@ static ssize_t freq_act_show(struct device *dev,
u32 freq;
ssize_t ret;
xe_device_mem_access_get(gt_to_xe(gt));
/*
* When in RC6, actual frequency is 0. Let's block RC6 so we are able
* to verify that our freq requests are really happening.
*/
ret = xe_force_wake_get(gt_to_fw(gt), XE_FORCEWAKE_ALL);
if (ret)
return ret;
xe_device_mem_access_get(gt_to_xe(gt));
goto out;
if (xe->info.platform == XE_METEORLAKE) {
freq = xe_mmio_read32(gt, MTL_MIRROR_TARGET_WP1.reg);
@@ -388,11 +387,11 @@ static ssize_t freq_act_show(struct device *dev,
freq = REG_FIELD_GET(GEN12_CAGF_MASK, freq);
}
xe_device_mem_access_put(gt_to_xe(gt));
ret = sysfs_emit(buf, "%d\n", decode_freq(freq));
XE_WARN_ON(xe_force_wake_put(gt_to_fw(gt), XE_FORCEWAKE_ALL));
out:
xe_device_mem_access_put(gt_to_xe(gt));
return ret;
}
static DEVICE_ATTR_RO(freq_act);
@@ -405,22 +404,23 @@ static ssize_t freq_cur_show(struct device *dev,
u32 freq;
ssize_t ret;
xe_device_mem_access_get(gt_to_xe(gt));
/*
* GuC SLPC plays with cur freq request when GuCRC is enabled
* Block RC6 for a more reliable read.
*/
ret = xe_force_wake_get(gt_to_fw(gt), XE_FORCEWAKE_ALL);
if (ret)
return ret;
goto out;
xe_device_mem_access_get(gt_to_xe(gt));
freq = xe_mmio_read32(gt, GEN6_RPNSWREQ.reg);
xe_device_mem_access_put(gt_to_xe(gt));
freq = REG_FIELD_GET(REQ_RATIO_MASK, freq);
ret = sysfs_emit(buf, "%d\n", decode_freq(freq));
XE_WARN_ON(xe_force_wake_put(gt_to_fw(gt), XE_FORCEWAKE_ALL));
out:
xe_device_mem_access_put(gt_to_xe(gt));
return ret;
}
static DEVICE_ATTR_RO(freq_cur);
@@ -610,17 +610,17 @@ static ssize_t rc6_residency_show(struct device *dev,
u32 reg;
ssize_t ret;
xe_device_mem_access_get(pc_to_xe(pc));
ret = xe_force_wake_get(gt_to_fw(gt), XE_FORCEWAKE_ALL);
if (ret)
return ret;
goto out;
xe_device_mem_access_get(pc_to_xe(pc));
reg = xe_mmio_read32(gt, GEN6_GT_GFX_RC6.reg);
xe_device_mem_access_put(pc_to_xe(pc));
ret = sysfs_emit(buff, "%u\n", reg);
XE_WARN_ON(xe_force_wake_put(gt_to_fw(gt), XE_FORCEWAKE_ALL));
out:
xe_device_mem_access_put(pc_to_xe(pc));
return ret;
}
static DEVICE_ATTR_RO(rc6_residency);