Re: [Intel-gfx] [RFC 3/4] drm/i915: Add helpers for managing rps thresholds

Tvrtko Ursulin
2023-05-22T12:00:57Z

On 19/05/2023 21:56, Rodrigo Vivi wrote:
> On Fri, Apr 28, 2023 at 09:14:56AM +0100, Tvrtko Ursulin wrote:
>> From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
>>
>> In preparation for exposing via sysfs add helpers for managing rps
>> thresholds.
>>
>> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
>> ---
>> drivers/gpu/drm/i915/gt/intel_rps.c | 36 +++++++++++++++++++++++++++++
>> drivers/gpu/drm/i915/gt/intel_rps.h | 4 ++++
>> 2 files changed, 40 insertions(+)
>>
>> diff --git a/drivers/gpu/drm/i915/gt/intel_rps.c b/drivers/gpu/drm/i915/gt/intel_rps.c
>> index a39eee444849..a5a7315f5ace 100644
>> --- a/drivers/gpu/drm/i915/gt/intel_rps.c
>> +++ b/drivers/gpu/drm/i915/gt/intel_rps.c
>> @@ -2573,6 +2573,42 @@ int intel_rps_set_min_frequency(struct intel_rps *rps, u32 val)
>> return set_min_freq(rps, val);
>> }
>>
>> +u8 intel_rps_get_up_threshold(struct intel_rps *rps)
>> +{
>> + return rps->power.up_threshold;
>> +}
>> +
>> +static int rps_set_threshold(struct intel_rps *rps, u8 *threshold, u8 val)
>> +{
>> + int ret;
>> +
>> + if (val > 100)
>> + return -EINVAL;
>> +
>> + ret = mutex_lock_interruptible(&rps->lock);
>> + if (ret)
>> + return ret;
>> + *threshold = val;
>> + mutex_unlock(&rps->lock);
>> +
>> + return 0;
>> +}
>> +
>> +int intel_rps_set_up_threshold(struct intel_rps *rps, u8 threshold)
>> +{
>> + return rps_set_threshold(rps, &rps->power.up_threshold, threshold);
>> +}
>> +
>> +u8 intel_rps_get_down_threshold(struct intel_rps *rps)
>> +{
>> + return rps->power.down_threshold;
>> +}
>> +
>> +int intel_rps_set_down_threshold(struct intel_rps *rps, u8 threshold)
>> +{
>> + return rps_set_threshold(rps, &rps->power.down_threshold, threshold);
>> +}
>> +
>
> Isn't this breaking compilation with the unused functions?

I checked and no - guess because they are exported. Would you prefer me
to squash 3&4 so that there isn't a patch which adds unused helpers?

Regards,

Tvrtko

>
>> static void intel_rps_set_manual(struct intel_rps *rps, bool enable)
>> {
>> struct intel_uncore *uncore = rps_to_uncore(rps);
>> diff --git a/drivers/gpu/drm/i915/gt/intel_rps.h b/drivers/gpu/drm/i915/gt/intel_rps.h
>> index a3fa987aa91f..92fb01f5a452 100644
>> --- a/drivers/gpu/drm/i915/gt/intel_rps.h
>> +++ b/drivers/gpu/drm/i915/gt/intel_rps.h
>> @@ -37,6 +37,10 @@ void intel_rps_mark_interactive(struct intel_rps *rps, bool interactive);
>>
>> int intel_gpu_freq(struct intel_rps *rps, int val);
>> int intel_freq_opcode(struct intel_rps *rps, int val);
>> +u8 intel_rps_get_up_threshold(struct intel_rps *rps);
>> +int intel_rps_set_up_threshold(struct intel_rps *rps, u8 threshold);
>> +u8 intel_rps_get_down_threshold(struct intel_rps *rps);
>> +int intel_rps_set_down_threshold(struct intel_rps *rps, u8 threshold);
>> u32 intel_rps_read_actual_frequency(struct intel_rps *rps);
>> u32 intel_rps_read_actual_frequency_fw(struct intel_rps *rps);
>> u32 intel_rps_get_requested_frequency(struct intel_rps *rps);
>> --
>> 2.37.2
>>