[PATCH v2 6.12 3/3] drm/xe/hw_engine_group: Avoid call kfree() for drmm_kzalloc()

[Mikhail Dmitrichenko]

From: Shuicheng Lin <shuicheng....@intel.com>

commit 4846856c3a4afa882b6d1b842ed2fad6f3781f4d upstream.

Memory allocated with drmm_kzalloc() should not be freed using
kfree(), as it is managed by the DRM subsystem. The memory will
be automatically freed when the associated drm_device is released.
These 3 group pointers are allocated using drmm_kzalloc() in
hw_engine_group_alloc(), so they don't require manual deallocation.

Fixes: 67979060740f ("drm/xe/hw_engine_group: Fix potential leak")
Signed-off-by: Shuicheng Lin <shuicheng....@intel.com>
Reviewed-by: Matthew Brost <matthew.br...@intel.com>
Signed-off-by: Michal Wajdeczko <michal.wajdec...@intel.com>
Link: https://lore.kernel.org/r/20250724193854.1124510-2-shuicheng....@intel.com
(cherry picked from commit f98de826b418885a21ece67f0f5b921ae759b7bf)
Signed-off-by: Rodrigo Vivi <rodrigo.v...@intel.com>
Signed-off-by: Mikhail Dmitrichenko <mdmitriche...@astralinux.ru>
---
v2: upstream commit 67979060740f7f978c8cb580ccea6c91154150f9 was
included in PATCH v2 2/3 because it also doesn't present in 6.12 
and commit 4846856c3a4afa882b6d1b842ed2fad6f3781f4d fixes
issue from 67979060740f7f978c8cb580ccea6c91154150f9. Upstream
commit c367b772e6d89d8c7b560c7df7e3803ce6b8bcea was included
in PATCH v2 1/3 because changes from 
67979060740f7f978c8cb580ccea6c91154150f9 require __drmm_workqueue_release.
 drivers/gpu/drm/xe/xe_hw_engine_group.c | 28 ++++++-------------------
 1 file changed, 6 insertions(+), 22 deletions(-)

diff --git a/drivers/gpu/drm/xe/xe_hw_engine_group.c 
b/drivers/gpu/drm/xe/xe_hw_engine_group.c
index 9ace3993caee..eef3a6479bfd 100644
--- a/drivers/gpu/drm/xe/xe_hw_engine_group.c
+++ b/drivers/gpu/drm/xe/xe_hw_engine_group.c
@@ -75,25 +75,18 @@ int xe_hw_engine_setup_groups(struct xe_gt *gt)
        enum xe_hw_engine_id id;
        struct xe_hw_engine_group *group_rcs_ccs, *group_bcs, *group_vcs_vecs;
        struct xe_device *xe = gt_to_xe(gt);
-       int err;
 
        group_rcs_ccs = hw_engine_group_alloc(xe);
-       if (IS_ERR(group_rcs_ccs)) {
-               err = PTR_ERR(group_rcs_ccs);
-               goto err_group_rcs_ccs;
-       }
+       if (IS_ERR(group_rcs_ccs))
+               return PTR_ERR(group_rcs_ccs);
 
        group_bcs = hw_engine_group_alloc(xe);
-       if (IS_ERR(group_bcs)) {
-               err = PTR_ERR(group_bcs);
-               goto err_group_bcs;
-       }
+       if (IS_ERR(group_bcs))
+               return PTR_ERR(group_bcs);
 
        group_vcs_vecs = hw_engine_group_alloc(xe);
-       if (IS_ERR(group_vcs_vecs)) {
-               err = PTR_ERR(group_vcs_vecs);
-               goto err_group_vcs_vecs;
-       }
+       if (IS_ERR(group_vcs_vecs))
+               return PTR_ERR(group_vcs_vecs);
 
        for_each_hw_engine(hwe, gt, id) {
                switch (hwe->class) {
@@ -116,15 +109,6 @@ int xe_hw_engine_setup_groups(struct xe_gt *gt)
        }
 
        return 0;
-
-err_group_vcs_vecs:
-       kfree(group_vcs_vecs);
-err_group_bcs:
-       kfree(group_bcs);
-err_group_rcs_ccs:
-       kfree(group_rcs_ccs);
-
-       return err;
 }
 
 /**
-- 
2.39.2