drm/i915/guc: re-optimise i915_guc_client layout

As we're tweaking the GuC-related code in debugfs, we can
drop the no-longer-used 'q_fail' and repack the structure.

Signed-off-by: Dave Gordon <david.s.gordon@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
This commit is contained in:
Dave Gordon 2016-08-09 15:19:23 +01:00 committed by Tvrtko Ursulin
parent c18468c4b2
commit 774439e12b
2 changed files with 2 additions and 5 deletions

View File

@ -2555,7 +2555,6 @@ static void i915_guc_client_info(struct seq_file *m,
client->wq_size, client->wq_offset, client->wq_tail); client->wq_size, client->wq_offset, client->wq_tail);
seq_printf(m, "\tWork queue full: %u\n", client->no_wq_space); seq_printf(m, "\tWork queue full: %u\n", client->no_wq_space);
seq_printf(m, "\tFailed to queue: %u\n", client->q_fail);
seq_printf(m, "\tFailed doorbell: %u\n", client->b_fail); seq_printf(m, "\tFailed doorbell: %u\n", client->b_fail);
seq_printf(m, "\tLast submission result: %d\n", client->retcode); seq_printf(m, "\tLast submission result: %d\n", client->retcode);

View File

@ -71,19 +71,17 @@ struct i915_guc_client {
uint32_t engines; /* bitmap of (host) engine ids */ uint32_t engines; /* bitmap of (host) engine ids */
uint32_t priority; uint32_t priority;
uint32_t ctx_index; uint32_t ctx_index;
uint32_t proc_desc_offset; uint32_t proc_desc_offset;
uint32_t doorbell_offset; uint32_t doorbell_offset;
uint32_t cookie; uint32_t cookie;
uint16_t doorbell_id; uint16_t doorbell_id;
uint16_t padding; /* Maintain alignment */ uint16_t padding[3]; /* Maintain alignment */
uint32_t wq_offset; uint32_t wq_offset;
uint32_t wq_size; uint32_t wq_size;
uint32_t wq_tail; uint32_t wq_tail;
uint32_t no_wq_space; uint32_t no_wq_space;
uint32_t q_fail; /* No longer used */
uint32_t b_fail; uint32_t b_fail;
int retcode; int retcode;