iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/xe: Fix error path in xe_guc_pc_gucrc_disable()

Browse Source 
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>
This commit is contained in:
Lucas De Marchi 2023-08-03 16:42:08 -07:00 committed by Rodrigo Vivi
parent d277656472
commit 0c00542900
1 changed files with 6 additions and 4 deletions

10
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)