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

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

drm/i915/uc: Sanitize uC together with GEM 



Instead of dancing around uC on reset/suspend/resume scenarios,
explicitly sanitize uC when we sanitize GEM to force uC reload
and start from known beginning.

v2: don't forget about reset path (Daniele)
    sanitize uc before gem initiated full reset (Daniele)
v3: drop redundant disable_communication in init_hw (Daniele)

Signed-off-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Sagar Arun Kamble <sagar.a.kamble@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Michel Thierry <michel.thierry@intel.com>
Reviewed-by: default avatarDaniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20180312130308.22952-3-michal.wajdeczko@intel.com
parent 3c33fc7c

drivers/gpu/drm/i915/i915_gem.c

+2 −0
Original line number Diff line number Diff line
@@ -2998,6 +2998,7 @@ int i915_gem_reset_prepare(struct drm_i915_private *dev_priv) 
	}



	i915_gem_revoke_fences(dev_priv);

	intel_uc_sanitize(dev_priv);



	return err;

}
@@ -4978,6 +4979,7 @@ int i915_gem_suspend(struct drm_i915_private *dev_priv) 
	 * machines is a good idea, we don't - just in case it leaves the

	 * machine in an unusable condition.

	 */

	intel_uc_sanitize(dev_priv);

	i915_gem_sanitize(dev_priv);



	intel_runtime_pm_put(dev_priv);

drivers/gpu/drm/i915/intel_guc.h

+6 −0
Original line number Diff line number Diff line
@@ -133,4 +133,10 @@ int intel_guc_resume(struct intel_guc *guc); 
struct i915_vma *intel_guc_allocate_vma(struct intel_guc *guc, u32 size);

u32 intel_guc_wopcm_size(struct drm_i915_private *dev_priv);



static inline int intel_guc_sanitize(struct intel_guc *guc)

{

	intel_uc_fw_sanitize(&guc->fw);

	return 0;

}



#endif

drivers/gpu/drm/i915/intel_huc.h

+6 −0
Original line number Diff line number Diff line
@@ -38,4 +38,10 @@ struct intel_huc { 
void intel_huc_init_early(struct intel_huc *huc);

int intel_huc_auth(struct intel_huc *huc);



static inline int intel_huc_sanitize(struct intel_huc *huc)

{

	intel_uc_fw_sanitize(&huc->fw);

	return 0;

}



#endif

drivers/gpu/drm/i915/intel_uc.c

+18 −1
Original line number Diff line number Diff line
@@ -334,6 +334,24 @@ void intel_uc_fini(struct drm_i915_private *dev_priv) 
	intel_guc_fini(guc);

}



void intel_uc_sanitize(struct drm_i915_private *i915)

{

	struct intel_guc *guc = &i915->guc;

	struct intel_huc *huc = &i915->huc;



	if (!USES_GUC(i915))

		return;



	GEM_BUG_ON(!HAS_GUC(i915));



	guc_disable_communication(guc);



	intel_huc_sanitize(huc);

	intel_guc_sanitize(guc);



	__intel_uc_reset_hw(i915);

}



int intel_uc_init_hw(struct drm_i915_private *dev_priv)

{

	struct intel_guc *guc = &dev_priv->guc;
@@ -345,7 +363,6 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv) 


	GEM_BUG_ON(!HAS_GUC(dev_priv));



	guc_disable_communication(guc);

	gen9_reset_guc_interrupts(dev_priv);



	/* init WOPCM */

drivers/gpu/drm/i915/intel_uc.h

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ void intel_uc_init_fw(struct drm_i915_private *dev_priv); 
void intel_uc_fini_fw(struct drm_i915_private *dev_priv);

int intel_uc_init_misc(struct drm_i915_private *dev_priv);

void intel_uc_fini_misc(struct drm_i915_private *dev_priv);

void intel_uc_sanitize(struct drm_i915_private *dev_priv);

int intel_uc_init_hw(struct drm_i915_private *dev_priv);

void intel_uc_fini_hw(struct drm_i915_private *dev_priv);

int intel_uc_init(struct drm_i915_private *dev_priv);