| Message ID | 1450468812-4882-2-git-send-email-yu.dai@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Dec 18, 2015 at 12:00:08PM -0800, yu.dai@intel.com wrote: > From: Dave Gordon <david.s.gordon@intel.com> > > The GuC code needs to know the size of a logical context, so we > expose get_lr_context_size(), renaming it intel_lr_context__size() > to fit the naming conventions for nonstatic functions. > > For: VIZ-2021 > Signed-off-by: Dave Gordon <david.s.gordon@intel.com> > Signed-off-by: Alex Dai <yu.dai@intel.com> > > diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c > index e5fb8ea..7a6b896 100644 > --- a/drivers/gpu/drm/i915/intel_lrc.c > +++ b/drivers/gpu/drm/i915/intel_lrc.c > @@ -2399,7 +2399,7 @@ void intel_lr_context_free(struct intel_context *ctx) > } > } > > -static uint32_t get_lr_context_size(struct intel_engine_cs *ring) > +uint32_t intel_lr_context_size(struct intel_engine_cs *ring) As a rule of thumb, non-static functions should have kerneldoc within drm/i915. At least in the files where we bothered with kerneldoc already. Please do a follow-up patch to remedy this. Thanks, Daniel > { > int ret = 0; > > @@ -2467,7 +2467,7 @@ int intel_lr_context_deferred_alloc(struct intel_context *ctx, > WARN_ON(ctx->legacy_hw_ctx.rcs_state != NULL); > WARN_ON(ctx->engine[ring->id].state); > > - context_size = round_up(get_lr_context_size(ring), 4096); > + context_size = round_up(intel_lr_context_size(ring), 4096); > > /* One extra page as the sharing data between driver and GuC */ > context_size += PAGE_SIZE * LRC_PPHWSP_PN; > diff --git a/drivers/gpu/drm/i915/intel_lrc.h b/drivers/gpu/drm/i915/intel_lrc.h > index 0b821b9..ae90f86 100644 > --- a/drivers/gpu/drm/i915/intel_lrc.h > +++ b/drivers/gpu/drm/i915/intel_lrc.h > @@ -84,6 +84,7 @@ static inline void intel_logical_ring_emit_reg(struct intel_ringbuffer *ringbuf, > #define LRC_STATE_PN (LRC_PPHWSP_PN + 1) > > void intel_lr_context_free(struct intel_context *ctx); > +uint32_t intel_lr_context_size(struct intel_engine_cs *ring); > int intel_lr_context_deferred_alloc(struct intel_context *ctx, > struct intel_engine_cs *ring); > void intel_lr_context_unpin(struct drm_i915_gem_request *req); > -- > 2.5.0 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
On 01/05/2016 02:27 AM, Daniel Vetter wrote: > On Fri, Dec 18, 2015 at 12:00:08PM -0800, yu.dai@intel.com wrote: > > From: Dave Gordon <david.s.gordon@intel.com> > > > > The GuC code needs to know the size of a logical context, so we > > expose get_lr_context_size(), renaming it intel_lr_context__size() > > to fit the naming conventions for nonstatic functions. > > > > For: VIZ-2021 > > Signed-off-by: Dave Gordon <david.s.gordon@intel.com> > > Signed-off-by: Alex Dai <yu.dai@intel.com> > > > > diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c > > index e5fb8ea..7a6b896 100644 > > --- a/drivers/gpu/drm/i915/intel_lrc.c > > +++ b/drivers/gpu/drm/i915/intel_lrc.c > > @@ -2399,7 +2399,7 @@ void intel_lr_context_free(struct intel_context *ctx) > > } > > } > > > > -static uint32_t get_lr_context_size(struct intel_engine_cs *ring) > > +uint32_t intel_lr_context_size(struct intel_engine_cs *ring) > > As a rule of thumb, non-static functions should have kerneldoc within > drm/i915. At least in the files where we bothered with kerneldoc already. > Please do a follow-up patch to remedy this. Thanks for the review. I submitted v3 to add some comments for kerneldoc. The other patches of this series are not touched. Thanks, Alex > > { > > int ret = 0; > > > > @@ -2467,7 +2467,7 @@ int intel_lr_context_deferred_alloc(struct intel_context *ctx, > > WARN_ON(ctx->legacy_hw_ctx.rcs_state != NULL); > > WARN_ON(ctx->engine[ring->id].state); > > > > - context_size = round_up(get_lr_context_size(ring), 4096); > > + context_size = round_up(intel_lr_context_size(ring), 4096); > > > > /* One extra page as the sharing data between driver and GuC */ > > context_size += PAGE_SIZE * LRC_PPHWSP_PN; > > diff --git a/drivers/gpu/drm/i915/intel_lrc.h b/drivers/gpu/drm/i915/intel_lrc.h > > index 0b821b9..ae90f86 100644 > > --- a/drivers/gpu/drm/i915/intel_lrc.h > > +++ b/drivers/gpu/drm/i915/intel_lrc.h > > @@ -84,6 +84,7 @@ static inline void intel_logical_ring_emit_reg(struct intel_ringbuffer *ringbuf, > > #define LRC_STATE_PN (LRC_PPHWSP_PN + 1) > > > > void intel_lr_context_free(struct intel_context *ctx); > > +uint32_t intel_lr_context_size(struct intel_engine_cs *ring); > > int intel_lr_context_deferred_alloc(struct intel_context *ctx, > > struct intel_engine_cs *ring); > > void intel_lr_context_unpin(struct drm_i915_gem_request *req); > > -- > > 2.5.0 > > > > _______________________________________________ > > Intel-gfx mailing list > > Intel-gfx@lists.freedesktop.org > > http://lists.freedesktop.org/mailman/listinfo/intel-gfx >
diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c index e5fb8ea..7a6b896 100644 --- a/drivers/gpu/drm/i915/intel_lrc.c +++ b/drivers/gpu/drm/i915/intel_lrc.c @@ -2399,7 +2399,7 @@ void intel_lr_context_free(struct intel_context *ctx) } } -static uint32_t get_lr_context_size(struct intel_engine_cs *ring) +uint32_t intel_lr_context_size(struct intel_engine_cs *ring) { int ret = 0; @@ -2467,7 +2467,7 @@ int intel_lr_context_deferred_alloc(struct intel_context *ctx, WARN_ON(ctx->legacy_hw_ctx.rcs_state != NULL); WARN_ON(ctx->engine[ring->id].state); - context_size = round_up(get_lr_context_size(ring), 4096); + context_size = round_up(intel_lr_context_size(ring), 4096); /* One extra page as the sharing data between driver and GuC */ context_size += PAGE_SIZE * LRC_PPHWSP_PN; diff --git a/drivers/gpu/drm/i915/intel_lrc.h b/drivers/gpu/drm/i915/intel_lrc.h index 0b821b9..ae90f86 100644 --- a/drivers/gpu/drm/i915/intel_lrc.h +++ b/drivers/gpu/drm/i915/intel_lrc.h @@ -84,6 +84,7 @@ static inline void intel_logical_ring_emit_reg(struct intel_ringbuffer *ringbuf, #define LRC_STATE_PN (LRC_PPHWSP_PN + 1) void intel_lr_context_free(struct intel_context *ctx); +uint32_t intel_lr_context_size(struct intel_engine_cs *ring); int intel_lr_context_deferred_alloc(struct intel_context *ctx, struct intel_engine_cs *ring); void intel_lr_context_unpin(struct drm_i915_gem_request *req);