drm/i915: Fix multiple definition of 'i915_vma_capture_finish'
authorZhang Xiaoxu <zhangxiaoxu5@huawei.com>
Mon, 13 Jan 2020 10:40:09 +0000 (18:40 +0800)
committerChris Wilson <chris@chris-wilson.co.uk>
Mon, 13 Jan 2020 20:57:05 +0000 (20:57 +0000)
If 'CONFIG_DRM_I915_CAPTURE_ERROR' not configured, there are some
errors like:

drivers/gpu/drm/i915/i915_irq.o:
In function `i915_vma_capture_finish':
./drivers/gpu/drm/i915/i915_gpu_error.h:312:
multiple definition of `i915_vma_capture_finish'
drivers/gpu/drm/i915/i915_drv.o:
./drivers/gpu/drm/i915/i915_gpu_error.h:312: first defined here

So, add 'static inline' on the defineation of the 'i915_vma_capture_finish'

Fixes: d713e3ab93fdc("drm/i915: Correct typo in i915_vma_compress_finish stub")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Zhang Xiaoxu <zhangxiaoxu5@huawei.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20200113104009.13274-1-zhangxiaoxu5@huawei.com
drivers/gpu/drm/i915/i915_gpu_error.h

index 1c80044..3c68c41 100644 (file)
@@ -309,8 +309,9 @@ i915_vma_capture_prepare(struct intel_gt_coredump *gt)
        return NULL;
 }
 
-void i915_vma_capture_finish(struct intel_gt_coredump *gt,
-                            struct i915_vma_compress *compress)
+static inline void
+i915_vma_capture_finish(struct intel_gt_coredump *gt,
+                       struct i915_vma_compress *compress)
 {
 }