hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20161129121024.22650-3-chris@chris-wilson.co.uk
This commit is contained in:
Chris Wilson 2016-11-29 12:10:21 +00:00
parent 334636c67e
commit 357248bfe5
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/i915/i915_debugfs.c
View File

@ -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", seq_printf(m, "\tPriority %d, GuC ctx index: %u, PD offset 0x%x\n",
client->priority, client->ctx_index, client->proc_desc_offset); client->priority, client->ctx_index, client->proc_desc_offset);
seq_printf(m, "\tDoorbell id %d, offset: 0x%x, cookie 0x%x\n", 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", seq_printf(m, "\tWQ size %d, offset: 0x%x, tail %d\n",
client->wq_size, client->wq_offset, client->wq_tail); client->wq_size, client->wq_offset, client->wq_tail);

6
drivers/gpu/drm/i915/i915_guc_submission.c
View File

@ -454,11 +454,11 @@ static int guc_ring_doorbell(struct i915_guc_client *gc)
/* current cookie */ /* current cookie */
db_cmp.db_status = GUC_DOORBELL_ENABLED; db_cmp.db_status = GUC_DOORBELL_ENABLED;
db_cmp.cookie = gc->cookie; db_cmp.cookie = gc->doorbell_cookie;
/* cookie to be updated */ /* cookie to be updated */
db_exc.db_status = GUC_DOORBELL_ENABLED; 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) if (db_exc.cookie == 0)
db_exc.cookie = 1; 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 the exchange was successfully executed */
if (db_ret.value_qw == db_cmp.value_qw) { if (db_ret.value_qw == db_cmp.value_qw) {
/* db was successfully rung */ /* db was successfully rung */
gc->cookie = db_exc.cookie; gc->doorbell_cookie = db_exc.cookie;
ret = 0; ret = 0;
break; break;
} }

2
drivers/gpu/drm/i915/intel_uc.h
View File

@ -74,7 +74,7 @@ struct i915_guc_client {
uint32_t proc_desc_offset; uint32_t proc_desc_offset;
uint32_t doorbell_offset; uint32_t doorbell_offset;
uint32_t cookie; uint32_t doorbell_cookie;
uint16_t doorbell_id; uint16_t doorbell_id;
uint16_t padding[3]; /* Maintain alignment */ uint16_t padding[3]; /* Maintain alignment */