[PATCH] drm/xe: Add missing runtime reference to wedged upon gt_reset

[Ghimiray, Himal Prasad]

On 28-08-2024 23:02, Rodrigo Vivi wrote:
> Fixes this missed case:
> 
> xe 0000:00:02.0: [drm] Missing outer runtime PM protection
> WARNING: CPU: 99 PID: 1455 at drivers/gpu/drm/xe/xe_pm.c:564 xe_pm_runtime_get_noresume+0x48/0x60 [xe]
> Call Trace:
> <TASK>
> ? show_regs+0x67/0x70
> ? __warn+0x94/0x1b0
> ? xe_pm_runtime_get_noresume+0x48/0x60 [xe]
> ? report_bug+0x1b7/0x1d0
> ? handle_bug+0x46/0x80
> ? exc_invalid_op+0x19/0x70
> ? asm_exc_invalid_op+0x1b/0x20
> ? xe_pm_runtime_get_noresume+0x48/0x60 [xe]
> xe_device_declare_wedged+0x91/0x280 [xe]
> gt_reset_worker+0xa2/0x250 [xe]
> 
> Fixes: da4b21f402c6 ("drm/xe: Add missing runtime reference to wedged upon gt_reset")

Hi Rodrigo,

fixes tag looks wrong, "drm/xe: Add missing runtime reference to wedged 
upon gt_reset" is this patch.


> Cc: Himal Prasad Ghimiray <himal.prasad.ghimiray at intel.com>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi at intel.com>
> ---
>   drivers/gpu/drm/xe/xe_gt.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_gt.c b/drivers/gpu/drm/xe/xe_gt.c
> index 224c137967c3..a895704bf64f 100644
> --- a/drivers/gpu/drm/xe/xe_gt.c
> +++ b/drivers/gpu/drm/xe/xe_gt.c
> @@ -794,11 +794,11 @@ static int gt_reset(struct xe_gt *gt)
>   	XE_WARN_ON(xe_force_wake_put(gt_to_fw(gt), XE_FORCEWAKE_ALL));
>   err_msg:
>   	XE_WARN_ON(xe_uc_start(&gt->uc));
> -	xe_pm_runtime_put(gt_to_xe(gt));
>   err_fail:
>   	xe_gt_err(gt, "reset failed (%pe)\n", ERR_PTR(err));
>   
>   	xe_device_declare_wedged(gt_to_xe(gt));
> +	xe_pm_runtime_put(gt_to_xe(gt));


AFAIU, this looks incomplete, xe_pm_runtime_get() should also move 
before if (xe_fault_inject_gt_reset()).

Thanks

>   
>   	return err;
>   }