Skip to content

Commit 59be9b9

Browse files
z00467499ickle
authored andcommitted
drm/i915: Fix multiple definition of 'i915_vma_capture_finish'
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: d713e3a("drm/i915: Correct typo in i915_vma_compress_finish stub") Reported-by: Hulk Robot <[email protected]> Signed-off-by: Zhang Xiaoxu <[email protected]> Reviewed-by: Chris Wilson <[email protected]> Signed-off-by: Chris Wilson <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent 79003e6 commit 59be9b9

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

drivers/gpu/drm/i915/i915_gpu_error.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -309,8 +309,9 @@ i915_vma_capture_prepare(struct intel_gt_coredump *gt)
309309
return NULL;
310310
}
311311

312-
void i915_vma_capture_finish(struct intel_gt_coredump *gt,
313-
struct i915_vma_compress *compress)
312+
static inline void
313+
i915_vma_capture_finish(struct intel_gt_coredump *gt,
314+
struct i915_vma_compress *compress)
314315
{
315316
}
316317

0 commit comments

Comments
 (0)