Commit cc93f7b0 authored by Michal Wajdeczko's avatar Michal Wajdeczko Committed by Chris Wilson
Browse files

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: default avatarMichal 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: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20200110222723.14724-4-michal.wajdeczko@intel.com
parent 39ddb863

drivers/gpu/drm/i915/gt/uc/intel_uc.c

+6 −4
Original line number Diff line number Diff line
@@ -273,14 +273,13 @@ static void __uc_cleanup_firmwares(struct intel_uc *uc) 
	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_huc *huc = &uc->huc;

	int ret;



	if (!intel_uc_uses_guc(uc))

		return;

	GEM_BUG_ON(!intel_uc_uses_guc(uc));



	/* XXX: GuC submission is unavailable for now */

	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);

}



void intel_uc_fini(struct intel_uc *uc)

static void __uc_fini(struct intel_uc *uc)

{

	intel_huc_fini(&uc->huc);

	intel_guc_fini(&uc->guc);
@@ -619,6 +618,9 @@ static const struct intel_uc_ops uc_ops_on = { 
	.init_fw = __uc_fetch_firmwares,

	.fini_fw = __uc_cleanup_firmwares,



	.init = __uc_init,

	.fini = __uc_fini,



	.init_hw = __uc_init_hw,

	.fini_hw = __uc_fini_hw,

};

drivers/gpu/drm/i915/gt/uc/intel_uc.h

+4 −2
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ struct intel_uc; 
struct intel_uc_ops {

	void (*init_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);

	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_init_mmio(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_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(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(fini_hw, fini_hw, void, );

#undef intel_uc_ops_function

CRA Git | Maintained and supported by SUSTech CRA and CCSE