Skip to contentSkip to conversation

drm/i915: fix header file inclusion for might_alloc()

PATCH Superseded Andi Shyti 2 participants 2 messages Jan 24, 2022

Subsystems (2)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Andi Shyti

author
#0 lore raw

PATCH v2 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, prdouces 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
Fixes 2f6b90da9192 ("drm/i915: Use vma resources for async unbinding")
Cc Thomas Hellström <[email protected]>

---
Hi,

in V2 I just added the Fixes tag (I think I got the right commit) and added Thomas 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
index 1f41c0c699eb..bbb0ff14272f 100644
@@ -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
#1 lore raw

[Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915: fix header file inclusion for might_alloc() (rev2)

== Series Details ==

== Series Details ==

Series: drm/i915: fix header file inclusion for might_alloc() (rev2)
URL : https://patchwork.freedesktop.org/series/99215/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_11120 -> Patchwork_22075
====================================================

Summary
-------

**SUCCESS**

No regressions found.

External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22075/index.html

Participating hosts (49 -> 33)
------------------------------

Missing (16): fi-ilk-m540 fi-bdw-samus shard-tglu bat-dg1-6 fi-hsw-4200u fi-icl-u2 fi-bsw-cyan bat-adlp-6 fi-ctg-p8600 fi-cfl-8109u fi-kbl-8809g bat-rpls-1 shard-rkl shard-dg1 bat-jsl-2 bat-jsl-1

Known issues
------------

Here are the changes found in Patchwork_22075 that come from known issues:

### IGT changes ###

#### Issues hit ####

* igt@i915_selftest@live@execlists:
- fi-bsw-n3050: [PASS][1] -> [INCOMPLETE][2] ([i915#2940])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11120/fi-bsw-n3050/igt@i915_selftest@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22075/fi-bsw-n3050/igt@i915_selftest@[email protected]

* igt@kms_flip@basic-flip-vs-wf_vblank@b-hdmi-a1:
- fi-elk-e7500: [PASS][3] -> [FAIL][4] ([i915#2122])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11120/fi-elk-e7500/igt@kms_flip@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22075/fi-elk-e7500/igt@kms_flip@[email protected]

* igt@runner@aborted:
- fi-tgl-1115g4: NOTRUN -> [FAIL][5] ([i915#4312])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22075/fi-tgl-1115g4/igt@[email protected]
- fi-bsw-n3050: NOTRUN -> [FAIL][6] ([fdo#109271] / [i915#1436] / [i915#3428] / [i915#4312])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22075/fi-bsw-n3050/igt@[email protected]

[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[i915#1436]: https://gitlab.freedesktop.org/drm/intel/issues/1436
[i915#2122]: https://gitlab.freedesktop.org/drm/intel/issues/2122
[i915#2940]: https://gitlab.freedesktop.org/drm/intel/issues/2940
[i915#3428]: https://gitlab.freedesktop.org/drm/intel/issues/3428
[i915#4312]: https://gitlab.freedesktop.org/drm/intel/issues/4312

Build changes
-------------

* Linux: CI_DRM_11120 -> Patchwork_22075

CI-20190529: 20190529
CI_DRM_11120: d8e524ded1a6cb24bbd2da0785b04f199c03f1b9 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6330: f73008bac9a8db0779264b170f630483e9165764 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_22075: e88e293f760284f0f7745fe00fc49743980c1ed8 @ git://anongit.freedesktop.org/gfx-ci/linux

== Linux commits ==

e88e293f7602 drm/i915: fix header file inclusion for might_alloc()

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22075/index.html