[Intel-xe] [PATCH 3/8] RFC drm/xe/guc: Expose engine busyness only for supported GuC version

[Riana Tauro]

On 11/28/2023 3:17 PM, Matthew Brost wrote:
> On Mon, Nov 27, 2023 at 07:41:20PM +0530, Riana Tauro wrote:
>> Engine busyness is supported only on GuC versions >= 70.11.1.
>> Allow enabling/reading engine busyness only on supported
>> GuC versions. Warn once if not supported.
>>
>> Cc: John Harrison <John.C.Harrison at Intel.com>
>> Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio at intel.com>
>> Signed-off-by: Riana Tauro <riana.tauro at intel.com>
>> ---
>>   drivers/gpu/drm/xe/xe_guc_engine_busyness.c | 29 +++++++++++++++++++++
>>   1 file changed, 29 insertions(+)
>>
>> diff --git a/drivers/gpu/drm/xe/xe_guc_engine_busyness.c b/drivers/gpu/drm/xe/xe_guc_engine_busyness.c
>> index 92b37e55fa08..611bafd14d1a 100644
>> --- a/drivers/gpu/drm/xe/xe_guc_engine_busyness.c
>> +++ b/drivers/gpu/drm/xe/xe_guc_engine_busyness.c
>> @@ -22,6 +22,23 @@
>>    * engine busyness ticks (ticks_engine) : clock ticks for which engine was active
>>    */
>>   
>> +static bool guc_engine_busyness_supported(struct xe_guc *guc)
>> +{
>> +	struct xe_uc_fw *uc_fw = &guc->fw;
>> +
>> +	/* Must not call this before the submit version is determined! */
>> +	XE_WARN_ON(guc->submission_state.version.major == 0);
>> +
>> +	if (uc_fw->major_ver_found >= 70 && uc_fw->minor_ver_found >= 11 &&
>> +	    uc_fw->patch_ver_found >= 1)
> 
> This doesn't look correct. e.g. on Version 71.0.0 this function would return false.
> 

oops sorry missed that. Thanks for catching this.
Will fix it

Thanks
Riana
> Matt
> 
>> +		return true;
>> +
>> +	drm_WARN_ON_ONCE(&guc_to_xe(guc)->drm,
>> +			 "Engine busyness not supported in this GuC version\n");
>> +
>> +	return false;
>> +}
>> +
>>   static void guc_engine_busyness_usage_map(struct xe_guc *guc,
>>   					  struct xe_hw_engine *hwe,
>>   					  struct iosys_map *engine_map)
>> @@ -79,6 +96,10 @@ static void guc_engine_busyness_enable_stats(struct xe_guc *guc)
>>   	struct xe_device *xe = guc_to_xe(guc);
>>   	int ret;
>>   
>> +	/* Engine busyness supported only on GuC >= 70.11.1 */
>> +	if (!guc_engine_busyness_supported(guc))
>> +		return;
>> +
>>   	ret = xe_guc_ct_send(&guc->ct, action, ARRAY_SIZE(action), 0, 0);
>>   	if (ret)
>>   		drm_err(&xe->drm, "Failed to enable usage stats %pe", ERR_PTR(ret));
>> @@ -103,6 +124,10 @@ u64 xe_guc_engine_busyness_ticks(struct xe_guc *guc, struct xe_hw_engine *hwe)
>>   {
>>   	u64 ticks_engine;
>>   
>> +	/* Engine busyness supported only on GuC >= 70.11.1 */
>> +	if (!guc_engine_busyness_supported(guc))
>> +		return 0;
>> +
>>   	guc_engine_busyness_get_usage(guc, hwe, &ticks_engine);
>>   
>>   	return ticks_engine;
>> @@ -126,6 +151,10 @@ int xe_guc_engine_busyness_init(struct xe_guc *guc)
>>   	u32 size;
>>   	int err;
>>   
>> +	/* Engine busyness supported only on GuC >= 70.11.1 */
>> +	if (!guc_engine_busyness_supported(guc))
>> +		return 0;
>> +
>>   	/* Initialization already done */
>>   	if (guc->busy.bo)
>>   		return 0;
>> -- 
>> 2.40.0
>>