Commit 5422d87d authored by Zhang Xiaoxu's avatar Zhang Xiaoxu Committed by Chris Wilson

drm/i915: Fix too few arguments to function i915_capture_error_state

If 'CONFIG_DRM_I915_CAPTURE_ERROR' not configured, there is an error
when compile the kernel:

drivers/gpu/drm/i915/gt/intel_reset.c:
	In function intel_gt_handle_error:
drivers/gpu/drm/i915/gt/intel_reset.c:1233:3:
	error: too few arguments to function i915_capture_error_state
   i915_capture_error_state(gt->i915);
   ^~~~~~~~~~~~~~~~~~~~~~~~
In file included
         from ./drivers/gpu/drm/i915/i915_drv.h:97:0,
         from ./drivers/gpu/drm/i915/display/intel_display_types.h:46,
         from drivers/gpu/drm/i915/gt/intel_reset.c:10:
./drivers/gpu/drm/i915/i915_gpu_error.h:267:20: note: declared here
 static inline void i915_capture_error_state(struct drm_i915_private *dev_priv,

Fixes: 742379c0 ("drm/i915: Start chopping up the GPU error capture")
Reported-by: default avatarHulk Robot <hulkci@huawei.com>
Signed-off-by: default avatarZhang Xiaoxu <zhangxiaoxu5@huawei.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20200113081942.15982-1-zhangxiaoxu5@huawei.com
parent 59be9b9c
...@@ -212,7 +212,7 @@ __printf(2, 3) ...@@ -212,7 +212,7 @@ __printf(2, 3)
void i915_error_printf(struct drm_i915_error_state_buf *e, const char *f, ...); void i915_error_printf(struct drm_i915_error_state_buf *e, const char *f, ...);
struct i915_gpu_coredump *i915_gpu_coredump(struct drm_i915_private *i915); struct i915_gpu_coredump *i915_gpu_coredump(struct drm_i915_private *i915);
void i915_capture_error_state(struct drm_i915_private *dev_priv); void i915_capture_error_state(struct drm_i915_private *i915);
struct i915_gpu_coredump * struct i915_gpu_coredump *
i915_gpu_coredump_alloc(struct drm_i915_private *i915, gfp_t gfp); i915_gpu_coredump_alloc(struct drm_i915_private *i915, gfp_t gfp);
...@@ -264,9 +264,7 @@ void i915_disable_error_state(struct drm_i915_private *i915, int err); ...@@ -264,9 +264,7 @@ void i915_disable_error_state(struct drm_i915_private *i915, int err);
#else #else
static inline void i915_capture_error_state(struct drm_i915_private *dev_priv, static inline void i915_capture_error_state(struct drm_i915_private *i915)
u32 engine_mask,
const char *error_msg)
{ {
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment