[PATCH] drm/xe: Release force wake first then runtime power

[Rodrigo Vivi]

On Wed, May 07, 2025 at 09:19:31AM +0530, Ghimiray, Himal Prasad wrote:
> 
> 
> On 07-05-2025 07:53, Shuicheng Lin wrote:
> > xe_force_wake_get() is dependent on xe_pm_runtime_get(), so for
> > the release path, xe_force_wake_put() should be called first then
> > xe_pm_runtime_put().
> > Combine the error path and normal path together with goto.
> > 
> > Fixes: 85d547608ef5 ("drm/xe/xe_gt_debugfs: Update handling of xe_force_wake_get return")
> > Cc: Himal Prasad Ghimiray <himal.prasad.ghimiray at intel.com>
> > Cc: Rodrigo Vivi <rodrigo.vivi at intel.com>
> > Signed-off-by: Shuicheng Lin <shuicheng.lin at intel.com>
> 
> LGTM
> Reviewed-by: Himal Prasad Ghimiray <himal.prasad.ghimiray at intel.com>

pushed do drm-xe-next, thanks for the patch and the for the review
> 
> > ---
> >   drivers/gpu/drm/xe/xe_gt_debugfs.c | 9 +++++----
> >   1 file changed, 5 insertions(+), 4 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/xe/xe_gt_debugfs.c b/drivers/gpu/drm/xe/xe_gt_debugfs.c
> > index a88076e9cc7d..119a55bb7580 100644
> > --- a/drivers/gpu/drm/xe/xe_gt_debugfs.c
> > +++ b/drivers/gpu/drm/xe/xe_gt_debugfs.c
> > @@ -92,22 +92,23 @@ static int hw_engines(struct xe_gt *gt, struct drm_printer *p)
> >   	struct xe_hw_engine *hwe;
> >   	enum xe_hw_engine_id id;
> >   	unsigned int fw_ref;
> > +	int ret = 0;
> >   	xe_pm_runtime_get(xe);
> >   	fw_ref = xe_force_wake_get(gt_to_fw(gt), XE_FORCEWAKE_ALL);
> >   	if (!xe_force_wake_ref_has_domain(fw_ref, XE_FORCEWAKE_ALL)) {
> > -		xe_pm_runtime_put(xe);
> > -		xe_force_wake_put(gt_to_fw(gt), fw_ref);
> > -		return -ETIMEDOUT;
> > +		ret = -ETIMEDOUT;
> > +		goto fw_put;
> >   	}
> >   	for_each_hw_engine(hwe, gt, id)
> >   		xe_hw_engine_print(hwe, p);
> > +fw_put:
> >   	xe_force_wake_put(gt_to_fw(gt), fw_ref);
> >   	xe_pm_runtime_put(xe);
> > -	return 0;
> > +	return ret;
> >   }
> >   static int powergate_info(struct xe_gt *gt, struct drm_printer *p)
>