Commit ff4e0caf authored by Rodrigo Vivi's avatar Rodrigo Vivi

drm/i915/slpc: Fix inconsistent locked return

Fix for intel_guc_slpc_set_min_freq() warn:
inconsistent returns '&slpc->lock'.

v2: Avoid with_intel_runtime_pm with the
    internal goto/return. (Ashutosh)
    Also standardize the 'ret' if this came from
    the efficient setup. And avoid the 'unlikely'.

Fixes: 95ccf312 ("drm/i915/guc/slpc: Allow SLPC to use efficient frequency")
Reported-by: default avatarkernel test robot <lkp@intel.com>
Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Cc: Ashutosh Dixit <ashutosh.dixit@intel.com>
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: default avatarAshutosh Dixit <ashutosh.dixit@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220830193537.52201-1-rodrigo.vivi@intel.com
parent 73c7a8a8
...@@ -467,33 +467,33 @@ int intel_guc_slpc_set_min_freq(struct intel_guc_slpc *slpc, u32 val) ...@@ -467,33 +467,33 @@ int intel_guc_slpc_set_min_freq(struct intel_guc_slpc *slpc, u32 val)
/* Need a lock now since waitboost can be modifying min as well */ /* Need a lock now since waitboost can be modifying min as well */
mutex_lock(&slpc->lock); mutex_lock(&slpc->lock);
wakeref = intel_runtime_pm_get(&i915->runtime_pm);
with_intel_runtime_pm(&i915->runtime_pm, wakeref) {
/* Ignore efficient freq if lower min freq is requested */
/* Ignore efficient freq if lower min freq is requested */ ret = slpc_set_param(slpc,
ret = slpc_set_param(slpc, SLPC_PARAM_IGNORE_EFFICIENT_FREQUENCY,
SLPC_PARAM_IGNORE_EFFICIENT_FREQUENCY, val < slpc->rp1_freq);
val < slpc->rp1_freq); if (ret) {
if (unlikely(ret)) { i915_probe_error(i915, "Failed to toggle efficient freq (%pe)\n",
i915_probe_error(i915, "Failed to toggle efficient freq (%pe)\n", ERR_PTR(ret));
ERR_PTR(ret)); goto out;
return ret;
}
ret = slpc_set_param(slpc,
SLPC_PARAM_GLOBAL_MIN_GT_UNSLICE_FREQ_MHZ,
val);
/* Return standardized err code for sysfs calls */
if (ret)
ret = -EIO;
} }
ret = slpc_set_param(slpc,
SLPC_PARAM_GLOBAL_MIN_GT_UNSLICE_FREQ_MHZ,
val);
if (!ret) if (!ret)
slpc->min_freq_softlimit = val; slpc->min_freq_softlimit = val;
out:
intel_runtime_pm_put(&i915->runtime_pm, wakeref);
mutex_unlock(&slpc->lock); mutex_unlock(&slpc->lock);
/* Return standardized err code for sysfs calls */
if (ret)
ret = -EIO;
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment