| Message ID | 1469124942-17943-7-git-send-email-david.s.gordon@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 21/07/16 19:15, Dave Gordon wrote: > As we're tweaking the GuC-related code in debugfs, we can > drop the now-used 'q_fail' and repack the structure. now-unused > > Signed-off-by: Dave Gordon <david.s.gordon@intel.com> > --- > drivers/gpu/drm/i915/i915_debugfs.c | 1 - > drivers/gpu/drm/i915/intel_guc.h | 6 ++---- > 2 files changed, 2 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c > index 2106766..096d212 100644 > --- a/drivers/gpu/drm/i915/i915_debugfs.c > +++ b/drivers/gpu/drm/i915/i915_debugfs.c > @@ -2546,7 +2546,6 @@ static void i915_guc_client_info(struct seq_file *m, > client->wq_size, client->wq_offset, client->wq_tail); > > 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, "\tLast submission result: %d\n", client->retcode); > > diff --git a/drivers/gpu/drm/i915/intel_guc.h b/drivers/gpu/drm/i915/intel_guc.h > index 53d41b5..a74b128 100644 > --- a/drivers/gpu/drm/i915/intel_guc.h > +++ b/drivers/gpu/drm/i915/intel_guc.h > @@ -71,19 +71,17 @@ struct i915_guc_client { > uint32_t engines; /* bitmap of (host) engine ids */ > uint32_t priority; > uint32_t ctx_index; > - > uint32_t proc_desc_offset; > + > uint32_t doorbell_offset; > uint32_t cookie; > uint16_t doorbell_id; > - uint16_t padding; /* Maintain alignment */ > + uint16_t padding[3]; /* Maintain alignment */ > > uint32_t wq_offset; > uint32_t wq_size; > uint32_t wq_tail; > - > uint32_t no_wq_space; > - uint32_t q_fail; /* No longer used */ > uint32_t b_fail; > int retcode; > > Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Regards, Tvrtko
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index 2106766..096d212 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c @@ -2546,7 +2546,6 @@ static void i915_guc_client_info(struct seq_file *m, client->wq_size, client->wq_offset, client->wq_tail); 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, "\tLast submission result: %d\n", client->retcode); diff --git a/drivers/gpu/drm/i915/intel_guc.h b/drivers/gpu/drm/i915/intel_guc.h index 53d41b5..a74b128 100644 --- a/drivers/gpu/drm/i915/intel_guc.h +++ b/drivers/gpu/drm/i915/intel_guc.h @@ -71,19 +71,17 @@ struct i915_guc_client { uint32_t engines; /* bitmap of (host) engine ids */ uint32_t priority; uint32_t ctx_index; - uint32_t proc_desc_offset; + uint32_t doorbell_offset; uint32_t cookie; uint16_t doorbell_id; - uint16_t padding; /* Maintain alignment */ + uint16_t padding[3]; /* Maintain alignment */ uint32_t wq_offset; uint32_t wq_size; uint32_t wq_tail; - uint32_t no_wq_space; - uint32_t q_fail; /* No longer used */ uint32_t b_fail; int retcode;
As we're tweaking the GuC-related code in debugfs, we can drop the now-used 'q_fail' and repack the structure. Signed-off-by: Dave Gordon <david.s.gordon@intel.com> --- drivers/gpu/drm/i915/i915_debugfs.c | 1 - drivers/gpu/drm/i915/intel_guc.h | 6 ++---- 2 files changed, 2 insertions(+), 5 deletions(-)