2020-01-10 15:19:50

by Arnd Bergmann

Subject: [PATCH] i915: ggtt: include asm/smp.h

Splitting up the i915_gem_gtt caused a build failure in some configurations:

drivers/gpu/drm/i915/gt/intel_ggtt.c: In function 'ggtt_restore_mappings':
drivers/gpu/drm/i915/gt/intel_ggtt.c:1239:3: error: implicit declaration of function 'wbinvd_on_all_cpus'; did you mean 'wrmsr_on_cpus'? [-Werror=implicit-function-declaration]
wbinvd_on_all_cpus();
^~~~~~~~~~~~~~~~~~
wrmsr_on_cpus

Add the missing header file.

Fixes: 2c86e55d2ab5 ("drm/i915/gtt: split up i915_gem_gtt")
Signed-off-by: Arnd Bergmann <[email protected]>
---
I ran into this bug a few days ago on linux-next. Please just ignore
if it's already fixed in the meantime.
---
drivers/gpu/drm/i915/gt/intel_ggtt.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/i915/gt/intel_ggtt.c b/drivers/gpu/drm/i915/gt/intel_ggtt.c
index 1a2b5dcde960..9ef8ed85a738 100644
--- a/drivers/gpu/drm/i915/gt/intel_ggtt.c
+++ b/drivers/gpu/drm/i915/gt/intel_ggtt.c
@@ -6,6 +6,7 @@
#include <linux/stop_machine.h>

#include <asm/set_memory.h>
+#include <asm/smp.h>

#include "intel_gt.h"
#include "i915_drv.h"
--
2.20.0

2020-01-10 15:27:18

by Chris Wilson

Subject: Re: [PATCH] i915: ggtt: include asm/smp.h

Quoting Arnd Bergmann (2020-01-10 15:17:54)
> Splitting up the i915_gem_gtt caused a build failure in some configurations:
>
> drivers/gpu/drm/i915/gt/intel_ggtt.c: In function 'ggtt_restore_mappings':
> drivers/gpu/drm/i915/gt/intel_ggtt.c:1239:3: error: implicit declaration of function 'wbinvd_on_all_cpus'; did you mean 'wrmsr_on_cpus'? [-Werror=implicit-function-declaration]
> wbinvd_on_all_cpus();
> ^~~~~~~~~~~~~~~~~~
> wrmsr_on_cpus
>
> Add the missing header file.
>
> Fixes: 2c86e55d2ab5 ("drm/i915/gtt: split up i915_gem_gtt")
> Signed-off-by: Arnd Bergmann <[email protected]>
> ---
> I ran into this bug a few days ago on linux-next. Please just ignore
> if it's already fixed in the meantime.

Fixed applied this morning, thanks for the fixup anyway.
-Chris