drm/i915: fix header file inclusion for might_alloc()
Subsystems (2)
PATCH v3 1/1 drm/i915: fix header file inclusion for might_alloc()
Replace "linux/slab.h" with "linux/sched/mm.h" header inclusion as the first is not required, while the second, if not included, prodouces the following error:
drivers/gpu/drm/i915/i915_vma_resource.c: In function ‘i915_vma_resource_bind_dep_await’:drivers/gpu/drm/i915/i915_vma_resource.c:381:9: error: implicit declaration of function ‘might_alloc’; did you mean ‘might_lock’? [-Werror=implicit-function-declaration]
381 | might_alloc(gfp);
| ^~~~~~~~~~~
| might_lock---
Hi,
v3: fixed a typo in the commit log (prduces/produces). (Thanks
Thomas Zimmermann)
v2: added the 'Fixes' tag (I think I got the right commit) and
Thomas Hellström r-b.
Andi
drivers/gpu/drm/i915/i915_vma_resource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_vma_resource.c +1 -1
@@ -4,7 +4,7 @@*/ #include <linux/interval_tree_generic.h> -#include <linux/slab.h> +#include <linux/sched/mm.h> #include "i915_sw_fence.h" #include "i915_vma_resource.h"
Signature · 1 line
2.34.1
Op 24-01-2022 om 10:44 schreef Andi Shyti:
Quoted 33 lines
Replace "
linux/slab.h" with "linux/sched/mm.h" header inclusion as the first is not required, while the second, if not included, prodouces the following error:
drivers/gpu/drm/i915/i915_vma_resource.c: In function ‘i915_vma_resource_bind_dep_await’:drivers/gpu/drm/i915/i915_vma_resource.c:381:9: error: implicit declaration of function ‘might_alloc’; did you mean ‘might_lock’? [-Werror=implicit-function-declaration]381 | might_alloc(gfp); | ^~~~~~~~~~~ | might_lockFixes 2f6b90da9192 ("drm/i915: Use vma resources for async unbinding")Signed-off-by Andi Shyti <[email protected]>Cc Thomas Hellström <[email protected]>Reviewed-by Thomas Hellström <[email protected]>---
Hi,v3: fixed a typo in the commit log (prduces/produces). (Thanks
Thomas Zimmermann)v2: added the 'Fixes' tag (I think I got the right commit) and
Thomas Hellström r-b.Andi
drivers/gpu/drm/i915/i915_vma_resource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/i915/i915_vma_resource.c +0
-0
drivers/gpu/drm/i915/i915_vma_resource.c line 10
Quoted 8 lines
drivers/gpu/drm/i915/i915_vma_resource.c +1
-1@@ -4,7 +4,7 @@*/ #include <linux/interval_tree_generic.h> -#include <linux/slab.h> +#include <linux/sched/mm.h> #include "i915_sw_fence.h" #include "i915_vma_resource.h"
Pushed to drm-intel-gt-next. Should fix drm-tip building, probably needs to be pulled into drm-fixes asap. :)
Patchwork
CI[Intel-gfx] ✗ Fi.CI.BAT: failure for drm/i915: fix header file inclusion for might_alloc() (rev4)
In reply to Andi Shyti== Series Details ==
== Series Details ==
Series: drm/i915: fix header file inclusion for might_alloc() (rev4)
URL : https://patchwork.freedesktop.org/series/99215/
State : failure
== Summary ==
Applying: drm/i915: fix header file inclusion for might_alloc() Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/i915_vma_resource.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.