Message ID | 20231031124502.1772160-1-jani.nikula@intel.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | [RESEND,1/3] drm/i915: make some error capture functions static | expand |
On 10/31/2023 1:45 PM, Jani Nikula wrote: > Not needed outside of i915_gpu_error.c. > > Signed-off-by: Jani Nikula <jani.nikula@intel.com> Reviewed-by: Nirmoy Das <nirmoy.das@intel.com> > --- > drivers/gpu/drm/i915/i915_gpu_error.c | 8 ++++---- > drivers/gpu/drm/i915/i915_gpu_error.h | 5 ----- > 2 files changed, 4 insertions(+), 9 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c > index 8275f9b6a47d..889db834f07d 100644 > --- a/drivers/gpu/drm/i915/i915_gpu_error.c > +++ b/drivers/gpu/drm/i915/i915_gpu_error.c > @@ -520,7 +520,7 @@ __find_vma(struct i915_vma_coredump *vma, const char *name) > return NULL; > } > > -struct i915_vma_coredump * > +static struct i915_vma_coredump * > intel_gpu_error_find_batch(const struct intel_engine_coredump *ee) > { > return __find_vma(ee->vma, "batch"); > @@ -609,9 +609,9 @@ void i915_error_printf(struct drm_i915_error_state_buf *e, const char *f, ...) > va_end(args); > } > > -void intel_gpu_error_print_vma(struct drm_i915_error_state_buf *m, > - const struct intel_engine_cs *engine, > - const struct i915_vma_coredump *vma) > +static void intel_gpu_error_print_vma(struct drm_i915_error_state_buf *m, > + const struct intel_engine_cs *engine, > + const struct i915_vma_coredump *vma) > { > char out[ASCII85_BUFSZ]; > struct page *page; > diff --git a/drivers/gpu/drm/i915/i915_gpu_error.h b/drivers/gpu/drm/i915/i915_gpu_error.h > index 4ce227f7e1e1..8f9cdf056181 100644 > --- a/drivers/gpu/drm/i915/i915_gpu_error.h > +++ b/drivers/gpu/drm/i915/i915_gpu_error.h > @@ -277,11 +277,6 @@ static inline void intel_klog_error_capture(struct intel_gt *gt, > > __printf(2, 3) > void i915_error_printf(struct drm_i915_error_state_buf *e, const char *f, ...); > -void intel_gpu_error_print_vma(struct drm_i915_error_state_buf *m, > - const struct intel_engine_cs *engine, > - const struct i915_vma_coredump *vma); > -struct i915_vma_coredump * > -intel_gpu_error_find_batch(const struct intel_engine_coredump *ee); > > struct i915_gpu_coredump *i915_gpu_coredump(struct intel_gt *gt, > intel_engine_mask_t engine_mask, u32 dump_flags);
On Tue, 31 Oct 2023, Nirmoy Das <nirmoy.das@linux.intel.com> wrote: > On 10/31/2023 1:45 PM, Jani Nikula wrote: >> Not needed outside of i915_gpu_error.c. >> >> Signed-off-by: Jani Nikula <jani.nikula@intel.com> > Reviewed-by: Nirmoy Das <nirmoy.das@intel.com> Thanks, series pushed to din. BR, Jani. >> --- >> drivers/gpu/drm/i915/i915_gpu_error.c | 8 ++++---- >> drivers/gpu/drm/i915/i915_gpu_error.h | 5 ----- >> 2 files changed, 4 insertions(+), 9 deletions(-) >> >> diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c >> index 8275f9b6a47d..889db834f07d 100644 >> --- a/drivers/gpu/drm/i915/i915_gpu_error.c >> +++ b/drivers/gpu/drm/i915/i915_gpu_error.c >> @@ -520,7 +520,7 @@ __find_vma(struct i915_vma_coredump *vma, const char *name) >> return NULL; >> } >> >> -struct i915_vma_coredump * >> +static struct i915_vma_coredump * >> intel_gpu_error_find_batch(const struct intel_engine_coredump *ee) >> { >> return __find_vma(ee->vma, "batch"); >> @@ -609,9 +609,9 @@ void i915_error_printf(struct drm_i915_error_state_buf *e, const char *f, ...) >> va_end(args); >> } >> >> -void intel_gpu_error_print_vma(struct drm_i915_error_state_buf *m, >> - const struct intel_engine_cs *engine, >> - const struct i915_vma_coredump *vma) >> +static void intel_gpu_error_print_vma(struct drm_i915_error_state_buf *m, >> + const struct intel_engine_cs *engine, >> + const struct i915_vma_coredump *vma) >> { >> char out[ASCII85_BUFSZ]; >> struct page *page; >> diff --git a/drivers/gpu/drm/i915/i915_gpu_error.h b/drivers/gpu/drm/i915/i915_gpu_error.h >> index 4ce227f7e1e1..8f9cdf056181 100644 >> --- a/drivers/gpu/drm/i915/i915_gpu_error.h >> +++ b/drivers/gpu/drm/i915/i915_gpu_error.h >> @@ -277,11 +277,6 @@ static inline void intel_klog_error_capture(struct intel_gt *gt, >> >> __printf(2, 3) >> void i915_error_printf(struct drm_i915_error_state_buf *e, const char *f, ...); >> -void intel_gpu_error_print_vma(struct drm_i915_error_state_buf *m, >> - const struct intel_engine_cs *engine, >> - const struct i915_vma_coredump *vma); >> -struct i915_vma_coredump * >> -intel_gpu_error_find_batch(const struct intel_engine_coredump *ee); >> >> struct i915_gpu_coredump *i915_gpu_coredump(struct intel_gt *gt, >> intel_engine_mask_t engine_mask, u32 dump_flags);
diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c index 8275f9b6a47d..889db834f07d 100644 --- a/drivers/gpu/drm/i915/i915_gpu_error.c +++ b/drivers/gpu/drm/i915/i915_gpu_error.c @@ -520,7 +520,7 @@ __find_vma(struct i915_vma_coredump *vma, const char *name) return NULL; } -struct i915_vma_coredump * +static struct i915_vma_coredump * intel_gpu_error_find_batch(const struct intel_engine_coredump *ee) { return __find_vma(ee->vma, "batch"); @@ -609,9 +609,9 @@ void i915_error_printf(struct drm_i915_error_state_buf *e, const char *f, ...) va_end(args); } -void intel_gpu_error_print_vma(struct drm_i915_error_state_buf *m, - const struct intel_engine_cs *engine, - const struct i915_vma_coredump *vma) +static void intel_gpu_error_print_vma(struct drm_i915_error_state_buf *m, + const struct intel_engine_cs *engine, + const struct i915_vma_coredump *vma) { char out[ASCII85_BUFSZ]; struct page *page; diff --git a/drivers/gpu/drm/i915/i915_gpu_error.h b/drivers/gpu/drm/i915/i915_gpu_error.h index 4ce227f7e1e1..8f9cdf056181 100644 --- a/drivers/gpu/drm/i915/i915_gpu_error.h +++ b/drivers/gpu/drm/i915/i915_gpu_error.h @@ -277,11 +277,6 @@ static inline void intel_klog_error_capture(struct intel_gt *gt, __printf(2, 3) void i915_error_printf(struct drm_i915_error_state_buf *e, const char *f, ...); -void intel_gpu_error_print_vma(struct drm_i915_error_state_buf *m, - const struct intel_engine_cs *engine, - const struct i915_vma_coredump *vma); -struct i915_vma_coredump * -intel_gpu_error_find_batch(const struct intel_engine_coredump *ee); struct i915_gpu_coredump *i915_gpu_coredump(struct intel_gt *gt, intel_engine_mask_t engine_mask, u32 dump_flags);
Not needed outside of i915_gpu_error.c. Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- drivers/gpu/drm/i915/i915_gpu_error.c | 8 ++++---- drivers/gpu/drm/i915/i915_gpu_error.h | 5 ----- 2 files changed, 4 insertions(+), 9 deletions(-)