]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
drm/xe: Move hw_engine_fini to devm managed
authorMatthew Brost <matthew.brost@intel.com>
Tue, 20 Aug 2024 17:29:56 +0000 (10:29 -0700)
committerMatthew Brost <matthew.brost@intel.com>
Fri, 23 Aug 2024 16:54:13 +0000 (09:54 -0700)
Kernel BOs are destroyed with GGTT mappings, this is hardware
interaction so use devm.

Signed-off-by: Matthew Brost <matthew.brost@intel.com>
Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240820172958.1095143-5-matthew.brost@intel.com
drivers/gpu/drm/xe/xe_hw_engine.c

index aa9b2b16a6e0fcaea141b36d97df7bc34cb17b78..18980238a2ea1b937e2a38abc965fd48061d41a9 100644 (file)
@@ -267,7 +267,7 @@ static const struct engine_info engine_infos[] = {
        },
 };
 
-static void hw_engine_fini(struct drm_device *drm, void *arg)
+static void hw_engine_fini(void *arg)
 {
        struct xe_hw_engine *hwe = arg;
 
@@ -585,7 +585,7 @@ static int hw_engine_init(struct xe_gt *gt, struct xe_hw_engine *hwe,
        if (xe->info.has_usm && hwe->class == XE_ENGINE_CLASS_COPY)
                gt->usm.reserved_bcs_instance = hwe->instance;
 
-       return drmm_add_action_or_reset(&xe->drm, hw_engine_fini, hwe);
+       return devm_add_action_or_reset(xe->drm.dev, hw_engine_fini, hwe);
 
 err_kernel_lrc:
        xe_lrc_put(hwe->kernel_lrc);