Skip to contentSkip to conversation

i915: ggtt: include asm/smp.h

PATCH In review Arnd Bergmann 3 participants 3 messages Jan 10, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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")

---
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(+)
drivers/gpu/drm/i915/gt/intel_ggtt.c +1 -0
index 1a2b5dcde960..9ef8ed85a738 100644
@@ -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"
Signature · 6 lines
2.20.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

Quoting Arnd Bergmann (2020-01-10 15:17:54)

Quoted 8 lines

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
Quoted 7 lines

Add the missing header file.

Fixes 2c86e55d2ab5 ("drm/i915/gtt: split up i915_gem_gtt")

---
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

#2 lore raw

[Intel-gfx] ✗ Fi.CI.BAT: failure for i915: ggtt: include asm/smp.h

In reply to Arnd Bergmann
== Series Details ==

== Series Details ==

Series: i915: ggtt: include asm/smp.h
URL : https://patchwork.freedesktop.org/series/71892/
State : failure

== Summary ==

Applying: i915: ggtt: include asm/smp.h
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/gt/intel_ggtt.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/gt/intel_ggtt.c
No changes -- Patch already applied.

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx