| Message ID | 20211116171434.20516-5-jani.nikula@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/5] drm/i915: drop intel_display.h include from intel_ddi.h | expand |
On Tue, Nov 16, 2021 at 07:14:34PM +0200, Jani Nikula wrote: > Use forward declarations instead. > > Cc: Imre Deak <imre.deak@intel.com> > Signed-off-by: Jani Nikula <jani.nikula@intel.com> On the series: Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> I'm assuming you've copypaste stuff correctly, at a glance it looks like it :-) Also I think that's a solid direction for untangling our include mess! -Daniel > --- > drivers/gpu/drm/i915/display/intel_display_power.h | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display_power.h b/drivers/gpu/drm/i915/display/intel_display_power.h > index 2777af09c711..686d18eaa24c 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_power.h > +++ b/drivers/gpu/drm/i915/display/intel_display_power.h > @@ -6,10 +6,11 @@ > #ifndef __INTEL_DISPLAY_POWER_H__ > #define __INTEL_DISPLAY_POWER_H__ > > -#include "intel_display.h" > #include "intel_runtime_pm.h" > #include "i915_reg.h" > > +enum dpio_channel; > +enum dpio_phy; > struct drm_i915_private; > struct i915_power_well; > struct intel_encoder; > -- > 2.30.2 >
On Tue, 16 Nov 2021, Daniel Vetter <daniel@ffwll.ch> wrote: > On Tue, Nov 16, 2021 at 07:14:34PM +0200, Jani Nikula wrote: >> Use forward declarations instead. >> >> Cc: Imre Deak <imre.deak@intel.com> >> Signed-off-by: Jani Nikula <jani.nikula@intel.com> > > On the series: Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> > > I'm assuming you've copypaste stuff correctly, at a glance it looks like > it :-) > > Also I think that's a solid direction for untangling our include mess! Thanks for the reviews, pushed to drm-intel-next. BR, Jani. > -Daniel > >> --- >> drivers/gpu/drm/i915/display/intel_display_power.h | 3 ++- >> 1 file changed, 2 insertions(+), 1 deletion(-) >> >> diff --git a/drivers/gpu/drm/i915/display/intel_display_power.h b/drivers/gpu/drm/i915/display/intel_display_power.h >> index 2777af09c711..686d18eaa24c 100644 >> --- a/drivers/gpu/drm/i915/display/intel_display_power.h >> +++ b/drivers/gpu/drm/i915/display/intel_display_power.h >> @@ -6,10 +6,11 @@ >> #ifndef __INTEL_DISPLAY_POWER_H__ >> #define __INTEL_DISPLAY_POWER_H__ >> >> -#include "intel_display.h" >> #include "intel_runtime_pm.h" >> #include "i915_reg.h" >> >> +enum dpio_channel; >> +enum dpio_phy; >> struct drm_i915_private; >> struct i915_power_well; >> struct intel_encoder; >> -- >> 2.30.2 >>
diff --git a/drivers/gpu/drm/i915/display/intel_display_power.h b/drivers/gpu/drm/i915/display/intel_display_power.h index 2777af09c711..686d18eaa24c 100644 --- a/drivers/gpu/drm/i915/display/intel_display_power.h +++ b/drivers/gpu/drm/i915/display/intel_display_power.h @@ -6,10 +6,11 @@ #ifndef __INTEL_DISPLAY_POWER_H__ #define __INTEL_DISPLAY_POWER_H__ -#include "intel_display.h" #include "intel_runtime_pm.h" #include "i915_reg.h" +enum dpio_channel; +enum dpio_phy; struct drm_i915_private; struct i915_power_well; struct intel_encoder;
Use forward declarations instead. Cc: Imre Deak <imre.deak@intel.com> Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- drivers/gpu/drm/i915/display/intel_display_power.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)