File tree 3 files changed +7
-6
lines changed
drivers/gpu/drm/i915/gt/uc
3 files changed +7
-6
lines changed Original file line number Diff line number Diff line change @@ -317,6 +317,11 @@ void intel_huc_init_early(struct intel_huc *huc)
317
317
}
318
318
}
319
319
320
+ void intel_huc_fini_late (struct intel_huc * huc )
321
+ {
322
+ delayed_huc_load_fini (huc );
323
+ }
324
+
320
325
#define HUC_LOAD_MODE_STRING (x ) (x ? "GSC" : "legacy")
321
326
static int check_huc_loading_mode (struct intel_huc * huc )
322
327
{
@@ -414,12 +419,6 @@ int intel_huc_init(struct intel_huc *huc)
414
419
415
420
void intel_huc_fini (struct intel_huc * huc )
416
421
{
417
- /*
418
- * the fence is initialized in init_early, so we need to clean it up
419
- * even if HuC loading is off.
420
- */
421
- delayed_huc_load_fini (huc );
422
-
423
422
if (huc -> heci_pkt )
424
423
i915_vma_unpin_and_release (& huc -> heci_pkt , 0 );
425
424
Original file line number Diff line number Diff line change @@ -55,6 +55,7 @@ struct intel_huc {
55
55
56
56
int intel_huc_sanitize (struct intel_huc * huc );
57
57
void intel_huc_init_early (struct intel_huc * huc );
58
+ void intel_huc_fini_late (struct intel_huc * huc );
58
59
int intel_huc_init (struct intel_huc * huc );
59
60
void intel_huc_fini (struct intel_huc * huc );
60
61
int intel_huc_auth (struct intel_huc * huc , enum intel_huc_authentication_type type );
Original file line number Diff line number Diff line change @@ -136,6 +136,7 @@ void intel_uc_init_late(struct intel_uc *uc)
136
136
137
137
void intel_uc_driver_late_release (struct intel_uc * uc )
138
138
{
139
+ intel_huc_fini_late (& uc -> huc );
139
140
}
140
141
141
142
/**
You can’t perform that action at this time.
0 commit comments