diff options
| author | Lucas De Marchi <lucas.demarchi@intel.com> | 2023-08-03 16:42:08 -0700 |
|---|---|---|
| committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2023-12-21 11:39:29 -0500 |
| commit | 0c005429005228d7a82e4e8d5d8f24b6192e7aa6 (patch) | |
| tree | b2f80ff4976ecbd8d4ec810812ff653ba8a1ba07 /drivers/gpu/drm/xe/xe_guc_pc.c | |
| parent | d2776564729739f459e108b5ac83bcea57c44bca (diff) | |
drm/xe: Fix error path in xe_guc_pc_gucrc_disable()
Make sure to always call xe_device_mem_access_put(), even on error.
Reviewed-by: Matthew Brost <matthew.brost@intel.com>
Link: https://lore.kernel.org/r/20230803234209.881924-1-lucas.demarchi@intel.com
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Diffstat (limited to 'drivers/gpu/drm/xe/xe_guc_pc.c')
| -rw-r--r-- | drivers/gpu/drm/xe/xe_guc_pc.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/gpu/drm/xe/xe_guc_pc.c b/drivers/gpu/drm/xe/xe_guc_pc.c index 91a3967fd799..19d743f92f43 100644 --- a/drivers/gpu/drm/xe/xe_guc_pc.c +++ b/drivers/gpu/drm/xe/xe_guc_pc.c @@ -745,25 +745,27 @@ static int pc_adjust_requested_freq(struct xe_guc_pc *pc) int xe_guc_pc_gucrc_disable(struct xe_guc_pc *pc) { struct xe_gt *gt = pc_to_gt(pc); - int ret; + int ret = 0; xe_device_mem_access_get(pc_to_xe(pc)); ret = pc_action_setup_gucrc(pc, XE_GUCRC_HOST_CONTROL); if (ret) - return ret; + goto out; ret = xe_force_wake_get(gt_to_fw(gt), XE_FORCEWAKE_ALL); if (ret) - return ret; + goto out; xe_mmio_write32(gt, PG_ENABLE, 0); xe_mmio_write32(gt, RC_CONTROL, 0); xe_mmio_write32(gt, RC_STATE, 0); 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 0; + return ret; } static void pc_init_pcode_freq(struct xe_guc_pc *pc) |