drm/xe: Fix error path in xe_guc_pc_gucrc_disable()
authorLucas De Marchi <lucas.demarchi@intel.com>
Thu, 3 Aug 2023 23:42:08 +0000 (16:42 -0700)
committerRodrigo Vivi <rodrigo.vivi@intel.com>
Thu, 21 Dec 2023 16:39:29 +0000 (11:39 -0500)
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>
drivers/gpu/drm/xe/xe_guc_pc.c

index 91a3967..19d743f 100644 (file)
@@ -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)