| Message ID | 1491490816-26965-4-git-send-email-oscar.mateo@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 06/04/2017 16:00, Oscar Mateo wrote: > Not really needed, but makes the next change a little bit more compact. > > v2: > - Use zero-based numbering for engine names: xcs0, xcs1.. xcsN (Tvrtko, Chris) > - Make sure the mock engine name is null-terminated (Tvrtko, Chris) > > v3: Because I'm stupid (Chris) > > Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com> > Cc: Paulo Zanoni <paulo.r.zanoni@intel.com> > Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> > Cc: Chris Wilson <chris@chris-wilson.co.uk> > Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> > Signed-off-by: Oscar Mateo <oscar.mateo@intel.com> > --- > drivers/gpu/drm/i915/intel_engine_cs.c | 5 +++-- > drivers/gpu/drm/i915/intel_ringbuffer.h | 4 +++- > drivers/gpu/drm/i915/selftests/mock_engine.c | 2 +- > 3 files changed, 7 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_engine_cs.c b/drivers/gpu/drm/i915/intel_engine_cs.c > index bb10847..c6a73d0 100644 > --- a/drivers/gpu/drm/i915/intel_engine_cs.c > +++ b/drivers/gpu/drm/i915/intel_engine_cs.c > @@ -71,7 +71,7 @@ > .init_legacy = intel_init_bsd_ring_buffer, > }, > [VCS2] = { > - .name = "vcs2", > + .name = "vcs", > .hw_id = VCS2_HW, > .exec_id = I915_EXEC_BSD, > .class = VIDEO_DECODE_CLASS, > @@ -108,7 +108,8 @@ > > engine->id = id; > engine->i915 = dev_priv; > - engine->name = info->name; > + snprintf(engine->name, sizeof(engine->name), "%s%u", > + info->name, info->instance); > engine->exec_id = info->exec_id; > engine->hw_id = engine->guc_id = info->hw_id; > engine->mmio_base = info->mmio_base; > diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.h b/drivers/gpu/drm/i915/intel_ringbuffer.h > index 5c1a27f..d617049 100644 > --- a/drivers/gpu/drm/i915/intel_ringbuffer.h > +++ b/drivers/gpu/drm/i915/intel_ringbuffer.h > @@ -187,9 +187,11 @@ enum intel_engine_id { > VECS > }; > > +#define INTEL_ENGINE_CS_MAX_NAME 8 > + > struct intel_engine_cs { > struct drm_i915_private *i915; > - const char *name; > + char name[INTEL_ENGINE_CS_MAX_NAME]; > enum intel_engine_id id; > unsigned int exec_id; > unsigned int hw_id; > diff --git a/drivers/gpu/drm/i915/selftests/mock_engine.c b/drivers/gpu/drm/i915/selftests/mock_engine.c > index b89050e..b8e53bd 100644 > --- a/drivers/gpu/drm/i915/selftests/mock_engine.c > +++ b/drivers/gpu/drm/i915/selftests/mock_engine.c > @@ -140,7 +140,7 @@ struct intel_engine_cs *mock_engine(struct drm_i915_private *i915, > > /* minimal engine setup for requests */ > engine->base.i915 = i915; > - engine->base.name = name; > + snprintf(engine->base.name, sizeof(engine->base.name), "%s", name); > engine->base.id = id++; > engine->base.status_page.page_addr = (void *)(engine + 1); > > Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Regards, Tvrtko
On Thu, Apr 06, 2017 at 08:00:14AM -0700, Oscar Mateo wrote: > Not really needed, but makes the next change a little bit more compact. > > v2: > - Use zero-based numbering for engine names: xcs0, xcs1.. xcsN (Tvrtko, Chris) > - Make sure the mock engine name is null-terminated (Tvrtko, Chris) > > v3: Because I'm stupid (Chris) > > Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com> > Cc: Paulo Zanoni <paulo.r.zanoni@intel.com> > Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> > Cc: Chris Wilson <chris@chris-wilson.co.uk> > Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> > Signed-off-by: Oscar Mateo <oscar.mateo@intel.com> > --- > drivers/gpu/drm/i915/intel_engine_cs.c | 5 +++-- > drivers/gpu/drm/i915/intel_ringbuffer.h | 4 +++- > drivers/gpu/drm/i915/selftests/mock_engine.c | 2 +- > 3 files changed, 7 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_engine_cs.c b/drivers/gpu/drm/i915/intel_engine_cs.c > index bb10847..c6a73d0 100644 > --- a/drivers/gpu/drm/i915/intel_engine_cs.c > +++ b/drivers/gpu/drm/i915/intel_engine_cs.c > @@ -71,7 +71,7 @@ > .init_legacy = intel_init_bsd_ring_buffer, > }, > [VCS2] = { > - .name = "vcs2", > + .name = "vcs", > .hw_id = VCS2_HW, > .exec_id = I915_EXEC_BSD, > .class = VIDEO_DECODE_CLASS, > @@ -108,7 +108,8 @@ > > engine->id = id; > engine->i915 = dev_priv; > - engine->name = info->name; > + snprintf(engine->name, sizeof(engine->name), "%s%u", > + info->name, info->instance); Maybe we should verify that engine name was not truncated by the snprintf? -Michal > engine->exec_id = info->exec_id; > engine->hw_id = engine->guc_id = info->hw_id; > engine->mmio_base = info->mmio_base; > diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.h b/drivers/gpu/drm/i915/intel_ringbuffer.h > index 5c1a27f..d617049 100644 > --- a/drivers/gpu/drm/i915/intel_ringbuffer.h > +++ b/drivers/gpu/drm/i915/intel_ringbuffer.h > @@ -187,9 +187,11 @@ enum intel_engine_id { > VECS > }; > > +#define INTEL_ENGINE_CS_MAX_NAME 8 > + > struct intel_engine_cs { > struct drm_i915_private *i915; > - const char *name; > + char name[INTEL_ENGINE_CS_MAX_NAME]; > enum intel_engine_id id; > unsigned int exec_id; > unsigned int hw_id; > diff --git a/drivers/gpu/drm/i915/selftests/mock_engine.c b/drivers/gpu/drm/i915/selftests/mock_engine.c > index b89050e..b8e53bd 100644 > --- a/drivers/gpu/drm/i915/selftests/mock_engine.c > +++ b/drivers/gpu/drm/i915/selftests/mock_engine.c > @@ -140,7 +140,7 @@ struct intel_engine_cs *mock_engine(struct drm_i915_private *i915, > > /* minimal engine setup for requests */ > engine->base.i915 = i915; > - engine->base.name = name; > + snprintf(engine->base.name, sizeof(engine->base.name), "%s", name); > engine->base.id = id++; > engine->base.status_page.page_addr = (void *)(engine + 1); > > -- > 1.9.1 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/drivers/gpu/drm/i915/intel_engine_cs.c b/drivers/gpu/drm/i915/intel_engine_cs.c index bb10847..c6a73d0 100644 --- a/drivers/gpu/drm/i915/intel_engine_cs.c +++ b/drivers/gpu/drm/i915/intel_engine_cs.c @@ -71,7 +71,7 @@ .init_legacy = intel_init_bsd_ring_buffer, }, [VCS2] = { - .name = "vcs2", + .name = "vcs", .hw_id = VCS2_HW, .exec_id = I915_EXEC_BSD, .class = VIDEO_DECODE_CLASS, @@ -108,7 +108,8 @@ engine->id = id; engine->i915 = dev_priv; - engine->name = info->name; + snprintf(engine->name, sizeof(engine->name), "%s%u", + info->name, info->instance); engine->exec_id = info->exec_id; engine->hw_id = engine->guc_id = info->hw_id; engine->mmio_base = info->mmio_base; diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.h b/drivers/gpu/drm/i915/intel_ringbuffer.h index 5c1a27f..d617049 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.h +++ b/drivers/gpu/drm/i915/intel_ringbuffer.h @@ -187,9 +187,11 @@ enum intel_engine_id { VECS }; +#define INTEL_ENGINE_CS_MAX_NAME 8 + struct intel_engine_cs { struct drm_i915_private *i915; - const char *name; + char name[INTEL_ENGINE_CS_MAX_NAME]; enum intel_engine_id id; unsigned int exec_id; unsigned int hw_id; diff --git a/drivers/gpu/drm/i915/selftests/mock_engine.c b/drivers/gpu/drm/i915/selftests/mock_engine.c index b89050e..b8e53bd 100644 --- a/drivers/gpu/drm/i915/selftests/mock_engine.c +++ b/drivers/gpu/drm/i915/selftests/mock_engine.c @@ -140,7 +140,7 @@ struct intel_engine_cs *mock_engine(struct drm_i915_private *i915, /* minimal engine setup for requests */ engine->base.i915 = i915; - engine->base.name = name; + snprintf(engine->base.name, sizeof(engine->base.name), "%s", name); engine->base.id = id++; engine->base.status_page.page_addr = (void *)(engine + 1);
Not really needed, but makes the next change a little bit more compact. v2: - Use zero-based numbering for engine names: xcs0, xcs1.. xcsN (Tvrtko, Chris) - Make sure the mock engine name is null-terminated (Tvrtko, Chris) v3: Because I'm stupid (Chris) Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Cc: Paulo Zanoni <paulo.r.zanoni@intel.com> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> Cc: Chris Wilson <chris@chris-wilson.co.uk> Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> Signed-off-by: Oscar Mateo <oscar.mateo@intel.com> --- drivers/gpu/drm/i915/intel_engine_cs.c | 5 +++-- drivers/gpu/drm/i915/intel_ringbuffer.h | 4 +++- drivers/gpu/drm/i915/selftests/mock_engine.c | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-)