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

Commit 357248bf authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915/guc: Rename client->cookie to match use 



The client->cookie is a shadow of the doorbell->cookie value, so rename
it to indicate its association with the doorbell, like the doorbell id
and offset.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20161129121024.22650-3-chris@chris-wilson.co.uk
parent 334636c6

drivers/gpu/drm/i915/i915_debugfs.c

+1 −1
Original line number Diff line number Diff line
@@ -2414,7 +2414,7 @@ static void i915_guc_client_info(struct seq_file *m, 
	seq_printf(m, "\tPriority %d, GuC ctx index: %u, PD offset 0x%x\n",

		client->priority, client->ctx_index, client->proc_desc_offset);

	seq_printf(m, "\tDoorbell id %d, offset: 0x%x, cookie 0x%x\n",

		client->doorbell_id, client->doorbell_offset, client->cookie);

		client->doorbell_id, client->doorbell_offset, client->doorbell_cookie);

	seq_printf(m, "\tWQ size %d, offset: 0x%x, tail %d\n",

		client->wq_size, client->wq_offset, client->wq_tail);

drivers/gpu/drm/i915/i915_guc_submission.c

+3 −3
Original line number Diff line number Diff line
@@ -454,11 +454,11 @@ static int guc_ring_doorbell(struct i915_guc_client *gc) 


	/* current cookie */

	db_cmp.db_status = GUC_DOORBELL_ENABLED;

	db_cmp.cookie = gc->cookie;

	db_cmp.cookie = gc->doorbell_cookie;



	/* cookie to be updated */

	db_exc.db_status = GUC_DOORBELL_ENABLED;

	db_exc.cookie = gc->cookie + 1;

	db_exc.cookie = gc->doorbell_cookie + 1;

	if (db_exc.cookie == 0)

		db_exc.cookie = 1;
@@ -473,7 +473,7 @@ static int guc_ring_doorbell(struct i915_guc_client *gc) 
		/* if the exchange was successfully executed */

		if (db_ret.value_qw == db_cmp.value_qw) {

			/* db was successfully rung */

			gc->cookie = db_exc.cookie;

			gc->doorbell_cookie = db_exc.cookie;

			ret = 0;

			break;

		}

drivers/gpu/drm/i915/intel_uc.h

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ struct i915_guc_client { 
	uint32_t proc_desc_offset;



	uint32_t doorbell_offset;

	uint32_t cookie;

	uint32_t doorbell_cookie;

	uint16_t doorbell_id;

	uint16_t padding[3];		/* Maintain alignment		*/