| Message ID | 20240530100747.328631-1-jani.nikula@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/2] drm/i915: drop unnecessary i915_reg.h includes | expand |
On Thu, May 30, 2024 at 01:07:46PM +0300, Jani Nikula wrote: > With the register header refactoring, some of the includes of i915_reg.h > have become unnecessary. Remove. > > Signed-off-by: Jani Nikula <jani.nikula@intel.com> > --- > drivers/gpu/drm/i915/display/dvo_ns2501.c | 1 - > drivers/gpu/drm/i915/display/intel_atomic.c | 1 - > drivers/gpu/drm/i915/display/intel_atomic_plane.c | 1 - > drivers/gpu/drm/i915/display/intel_dkl_phy.c | 1 - > drivers/gpu/drm/i915/display/intel_dsb.c | 1 - > drivers/gpu/drm/i915/display/intel_sprite.c | 1 - > drivers/gpu/drm/i915/display/intel_vdsc.c | 1 - > 7 files changed, 7 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/dvo_ns2501.c b/drivers/gpu/drm/i915/display/dvo_ns2501.c > index 1df212fb000e..21486008dae9 100644 > --- a/drivers/gpu/drm/i915/display/dvo_ns2501.c > +++ b/drivers/gpu/drm/i915/display/dvo_ns2501.c > @@ -27,7 +27,6 @@ > */ > > #include "i915_drv.h" > -#include "i915_reg.h" > #include "intel_display_types.h" > #include "intel_dvo_dev.h" > > diff --git a/drivers/gpu/drm/i915/display/intel_atomic.c b/drivers/gpu/drm/i915/display/intel_atomic.c > index 7a77ae3dc394..76aa10b6f647 100644 > --- a/drivers/gpu/drm/i915/display/intel_atomic.c > +++ b/drivers/gpu/drm/i915/display/intel_atomic.c > @@ -35,7 +35,6 @@ > #include <drm/drm_fourcc.h> > > #include "i915_drv.h" > -#include "i915_reg.h" > #include "intel_atomic.h" > #include "intel_cdclk.h" > #include "intel_display_types.h" > diff --git a/drivers/gpu/drm/i915/display/intel_atomic_plane.c b/drivers/gpu/drm/i915/display/intel_atomic_plane.c > index a2a827070c33..a4ce39a7f265 100644 > --- a/drivers/gpu/drm/i915/display/intel_atomic_plane.c > +++ b/drivers/gpu/drm/i915/display/intel_atomic_plane.c > @@ -39,7 +39,6 @@ > #include <drm/drm_fourcc.h> > > #include "i915_config.h" > -#include "i915_reg.h" That has sure spread into some weird places. As it seems to build, the series is Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > #include "i9xx_plane_regs.h" > #include "intel_atomic_plane.h" > #include "intel_cdclk.h" > diff --git a/drivers/gpu/drm/i915/display/intel_dkl_phy.c b/drivers/gpu/drm/i915/display/intel_dkl_phy.c > index a001232ad445..b146b4c46943 100644 > --- a/drivers/gpu/drm/i915/display/intel_dkl_phy.c > +++ b/drivers/gpu/drm/i915/display/intel_dkl_phy.c > @@ -4,7 +4,6 @@ > */ > > #include "i915_drv.h" > -#include "i915_reg.h" > > #include "intel_de.h" > #include "intel_display.h" > diff --git a/drivers/gpu/drm/i915/display/intel_dsb.c b/drivers/gpu/drm/i915/display/intel_dsb.c > index 4baaa92ceaec..bcc9de047fac 100644 > --- a/drivers/gpu/drm/i915/display/intel_dsb.c > +++ b/drivers/gpu/drm/i915/display/intel_dsb.c > @@ -6,7 +6,6 @@ > > #include "i915_drv.h" > #include "i915_irq.h" > -#include "i915_reg.h" > #include "intel_crtc.h" > #include "intel_de.h" > #include "intel_display_types.h" > diff --git a/drivers/gpu/drm/i915/display/intel_sprite.c b/drivers/gpu/drm/i915/display/intel_sprite.c > index 36a253a19c74..e1c907f601da 100644 > --- a/drivers/gpu/drm/i915/display/intel_sprite.c > +++ b/drivers/gpu/drm/i915/display/intel_sprite.c > @@ -39,7 +39,6 @@ > #include <drm/drm_rect.h> > > #include "i915_drv.h" > -#include "i915_reg.h" > #include "i9xx_plane.h" > #include "intel_atomic_plane.h" > #include "intel_de.h" > diff --git a/drivers/gpu/drm/i915/display/intel_vdsc.c b/drivers/gpu/drm/i915/display/intel_vdsc.c > index 17d6572f9d0a..d76e70846a8c 100644 > --- a/drivers/gpu/drm/i915/display/intel_vdsc.c > +++ b/drivers/gpu/drm/i915/display/intel_vdsc.c > @@ -10,7 +10,6 @@ > #include <drm/display/drm_dsc_helper.h> > > #include "i915_drv.h" > -#include "i915_reg.h" > #include "intel_crtc.h" > #include "intel_de.h" > #include "intel_display_types.h" > -- > 2.39.2
On Fri, 31 May 2024, Ville Syrjälä <ville.syrjala@linux.intel.com> wrote: > On Thu, May 30, 2024 at 01:07:46PM +0300, Jani Nikula wrote: >> With the register header refactoring, some of the includes of i915_reg.h >> have become unnecessary. Remove. >> >> Signed-off-by: Jani Nikula <jani.nikula@intel.com> >> --- >> drivers/gpu/drm/i915/display/dvo_ns2501.c | 1 - >> drivers/gpu/drm/i915/display/intel_atomic.c | 1 - >> drivers/gpu/drm/i915/display/intel_atomic_plane.c | 1 - >> drivers/gpu/drm/i915/display/intel_dkl_phy.c | 1 - >> drivers/gpu/drm/i915/display/intel_dsb.c | 1 - >> drivers/gpu/drm/i915/display/intel_sprite.c | 1 - >> drivers/gpu/drm/i915/display/intel_vdsc.c | 1 - >> 7 files changed, 7 deletions(-) >> >> diff --git a/drivers/gpu/drm/i915/display/dvo_ns2501.c b/drivers/gpu/drm/i915/display/dvo_ns2501.c >> index 1df212fb000e..21486008dae9 100644 >> --- a/drivers/gpu/drm/i915/display/dvo_ns2501.c >> +++ b/drivers/gpu/drm/i915/display/dvo_ns2501.c >> @@ -27,7 +27,6 @@ >> */ >> >> #include "i915_drv.h" >> -#include "i915_reg.h" >> #include "intel_display_types.h" >> #include "intel_dvo_dev.h" >> >> diff --git a/drivers/gpu/drm/i915/display/intel_atomic.c b/drivers/gpu/drm/i915/display/intel_atomic.c >> index 7a77ae3dc394..76aa10b6f647 100644 >> --- a/drivers/gpu/drm/i915/display/intel_atomic.c >> +++ b/drivers/gpu/drm/i915/display/intel_atomic.c >> @@ -35,7 +35,6 @@ >> #include <drm/drm_fourcc.h> >> >> #include "i915_drv.h" >> -#include "i915_reg.h" >> #include "intel_atomic.h" >> #include "intel_cdclk.h" >> #include "intel_display_types.h" >> diff --git a/drivers/gpu/drm/i915/display/intel_atomic_plane.c b/drivers/gpu/drm/i915/display/intel_atomic_plane.c >> index a2a827070c33..a4ce39a7f265 100644 >> --- a/drivers/gpu/drm/i915/display/intel_atomic_plane.c >> +++ b/drivers/gpu/drm/i915/display/intel_atomic_plane.c >> @@ -39,7 +39,6 @@ >> #include <drm/drm_fourcc.h> >> >> #include "i915_config.h" >> -#include "i915_reg.h" > > That has sure spread into some weird places. > > As it seems to build, the series is > Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Thanks, pushed to din. BR, Jani. > >> #include "i9xx_plane_regs.h" >> #include "intel_atomic_plane.h" >> #include "intel_cdclk.h" >> diff --git a/drivers/gpu/drm/i915/display/intel_dkl_phy.c b/drivers/gpu/drm/i915/display/intel_dkl_phy.c >> index a001232ad445..b146b4c46943 100644 >> --- a/drivers/gpu/drm/i915/display/intel_dkl_phy.c >> +++ b/drivers/gpu/drm/i915/display/intel_dkl_phy.c >> @@ -4,7 +4,6 @@ >> */ >> >> #include "i915_drv.h" >> -#include "i915_reg.h" >> >> #include "intel_de.h" >> #include "intel_display.h" >> diff --git a/drivers/gpu/drm/i915/display/intel_dsb.c b/drivers/gpu/drm/i915/display/intel_dsb.c >> index 4baaa92ceaec..bcc9de047fac 100644 >> --- a/drivers/gpu/drm/i915/display/intel_dsb.c >> +++ b/drivers/gpu/drm/i915/display/intel_dsb.c >> @@ -6,7 +6,6 @@ >> >> #include "i915_drv.h" >> #include "i915_irq.h" >> -#include "i915_reg.h" >> #include "intel_crtc.h" >> #include "intel_de.h" >> #include "intel_display_types.h" >> diff --git a/drivers/gpu/drm/i915/display/intel_sprite.c b/drivers/gpu/drm/i915/display/intel_sprite.c >> index 36a253a19c74..e1c907f601da 100644 >> --- a/drivers/gpu/drm/i915/display/intel_sprite.c >> +++ b/drivers/gpu/drm/i915/display/intel_sprite.c >> @@ -39,7 +39,6 @@ >> #include <drm/drm_rect.h> >> >> #include "i915_drv.h" >> -#include "i915_reg.h" >> #include "i9xx_plane.h" >> #include "intel_atomic_plane.h" >> #include "intel_de.h" >> diff --git a/drivers/gpu/drm/i915/display/intel_vdsc.c b/drivers/gpu/drm/i915/display/intel_vdsc.c >> index 17d6572f9d0a..d76e70846a8c 100644 >> --- a/drivers/gpu/drm/i915/display/intel_vdsc.c >> +++ b/drivers/gpu/drm/i915/display/intel_vdsc.c >> @@ -10,7 +10,6 @@ >> #include <drm/display/drm_dsc_helper.h> >> >> #include "i915_drv.h" >> -#include "i915_reg.h" >> #include "intel_crtc.h" >> #include "intel_de.h" >> #include "intel_display_types.h" >> -- >> 2.39.2
diff --git a/drivers/gpu/drm/i915/display/dvo_ns2501.c b/drivers/gpu/drm/i915/display/dvo_ns2501.c index 1df212fb000e..21486008dae9 100644 --- a/drivers/gpu/drm/i915/display/dvo_ns2501.c +++ b/drivers/gpu/drm/i915/display/dvo_ns2501.c @@ -27,7 +27,6 @@ */ #include "i915_drv.h" -#include "i915_reg.h" #include "intel_display_types.h" #include "intel_dvo_dev.h" diff --git a/drivers/gpu/drm/i915/display/intel_atomic.c b/drivers/gpu/drm/i915/display/intel_atomic.c index 7a77ae3dc394..76aa10b6f647 100644 --- a/drivers/gpu/drm/i915/display/intel_atomic.c +++ b/drivers/gpu/drm/i915/display/intel_atomic.c @@ -35,7 +35,6 @@ #include <drm/drm_fourcc.h> #include "i915_drv.h" -#include "i915_reg.h" #include "intel_atomic.h" #include "intel_cdclk.h" #include "intel_display_types.h" diff --git a/drivers/gpu/drm/i915/display/intel_atomic_plane.c b/drivers/gpu/drm/i915/display/intel_atomic_plane.c index a2a827070c33..a4ce39a7f265 100644 --- a/drivers/gpu/drm/i915/display/intel_atomic_plane.c +++ b/drivers/gpu/drm/i915/display/intel_atomic_plane.c @@ -39,7 +39,6 @@ #include <drm/drm_fourcc.h> #include "i915_config.h" -#include "i915_reg.h" #include "i9xx_plane_regs.h" #include "intel_atomic_plane.h" #include "intel_cdclk.h" diff --git a/drivers/gpu/drm/i915/display/intel_dkl_phy.c b/drivers/gpu/drm/i915/display/intel_dkl_phy.c index a001232ad445..b146b4c46943 100644 --- a/drivers/gpu/drm/i915/display/intel_dkl_phy.c +++ b/drivers/gpu/drm/i915/display/intel_dkl_phy.c @@ -4,7 +4,6 @@ */ #include "i915_drv.h" -#include "i915_reg.h" #include "intel_de.h" #include "intel_display.h" diff --git a/drivers/gpu/drm/i915/display/intel_dsb.c b/drivers/gpu/drm/i915/display/intel_dsb.c index 4baaa92ceaec..bcc9de047fac 100644 --- a/drivers/gpu/drm/i915/display/intel_dsb.c +++ b/drivers/gpu/drm/i915/display/intel_dsb.c @@ -6,7 +6,6 @@ #include "i915_drv.h" #include "i915_irq.h" -#include "i915_reg.h" #include "intel_crtc.h" #include "intel_de.h" #include "intel_display_types.h" diff --git a/drivers/gpu/drm/i915/display/intel_sprite.c b/drivers/gpu/drm/i915/display/intel_sprite.c index 36a253a19c74..e1c907f601da 100644 --- a/drivers/gpu/drm/i915/display/intel_sprite.c +++ b/drivers/gpu/drm/i915/display/intel_sprite.c @@ -39,7 +39,6 @@ #include <drm/drm_rect.h> #include "i915_drv.h" -#include "i915_reg.h" #include "i9xx_plane.h" #include "intel_atomic_plane.h" #include "intel_de.h" diff --git a/drivers/gpu/drm/i915/display/intel_vdsc.c b/drivers/gpu/drm/i915/display/intel_vdsc.c index 17d6572f9d0a..d76e70846a8c 100644 --- a/drivers/gpu/drm/i915/display/intel_vdsc.c +++ b/drivers/gpu/drm/i915/display/intel_vdsc.c @@ -10,7 +10,6 @@ #include <drm/display/drm_dsc_helper.h> #include "i915_drv.h" -#include "i915_reg.h" #include "intel_crtc.h" #include "intel_de.h" #include "intel_display_types.h"
With the register header refactoring, some of the includes of i915_reg.h have become unnecessary. Remove. Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- drivers/gpu/drm/i915/display/dvo_ns2501.c | 1 - drivers/gpu/drm/i915/display/intel_atomic.c | 1 - drivers/gpu/drm/i915/display/intel_atomic_plane.c | 1 - drivers/gpu/drm/i915/display/intel_dkl_phy.c | 1 - drivers/gpu/drm/i915/display/intel_dsb.c | 1 - drivers/gpu/drm/i915/display/intel_sprite.c | 1 - drivers/gpu/drm/i915/display/intel_vdsc.c | 1 - 7 files changed, 7 deletions(-)