[PATCH 2/2] drm/xe: move disable_c6 call

[Riana Tauro]

On 5/13/2024 9:21 PM, Rodrigo Vivi wrote:
> On Mon, May 13, 2024 at 12:35:46PM +0530, Riana Tauro wrote:
>> disable c6 called from guc pc fini on skipping GuC PC is unreachable.
>>
>> GuC pc init call returns earlier if skip_guc_pc is true and never
>> registers the finish call thus making disable_c6 unreachable.
>>
>> move this call to gt idle.
>>
>> Signed-off-by: Riana Tauro <riana.tauro at intel.com>
>> ---
>>   drivers/gpu/drm/xe/xe_gt_idle.c | 11 +++++++++--
>>   drivers/gpu/drm/xe/xe_guc_pc.c  |  5 -----
>>   2 files changed, 9 insertions(+), 7 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/xe/xe_gt_idle.c b/drivers/gpu/drm/xe/xe_gt_idle.c
>> index 2f247cb910d1..0fc865e07965 100644
>> --- a/drivers/gpu/drm/xe/xe_gt_idle.c
>> +++ b/drivers/gpu/drm/xe/xe_gt_idle.c
>> @@ -145,9 +145,16 @@ static const struct attribute *gt_idle_attrs[] = {
>>   	NULL,
>>   };
>>   
>> -static void gt_idle_sysfs_fini(struct drm_device *drm, void *arg)
>> +static void gt_idle_fini(struct drm_device *drm, void *arg)
>>   {
>>   	struct kobject *kobj = arg;
>> +	struct xe_gt *gt = kobj_to_gt(kobj->parent);
>> +
>> +	if (gt_to_xe(gt)->info.skip_guc_pc) {
>> +		xe_gt_WARN_ON(gt, xe_force_wake_get(gt_to_fw(gt), XE_FW_GT));
>> +		xe_gt_idle_disable_c6(gt);
>> +		xe_force_wake_put(gt_to_fw(gt), XE_FW_GT);
>> +	}
>>   
>>   	sysfs_remove_files(kobj, gt_idle_attrs);
>>   	kobject_put(kobj);
>> @@ -182,7 +189,7 @@ int xe_gt_idle_sysfs_init(struct xe_gt_idle *gtidle)
>>   		return err;
>>   	}
>>   
>> -	return drmm_add_action_or_reset(&xe->drm, gt_idle_sysfs_fini, kobj);
>> +	return drmm_add_action_or_reset(&xe->drm, gt_idle_fini, kobj);
> 
> Cc: Matthew Auld <matthew.auld at intel.com>
> 
> gt_idle (RC6 control) is more a hw thing. shouldn't this also be converted
> towards devm?
> 
> Anyway, it can be a separate patch.
> This patch itself is correct >
> Reviewed-by: Rodrigo Vivi <rodrigo.vivi at intel.com>

Thank you for the review.

Thanks,
Riana
> 
>>   }
>>   
>>   void xe_gt_idle_enable_c6(struct xe_gt *gt)
>> diff --git a/drivers/gpu/drm/xe/xe_guc_pc.c b/drivers/gpu/drm/xe/xe_guc_pc.c
>> index d10aab29651e..d0bc5e3090bd 100644
>> --- a/drivers/gpu/drm/xe/xe_guc_pc.c
>> +++ b/drivers/gpu/drm/xe/xe_guc_pc.c
>> @@ -898,11 +898,6 @@ static void xe_guc_pc_fini(struct drm_device *drm, void *arg)
>>   	struct xe_guc_pc *pc = arg;
>>   	struct xe_device *xe = pc_to_xe(pc);
>>   
>> -	if (xe->info.skip_guc_pc) {
>> -		xe_gt_idle_disable_c6(pc_to_gt(pc));
>> -		return;
>> -	}
>> -
>>   	if (xe_device_wedged(xe))
>>   		return;
>>   
>> -- 
>> 2.40.0
>>