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

Commit ed2ec71f authored by Oscar Mateo's avatar Oscar Mateo Committed by Joonas Lahtinen
Browse files

drm/i915/guc: Wait for doorbell to be inactive before deallocating 



Doorbell release flow requires that we wait for GEN8_DRB_VALID bit to go
to zero after updating db_status before we call the GuC to release the
doorbell.

Kudos to Daniele for finding this out.

v2: WARN instead of DRM_ERROR (Joonas)

Signed-off-by: default avatarOscar Mateo <oscar.mateo@intel.com>
Reviewed-by: default avatarDaniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Reviewed-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
parent 0d768126

drivers/gpu/drm/i915/i915_guc_submission.c

+10 −0
Original line number Original line Diff line number Diff line
@@ -206,12 +206,22 @@ static int __create_doorbell(struct i915_guc_client *client) 




static int __destroy_doorbell(struct i915_guc_client *client)

static int __destroy_doorbell(struct i915_guc_client *client)

{

{

	struct drm_i915_private *dev_priv = guc_to_i915(client->guc);

	struct guc_doorbell_info *doorbell;

	struct guc_doorbell_info *doorbell;

	u16 db_id = client->doorbell_id;



	GEM_BUG_ON(db_id >= GUC_DOORBELL_INVALID);





	doorbell = __get_doorbell(client);

	doorbell = __get_doorbell(client);

	doorbell->db_status = GUC_DOORBELL_DISABLED;

	doorbell->db_status = GUC_DOORBELL_DISABLED;

	doorbell->cookie = 0;

	doorbell->cookie = 0;





	/* Doorbell release flow requires that we wait for GEN8_DRB_VALID bit

	 * to go to zero after updating db_status before we call the GuC to

	 * release the doorbell */

	if (wait_for_us(!(I915_READ(GEN8_DRBREGL(db_id)) & GEN8_DRB_VALID), 10))

		WARN_ONCE(true, "Doorbell never became invalid after disable\n");



	return __guc_deallocate_doorbell(client->guc, client->ctx_index);

	return __guc_deallocate_doorbell(client->guc, client->ctx_index);

}

}