UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/i915/uc: Add init/fini to to intel_uc_ops 

uC preparation and cleanup steps are only meaningful if we are
running with uC enabled. Make these functions part of the uc_ops.

Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20200110222723.14724-4-michal.wajdeczko@intel.com
This commit is contained in:
Michal Wajdeczko 2020-01-10 22:27:22 +00:00 committed by Chris Wilson
parent 39ddb86320
commit cc93f7b040
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/gpu/drm/i915/gt/uc/intel_uc.c
View File

@ -273,14 +273,13 @@ static void __uc_cleanup_firmwares(struct intel_uc *uc)
intel_uc_fw_cleanup_fetch(&uc->guc.fw); intel_uc_fw_cleanup_fetch(&uc->guc.fw);
} }
void intel_uc_init(struct intel_uc *uc) static void __uc_init(struct intel_uc *uc)
{ {
struct intel_guc *guc = &uc->guc; struct intel_guc *guc = &uc->guc;
struct intel_huc *huc = &uc->huc; struct intel_huc *huc = &uc->huc;
int ret; int ret;
if (!intel_uc_uses_guc(uc)) GEM_BUG_ON(!intel_uc_uses_guc(uc));
return;
/* XXX: GuC submission is unavailable for now */ /* XXX: GuC submission is unavailable for now */
GEM_BUG_ON(intel_uc_supports_guc_submission(uc)); GEM_BUG_ON(intel_uc_supports_guc_submission(uc));
@ -295,7 +294,7 @@ void intel_uc_init(struct intel_uc *uc)
intel_huc_init(huc); intel_huc_init(huc);
} }
void intel_uc_fini(struct intel_uc *uc) static void __uc_fini(struct intel_uc *uc)
{ {
intel_huc_fini(&uc->huc); intel_huc_fini(&uc->huc);
intel_guc_fini(&uc->guc); intel_guc_fini(&uc->guc);
@ -619,6 +618,9 @@ static const struct intel_uc_ops uc_ops_on = {
.init_fw = __uc_fetch_firmwares, .init_fw = __uc_fetch_firmwares,
.fini_fw = __uc_cleanup_firmwares, .fini_fw = __uc_cleanup_firmwares,
.init = __uc_init,
.fini = __uc_fini,
.init_hw = __uc_init_hw, .init_hw = __uc_init_hw,
.fini_hw = __uc_fini_hw, .fini_hw = __uc_fini_hw,
}; };

6
drivers/gpu/drm/i915/gt/uc/intel_uc.h
View File

@ -15,6 +15,8 @@ struct intel_uc;
struct intel_uc_ops { struct intel_uc_ops {
void (*init_fw)(struct intel_uc *uc); void (*init_fw)(struct intel_uc *uc);
void (*fini_fw)(struct intel_uc *uc); void (*fini_fw)(struct intel_uc *uc);
void (*init)(struct intel_uc *uc);
void (*fini)(struct intel_uc *uc);
int (*init_hw)(struct intel_uc *uc); int (*init_hw)(struct intel_uc *uc);
void (*fini_hw)(struct intel_uc *uc); void (*fini_hw)(struct intel_uc *uc);
}; };
@ -32,8 +34,6 @@ void intel_uc_init_early(struct intel_uc *uc);
void intel_uc_driver_late_release(struct intel_uc *uc); void intel_uc_driver_late_release(struct intel_uc *uc);
void intel_uc_init_mmio(struct intel_uc *uc); void intel_uc_init_mmio(struct intel_uc *uc);
void intel_uc_sanitize(struct intel_uc *uc); void intel_uc_sanitize(struct intel_uc *uc);
void intel_uc_init(struct intel_uc *uc);
void intel_uc_fini(struct intel_uc *uc);
void intel_uc_reset_prepare(struct intel_uc *uc); void intel_uc_reset_prepare(struct intel_uc *uc);
void intel_uc_suspend(struct intel_uc *uc); void intel_uc_suspend(struct intel_uc *uc);
void intel_uc_runtime_suspend(struct intel_uc *uc); void intel_uc_runtime_suspend(struct intel_uc *uc);
@ -79,6 +79,8 @@ static inline _TYPE intel_uc_##_NAME(struct intel_uc *uc) \
} }
intel_uc_ops_function(fetch_firmwares, init_fw, void, ); intel_uc_ops_function(fetch_firmwares, init_fw, void, );
intel_uc_ops_function(cleanup_firmwares, fini_fw, void, ); intel_uc_ops_function(cleanup_firmwares, fini_fw, void, );
intel_uc_ops_function(init, init, void, );
intel_uc_ops_function(fini, fini, void, );
intel_uc_ops_function(init_hw, init_hw, int, 0); intel_uc_ops_function(init_hw, init_hw, int, 0);
intel_uc_ops_function(fini_hw, fini_hw, void, ); intel_uc_ops_function(fini_hw, fini_hw, void, );
#undef intel_uc_ops_function #undef intel_uc_ops_function