Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e3f503f1 authored by Daniele Ceraolo Spurio's avatar Daniele Ceraolo Spurio Committed by Chris Wilson
Browse files

drm/i915/uc: replace uc init/fini misc 



The "misc" terminology doesn't clearly explain what we intend to cover
in this phase. The only thing we used ot do in there apart from FW fetch
was initializing the log workqueue, with the latter being required only in
the very rare case where we enable the log relay. As we no longer create
our own workqueue, piggybacking on the system_highpri_wq instead, we can
rename the function to clarify that they only fetch/release the blobs.

v2: only create log wq when needed (Michal), reword commit msg
accordingly
v3: after rebase the wq is gone, reword commit msg accordingly

Signed-off-by: default avatarDaniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190713100016.8026-2-chris@chris-wilson.co.uk


Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent a30eff49

drivers/gpu/drm/i915/i915_gem.c

+5 −7
Original line number Diff line number Diff line
@@ -1433,13 +1433,11 @@ int i915_gem_init(struct drm_i915_private *dev_priv) 
	if (ret)

		return ret;



	ret = intel_uc_init_misc(dev_priv);

	if (ret)

		return ret;

	intel_uc_fetch_firmwares(dev_priv);



	ret = intel_wopcm_init(&dev_priv->wopcm);

	if (ret)

		goto err_uc_misc;

		goto err_uc_fw;



	/* This is just a security blanket to placate dragons.

	 * On some systems, we very sporadically observe that the first TLBs
@@ -1565,8 +1563,8 @@ int i915_gem_init(struct drm_i915_private *dev_priv) 
	intel_uncore_forcewake_put(&dev_priv->uncore, FORCEWAKE_ALL);

	mutex_unlock(&dev_priv->drm.struct_mutex);



err_uc_misc:

	intel_uc_fini_misc(dev_priv);

err_uc_fw:

	intel_uc_cleanup_firmwares(dev_priv);



	if (ret != -EIO) {

		i915_gem_cleanup_userptr(dev_priv);
@@ -1632,7 +1630,7 @@ void i915_gem_driver_release(struct drm_i915_private *dev_priv) 


	intel_cleanup_gt_powersave(dev_priv);



	intel_uc_fini_misc(dev_priv);

	intel_uc_cleanup_firmwares(dev_priv);

	i915_gem_cleanup_userptr(dev_priv);

	intel_timelines_fini(dev_priv);

drivers/gpu/drm/i915/intel_guc.c

+0 −14
Original line number Diff line number Diff line
@@ -99,20 +99,6 @@ void intel_guc_init_early(struct intel_guc *guc) 
	}

}



int intel_guc_init_misc(struct intel_guc *guc)

{

	struct drm_i915_private *i915 = guc_to_i915(guc);



	intel_uc_fw_fetch(i915, &guc->fw);



	return 0;

}



void intel_guc_fini_misc(struct intel_guc *guc)

{

	intel_uc_fw_cleanup_fetch(&guc->fw);

}



static int guc_shared_data_create(struct intel_guc *guc)

{

	struct i915_vma *vma;

drivers/gpu/drm/i915/intel_guc.h

+0 −2
Original line number Diff line number Diff line
@@ -153,10 +153,8 @@ static inline u32 intel_guc_ggtt_offset(struct intel_guc *guc, 
void intel_guc_init_early(struct intel_guc *guc);

void intel_guc_init_send_regs(struct intel_guc *guc);

void intel_guc_init_params(struct intel_guc *guc);

int intel_guc_init_misc(struct intel_guc *guc);

int intel_guc_init(struct intel_guc *guc);

void intel_guc_fini(struct intel_guc *guc);

void intel_guc_fini_misc(struct intel_guc *guc);

int intel_guc_send_nop(struct intel_guc *guc, const u32 *action, u32 len,

		       u32 *response_buf, u32 response_buf_size);

int intel_guc_send_mmio(struct intel_guc *guc, const u32 *action, u32 len,

drivers/gpu/drm/i915/intel_huc.c

+0 −8
Original line number Diff line number Diff line
@@ -44,14 +44,6 @@ void intel_huc_init_early(struct intel_huc *huc) 
	}

}



int intel_huc_init_misc(struct intel_huc *huc)

{

	struct drm_i915_private *i915 = huc_to_i915(huc);



	intel_uc_fw_fetch(i915, &huc->fw);

	return 0;

}



static int intel_huc_rsa_data_create(struct intel_huc *huc)

{

	struct drm_i915_private *i915 = huc_to_i915(huc);

drivers/gpu/drm/i915/intel_huc.h

+0 −6
Original line number Diff line number Diff line
@@ -45,17 +45,11 @@ struct intel_huc { 
};



void intel_huc_init_early(struct intel_huc *huc);

int intel_huc_init_misc(struct intel_huc *huc);

int intel_huc_init(struct intel_huc *huc);

void intel_huc_fini(struct intel_huc *huc);

int intel_huc_auth(struct intel_huc *huc);

int intel_huc_check_status(struct intel_huc *huc);



static inline void intel_huc_fini_misc(struct intel_huc *huc)

{

	intel_uc_fw_cleanup_fetch(&huc->fw);

}



static inline int intel_huc_sanitize(struct intel_huc *huc)

{

	intel_uc_fw_sanitize(&huc->fw);