Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/xe: Cleanup extra calls to xe_hw_fence_irq_finish()

Now that xe_gt_remove is handled entirely by xe_gt, it's clear there are
some extra calls to xe_hw_fence_irq_finish() that aren't necessary.
Neither all_fw_domain_init() or gt_fw_domain_init() need to do that
since it's handled by the caller on any error.

Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Himal Prasad Ghimiray <himal.prasad.ghimiray@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250213192909.996148-8-lucas.demarchi@intel.com
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>

+4 -11
+4 -11
drivers/gpu/drm/xe/xe_gt.c
··· 389 389 static int gt_fw_domain_init(struct xe_gt *gt) 390 390 { 391 391 unsigned int fw_ref; 392 - int err, i; 392 + int err; 393 393 394 394 fw_ref = xe_force_wake_get(gt_to_fw(gt), XE_FW_GT); 395 - if (!fw_ref) { 396 - err = -ETIMEDOUT; 397 - goto err_hw_fence_irq; 398 - } 395 + if (!fw_ref) 396 + return -ETIMEDOUT; 399 397 400 398 if (!xe_gt_is_media_type(gt)) { 401 399 err = xe_ggtt_init(gt_to_tile(gt)->mem.ggtt); ··· 434 436 err_force_wake: 435 437 dump_pat_on_error(gt); 436 438 xe_force_wake_put(gt_to_fw(gt), fw_ref); 437 - err_hw_fence_irq: 438 - for (i = 0; i < XE_ENGINE_CLASS_MAX; ++i) 439 - xe_hw_fence_irq_finish(&gt->fence_irq[i]); 440 439 441 440 return err; 442 441 } ··· 441 446 static int all_fw_domain_init(struct xe_gt *gt) 442 447 { 443 448 unsigned int fw_ref; 444 - int err, i; 449 + int err; 445 450 446 451 fw_ref = xe_force_wake_get(gt_to_fw(gt), XE_FORCEWAKE_ALL); 447 452 if (!xe_force_wake_ref_has_domain(fw_ref, XE_FORCEWAKE_ALL)) { ··· 519 524 520 525 err_force_wake: 521 526 xe_force_wake_put(gt_to_fw(gt), fw_ref); 522 - for (i = 0; i < XE_ENGINE_CLASS_MAX; ++i) 523 - xe_hw_fence_irq_finish(&gt->fence_irq[i]); 524 527 525 528 return err; 526 529 }