[PATCH 14/20] drm/xe/gt: break out gt_fini into sw vs hw state

[Andrzej Hajda]

On 13.05.2024 10:37, Matthew Auld wrote:
> On 13/05/2024 08:50, Andrzej Hajda wrote:
>> On 10.05.2024 20:12, Matthew Auld wrote:
>>> Have a cleaner separation between hw vs sw.
>>>
>>> Signed-off-by: Matthew Auld <matthew.auld at intel.com>
>>> Cc: Andrzej Hajda <andrzej.hajda at intel.com>
>>> Cc: Rodrigo Vivi <rodrigo.vivi at intel.com>
>>> ---
>>>   drivers/gpu/drm/xe/xe_gt.c | 21 +++++++++++++--------
>>>   1 file changed, 13 insertions(+), 8 deletions(-)
>>>
>>> diff --git a/drivers/gpu/drm/xe/xe_gt.c b/drivers/gpu/drm/xe/xe_gt.c
>>> index 36c7b1631fa6..3f1826b783ad 100644
>>> --- a/drivers/gpu/drm/xe/xe_gt.c
>>> +++ b/drivers/gpu/drm/xe/xe_gt.c
>>> @@ -57,9 +57,17 @@
>>>   #include "xe_wa.h"
>>>   #include "xe_wopcm.h"
>>> +static void gt_fini(struct drm_device *drm, void *arg)
>>> +{
>>> +    struct xe_gt *gt = arg;
>>> +
>>> +    destroy_workqueue(gt->ordered_wq);
>>
>> Do we need this wq after unbind? It seems to be used by hw stuff:
>> - gt_reset
>> - xe_guc_exec_queue_trigger_cleanup
>
> Yeah, my thinking is that for stuff like exec queue we might need to 
> clean it up after unplug? Plus it's just sw state. I can drop for now 
> if you prefer?

OK, no strong feelings.

Reviewed-by: Andrzej Hajda <andrzej.hajda at intel.com>

Regards
Andrzej

>
>>
>> Regards
>> Andrzej
>>
>>> +}
>>> +
>>>   struct xe_gt *xe_gt_alloc(struct xe_tile *tile)
>>>   {
>>>       struct xe_gt *gt;
>>> +    int err;
>>>       gt = drmm_kzalloc(&tile_to_xe(tile)->drm, sizeof(*gt), 
>>> GFP_KERNEL);
>>>       if (!gt)
>>> @@ -68,6 +76,10 @@ struct xe_gt *xe_gt_alloc(struct xe_tile *tile)
>>>       gt->tile = tile;
>>>       gt->ordered_wq = alloc_ordered_workqueue("gt-ordered-wq", 0);
>>> +    err = drmm_add_action_or_reset(&gt_to_xe(gt)->drm, gt_fini, gt);
>>> +    if (err)
>>> +        return ERR_PTR(err);
>>> +
>>>       return gt;
>>>   }
>>> @@ -90,15 +102,9 @@ void xe_gt_sanitize(struct xe_gt *gt)
>>>    */
>>>   void xe_gt_remove(struct xe_gt *gt)
>>>   {
>>> -    xe_uc_remove(&gt->uc);
>>> -}
>>> -
>>> -static void gt_fini(struct drm_device *drm, void *arg)
>>> -{
>>> -    struct xe_gt *gt = arg;
>>>       int i;
>>> -    destroy_workqueue(gt->ordered_wq);
>>> +    xe_uc_remove(&gt->uc);
>>>       for (i = 0; i < XE_ENGINE_CLASS_MAX; ++i)
>>>           xe_hw_fence_irq_finish(&gt->fence_irq[i]);
>>> @@ -567,7 +573,6 @@ int xe_gt_init(struct xe_gt *gt)
>>>       if (err)
>>>           return err;
>>> -    return drmm_add_action_or_reset(&gt_to_xe(gt)->drm, gt_fini, gt);
>>>   }
>>>   static int do_gt_reset(struct xe_gt *gt)
>>