| Message ID | 488179aa90110d979e61104973b255161ec36057.1639057801.git.jani.nikula@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915: include reductions | expand |
On Thu, Dec 09, 2021 at 03:50:56PM +0200, Jani Nikula wrote: > Not needed. > > Signed-off-by: Jani Nikula <jani.nikula@intel.com> > --- > drivers/gpu/drm/i915/gt/intel_reset.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/gt/intel_reset.c b/drivers/gpu/drm/i915/gt/intel_reset.c > index 63199f0550e6..b8ac454f2d96 100644 > --- a/drivers/gpu/drm/i915/gt/intel_reset.c > +++ b/drivers/gpu/drm/i915/gt/intel_reset.c > @@ -6,7 +6,6 @@ > #include <linux/sched/mm.h> > #include <linux/stop_machine.h> > > -#include "display/intel_display_types.h" intel_display_{prepare,finish}_reset() are in intel_display.h so I'm thinking that is what we want to include here. I guess atm it gets included via some more circuitous route? > #include "display/intel_overlay.h" > > #include "gem/i915_gem_context.h" > -- > 2.30.2
On Thu, 09 Dec 2021, Ville Syrjälä <ville.syrjala@linux.intel.com> wrote: > On Thu, Dec 09, 2021 at 03:50:56PM +0200, Jani Nikula wrote: >> Not needed. >> >> Signed-off-by: Jani Nikula <jani.nikula@intel.com> >> --- >> drivers/gpu/drm/i915/gt/intel_reset.c | 1 - >> 1 file changed, 1 deletion(-) >> >> diff --git a/drivers/gpu/drm/i915/gt/intel_reset.c b/drivers/gpu/drm/i915/gt/intel_reset.c >> index 63199f0550e6..b8ac454f2d96 100644 >> --- a/drivers/gpu/drm/i915/gt/intel_reset.c >> +++ b/drivers/gpu/drm/i915/gt/intel_reset.c >> @@ -6,7 +6,6 @@ >> #include <linux/sched/mm.h> >> #include <linux/stop_machine.h> >> >> -#include "display/intel_display_types.h" > > intel_display_{prepare,finish}_reset() are in intel_display.h > so I'm thinking that is what we want to include here. I guess > atm it gets included via some more circuitous route? Mmmh, all roads lead to i915_drv.h... We should trim the includes in i915_drv.h a *lot* too. Make it purely about defining struct drm_i915_private, not about including the world. It's just that especially the gem/gt headers include just about everything. BR, Jani. > >> #include "display/intel_overlay.h" >> >> #include "gem/i915_gem_context.h" >> -- >> 2.30.2
diff --git a/drivers/gpu/drm/i915/gt/intel_reset.c b/drivers/gpu/drm/i915/gt/intel_reset.c index 63199f0550e6..b8ac454f2d96 100644 --- a/drivers/gpu/drm/i915/gt/intel_reset.c +++ b/drivers/gpu/drm/i915/gt/intel_reset.c @@ -6,7 +6,6 @@ #include <linux/sched/mm.h> #include <linux/stop_machine.h> -#include "display/intel_display_types.h" #include "display/intel_overlay.h" #include "gem/i915_gem_context.h"
Not needed. Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- drivers/gpu/drm/i915/gt/intel_reset.c | 1 - 1 file changed, 1 deletion(-)