On Fri, Sep 11, 2026 at 05:04:04PM +0200, Petr Pavlu wrote: > Several drivers/gpu/drm/i915/*.c files use ALLOW_ERROR_INJECTION(), which > is defined in asm-generic/error-injection.h. They currently rely on this > header being included indirectly through linux/module.h -> > linux/error-injection.h. > > Add the missing includes in preparation for removing the > linux/error-injection.h include from linux/module.h. > > Signed-off-by: Petr Pavlu <[email protected]>
Reviewed-by: Francois Dugast <[email protected]> > --- > drivers/gpu/drm/i915/display/intel_connector.c | 1 + > drivers/gpu/drm/i915/display/intel_display_driver.c | 1 + > drivers/gpu/drm/i915/gt/intel_engine_cs.c | 1 + > drivers/gpu/drm/i915/gt/intel_gt.c | 2 ++ > drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c | 1 + > drivers/gpu/drm/i915/gt/uc/intel_uc.c | 1 + > drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 1 + > drivers/gpu/drm/i915/i915_driver.c | 1 + > drivers/gpu/drm/i915/i915_pci.c | 2 ++ > drivers/gpu/drm/i915/intel_uncore.c | 1 + > 10 files changed, 12 insertions(+) > > diff --git a/drivers/gpu/drm/i915/display/intel_connector.c > b/drivers/gpu/drm/i915/display/intel_connector.c > index 7ef9338d67ab..a287884c0045 100644 > --- a/drivers/gpu/drm/i915/display/intel_connector.c > +++ b/drivers/gpu/drm/i915/display/intel_connector.c > @@ -23,6 +23,7 @@ > * DEALINGS IN THE SOFTWARE. > */ > > +#include <linux/error-injection.h> > #include <linux/i2c.h> > #include <linux/slab.h> > > diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.c > b/drivers/gpu/drm/i915/display/intel_display_driver.c > index 70d112fd4287..204810a11e46 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_driver.c > +++ b/drivers/gpu/drm/i915/display/intel_display_driver.c > @@ -7,6 +7,7 @@ > * details here. > */ > > +#include <linux/error-injection.h> > #include <linux/vga_switcheroo.h> > #include <acpi/video.h> > #include <drm/display/drm_dp_mst_helper.h> > diff --git a/drivers/gpu/drm/i915/gt/intel_engine_cs.c > b/drivers/gpu/drm/i915/gt/intel_engine_cs.c > index c0fd349a4600..2c3bc7b67c0d 100644 > --- a/drivers/gpu/drm/i915/gt/intel_engine_cs.c > +++ b/drivers/gpu/drm/i915/gt/intel_engine_cs.c > @@ -3,6 +3,7 @@ > * Copyright © 2016 Intel Corporation > */ > > +#include <linux/error-injection.h> > #include <linux/string_helpers.h> > > #include <drm/drm_print.h> > diff --git a/drivers/gpu/drm/i915/gt/intel_gt.c > b/drivers/gpu/drm/i915/gt/intel_gt.c > index 5c7f862f7100..2f0e1cb5578c 100644 > --- a/drivers/gpu/drm/i915/gt/intel_gt.c > +++ b/drivers/gpu/drm/i915/gt/intel_gt.c > @@ -3,6 +3,8 @@ > * Copyright © 2019 Intel Corporation > */ > > +#include <linux/error-injection.h> > + > #include <drm/drm_managed.h> > #include <drm/intel/intel-gtt.h> > #include <drm/intel/intel_gmd_interrupt_regs.h> > diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c > b/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c > index 1c455d84bf9d..091aa33f624a 100644 > --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c > +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c > @@ -4,6 +4,7 @@ > */ > > #include <linux/circ_buf.h> > +#include <linux/error-injection.h> > #include <linux/ktime.h> > #include <linux/string_helpers.h> > #include <linux/time64.h> > diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc.c > b/drivers/gpu/drm/i915/gt/uc/intel_uc.c > index bd07c72a66fc..d367a897c86b 100644 > --- a/drivers/gpu/drm/i915/gt/uc/intel_uc.c > +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc.c > @@ -3,6 +3,7 @@ > * Copyright © 2016-2019 Intel Corporation > */ > > +#include <linux/error-injection.h> > #include <linux/string_helpers.h> > > #include "gt/intel_gt.h" > diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c > b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c > index 7fac97fe30a6..d7c731fe972b 100644 > --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c > +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c > @@ -4,6 +4,7 @@ > */ > > #include <linux/bitfield.h> > +#include <linux/error-injection.h> > #include <linux/firmware.h> > #include <linux/highmem.h> > > diff --git a/drivers/gpu/drm/i915/i915_driver.c > b/drivers/gpu/drm/i915/i915_driver.c > index ce6d20958320..aeb7b24c81c8 100644 > --- a/drivers/gpu/drm/i915/i915_driver.c > +++ b/drivers/gpu/drm/i915/i915_driver.c > @@ -30,6 +30,7 @@ > #include <linux/aperture.h> > #include <linux/acpi.h> > #include <linux/device.h> > +#include <linux/error-injection.h> > #include <linux/module.h> > #include <linux/oom.h> > #include <linux/pci.h> > diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c > index 2f03f95945f1..84a7dc6ab5db 100644 > --- a/drivers/gpu/drm/i915/i915_pci.c > +++ b/drivers/gpu/drm/i915/i915_pci.c > @@ -22,6 +22,8 @@ > * > */ > > +#include <linux/error-injection.h> > + > #include <drm/drm_color_mgmt.h> > #include <drm/drm_drv.h> > #include <drm/intel/pci_config.h> > diff --git a/drivers/gpu/drm/i915/intel_uncore.c > b/drivers/gpu/drm/i915/intel_uncore.c > index 170e83a8c9fc..e360e4f9d9a2 100644 > --- a/drivers/gpu/drm/i915/intel_uncore.c > +++ b/drivers/gpu/drm/i915/intel_uncore.c > @@ -21,6 +21,7 @@ > * IN THE SOFTWARE. > */ > > +#include <linux/error-injection.h> > #include <linux/pm_runtime.h> > > #include <drm/drm_managed.h> > > -- > 2.55.0
