| Message ID | 20240823123318.3189503-1-jani.nikula@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915: remove unnecessary display includes | expand |
On Fri, Aug 23, 2024 at 03:33:18PM +0300, Jani Nikula wrote: > There are a number of leftover #include "display/..." directives that > are completely unnecessary. Remove them to make it easier to spot the > relevant ones. In one case, switch to a more specific include. > > Signed-off-by: Jani Nikula <jani.nikula@intel.com> trusting more the compiler then manual inspection: Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> > --- > drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 2 -- > drivers/gpu/drm/i915/gt/intel_ggtt.c | 1 - > drivers/gpu/drm/i915/i915_driver.c | 4 +--- > drivers/gpu/drm/i915/i915_gem.c | 2 -- > drivers/gpu/drm/i915/i915_gem_gtt.c | 1 - > drivers/gpu/drm/i915/i915_irq.c | 1 - > drivers/gpu/drm/i915/i915_pci.c | 1 - > 7 files changed, 1 insertion(+), 11 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c > index c58290274f97..01b7587dd1f8 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c > +++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c > @@ -12,8 +12,6 @@ > #include <drm/drm_auth.h> > #include <drm/drm_syncobj.h> > > -#include "display/intel_frontbuffer.h" > - > #include "gem/i915_gem_ioctls.h" > #include "gt/intel_context.h" > #include "gt/intel_gpu_commands.h" > diff --git a/drivers/gpu/drm/i915/gt/intel_ggtt.c b/drivers/gpu/drm/i915/gt/intel_ggtt.c > index 206a5e0fedf1..d60a6ca0cae5 100644 > --- a/drivers/gpu/drm/i915/gt/intel_ggtt.c > +++ b/drivers/gpu/drm/i915/gt/intel_ggtt.c > @@ -12,7 +12,6 @@ > #include <drm/intel/i915_drm.h> > #include <drm/intel/intel-gtt.h> > > -#include "display/intel_display.h" > #include "gem/i915_gem_lmem.h" > > #include "intel_context.h" > diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c > index e32766286369..ccdd2983cfb5 100644 > --- a/drivers/gpu/drm/i915/i915_driver.c > +++ b/drivers/gpu/drm/i915/i915_driver.c > @@ -49,7 +49,7 @@ > #include "display/intel_bw.h" > #include "display/intel_cdclk.h" > #include "display/intel_display_driver.h" > -#include "display/intel_display_types.h" > +#include "display/intel_display.h" > #include "display/intel_dmc.h" > #include "display/intel_dp.h" > #include "display/intel_dpt.h" > @@ -58,10 +58,8 @@ > #include "display/intel_hotplug.h" > #include "display/intel_overlay.h" > #include "display/intel_pch_refclk.h" > -#include "display/intel_pipe_crc.h" > #include "display/intel_pps.h" > #include "display/intel_sprite.h" > -#include "display/intel_vga.h" > #include "display/skl_watermark.h" > > #include "gem/i915_gem_context.h" > diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c > index 1391c01d7663..070ab6546987 100644 > --- a/drivers/gpu/drm/i915/i915_gem.c > +++ b/drivers/gpu/drm/i915/i915_gem.c > @@ -39,8 +39,6 @@ > #include <drm/drm_cache.h> > #include <drm/drm_vma_manager.h> > > -#include "display/intel_display.h" > - > #include "gem/i915_gem_clflush.h" > #include "gem/i915_gem_context.h" > #include "gem/i915_gem_ioctls.h" > diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c > index 7bd1861ddbdf..a9662cc6ed1e 100644 > --- a/drivers/gpu/drm/i915/i915_gem_gtt.c > +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c > @@ -15,7 +15,6 @@ > #include <asm/set_memory.h> > #include <asm/smp.h> > > -#include "display/intel_frontbuffer.h" > #include "gt/intel_gt.h" > #include "gt/intel_gt_requests.h" > > diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c > index 8059ac7e15fe..2321de48d169 100644 > --- a/drivers/gpu/drm/i915/i915_irq.c > +++ b/drivers/gpu/drm/i915/i915_irq.c > @@ -34,7 +34,6 @@ > #include <drm/drm_drv.h> > > #include "display/intel_display_irq.h" > -#include "display/intel_display_types.h" > #include "display/intel_hotplug.h" > #include "display/intel_hotplug_irq.h" > #include "display/intel_lpe_audio.h" > diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c > index 94c89ca2ef30..d37bb3a704d0 100644 > --- a/drivers/gpu/drm/i915/i915_pci.c > +++ b/drivers/gpu/drm/i915/i915_pci.c > @@ -26,7 +26,6 @@ > #include <drm/drm_drv.h> > #include <drm/intel/i915_pciids.h> > > -#include "display/intel_display.h" > #include "display/intel_display_driver.h" > #include "gt/intel_gt_regs.h" > #include "gt/intel_sa_media.h" > -- > 2.39.2 >
On Fri, 23 Aug 2024, Rodrigo Vivi <rodrigo.vivi@intel.com> wrote: > On Fri, Aug 23, 2024 at 03:33:18PM +0300, Jani Nikula wrote: >> There are a number of leftover #include "display/..." directives that >> are completely unnecessary. Remove them to make it easier to spot the >> relevant ones. In one case, switch to a more specific include. >> >> Signed-off-by: Jani Nikula <jani.nikula@intel.com> > > trusting more the compiler then manual inspection: > > Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> Thanks, pushed to din. BR, Jani. > >> --- >> drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 2 -- >> drivers/gpu/drm/i915/gt/intel_ggtt.c | 1 - >> drivers/gpu/drm/i915/i915_driver.c | 4 +--- >> drivers/gpu/drm/i915/i915_gem.c | 2 -- >> drivers/gpu/drm/i915/i915_gem_gtt.c | 1 - >> drivers/gpu/drm/i915/i915_irq.c | 1 - >> drivers/gpu/drm/i915/i915_pci.c | 1 - >> 7 files changed, 1 insertion(+), 11 deletions(-) >> >> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c >> index c58290274f97..01b7587dd1f8 100644 >> --- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c >> +++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c >> @@ -12,8 +12,6 @@ >> #include <drm/drm_auth.h> >> #include <drm/drm_syncobj.h> >> >> -#include "display/intel_frontbuffer.h" >> - >> #include "gem/i915_gem_ioctls.h" >> #include "gt/intel_context.h" >> #include "gt/intel_gpu_commands.h" >> diff --git a/drivers/gpu/drm/i915/gt/intel_ggtt.c b/drivers/gpu/drm/i915/gt/intel_ggtt.c >> index 206a5e0fedf1..d60a6ca0cae5 100644 >> --- a/drivers/gpu/drm/i915/gt/intel_ggtt.c >> +++ b/drivers/gpu/drm/i915/gt/intel_ggtt.c >> @@ -12,7 +12,6 @@ >> #include <drm/intel/i915_drm.h> >> #include <drm/intel/intel-gtt.h> >> >> -#include "display/intel_display.h" >> #include "gem/i915_gem_lmem.h" >> >> #include "intel_context.h" >> diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c >> index e32766286369..ccdd2983cfb5 100644 >> --- a/drivers/gpu/drm/i915/i915_driver.c >> +++ b/drivers/gpu/drm/i915/i915_driver.c >> @@ -49,7 +49,7 @@ >> #include "display/intel_bw.h" >> #include "display/intel_cdclk.h" >> #include "display/intel_display_driver.h" >> -#include "display/intel_display_types.h" >> +#include "display/intel_display.h" >> #include "display/intel_dmc.h" >> #include "display/intel_dp.h" >> #include "display/intel_dpt.h" >> @@ -58,10 +58,8 @@ >> #include "display/intel_hotplug.h" >> #include "display/intel_overlay.h" >> #include "display/intel_pch_refclk.h" >> -#include "display/intel_pipe_crc.h" >> #include "display/intel_pps.h" >> #include "display/intel_sprite.h" >> -#include "display/intel_vga.h" >> #include "display/skl_watermark.h" >> >> #include "gem/i915_gem_context.h" >> diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c >> index 1391c01d7663..070ab6546987 100644 >> --- a/drivers/gpu/drm/i915/i915_gem.c >> +++ b/drivers/gpu/drm/i915/i915_gem.c >> @@ -39,8 +39,6 @@ >> #include <drm/drm_cache.h> >> #include <drm/drm_vma_manager.h> >> >> -#include "display/intel_display.h" >> - >> #include "gem/i915_gem_clflush.h" >> #include "gem/i915_gem_context.h" >> #include "gem/i915_gem_ioctls.h" >> diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c >> index 7bd1861ddbdf..a9662cc6ed1e 100644 >> --- a/drivers/gpu/drm/i915/i915_gem_gtt.c >> +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c >> @@ -15,7 +15,6 @@ >> #include <asm/set_memory.h> >> #include <asm/smp.h> >> >> -#include "display/intel_frontbuffer.h" >> #include "gt/intel_gt.h" >> #include "gt/intel_gt_requests.h" >> >> diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c >> index 8059ac7e15fe..2321de48d169 100644 >> --- a/drivers/gpu/drm/i915/i915_irq.c >> +++ b/drivers/gpu/drm/i915/i915_irq.c >> @@ -34,7 +34,6 @@ >> #include <drm/drm_drv.h> >> >> #include "display/intel_display_irq.h" >> -#include "display/intel_display_types.h" >> #include "display/intel_hotplug.h" >> #include "display/intel_hotplug_irq.h" >> #include "display/intel_lpe_audio.h" >> diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c >> index 94c89ca2ef30..d37bb3a704d0 100644 >> --- a/drivers/gpu/drm/i915/i915_pci.c >> +++ b/drivers/gpu/drm/i915/i915_pci.c >> @@ -26,7 +26,6 @@ >> #include <drm/drm_drv.h> >> #include <drm/intel/i915_pciids.h> >> >> -#include "display/intel_display.h" >> #include "display/intel_display_driver.h" >> #include "gt/intel_gt_regs.h" >> #include "gt/intel_sa_media.h" >> -- >> 2.39.2 >>
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c index c58290274f97..01b7587dd1f8 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c @@ -12,8 +12,6 @@ #include <drm/drm_auth.h> #include <drm/drm_syncobj.h> -#include "display/intel_frontbuffer.h" - #include "gem/i915_gem_ioctls.h" #include "gt/intel_context.h" #include "gt/intel_gpu_commands.h" diff --git a/drivers/gpu/drm/i915/gt/intel_ggtt.c b/drivers/gpu/drm/i915/gt/intel_ggtt.c index 206a5e0fedf1..d60a6ca0cae5 100644 --- a/drivers/gpu/drm/i915/gt/intel_ggtt.c +++ b/drivers/gpu/drm/i915/gt/intel_ggtt.c @@ -12,7 +12,6 @@ #include <drm/intel/i915_drm.h> #include <drm/intel/intel-gtt.h> -#include "display/intel_display.h" #include "gem/i915_gem_lmem.h" #include "intel_context.h" diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c index e32766286369..ccdd2983cfb5 100644 --- a/drivers/gpu/drm/i915/i915_driver.c +++ b/drivers/gpu/drm/i915/i915_driver.c @@ -49,7 +49,7 @@ #include "display/intel_bw.h" #include "display/intel_cdclk.h" #include "display/intel_display_driver.h" -#include "display/intel_display_types.h" +#include "display/intel_display.h" #include "display/intel_dmc.h" #include "display/intel_dp.h" #include "display/intel_dpt.h" @@ -58,10 +58,8 @@ #include "display/intel_hotplug.h" #include "display/intel_overlay.h" #include "display/intel_pch_refclk.h" -#include "display/intel_pipe_crc.h" #include "display/intel_pps.h" #include "display/intel_sprite.h" -#include "display/intel_vga.h" #include "display/skl_watermark.h" #include "gem/i915_gem_context.h" diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 1391c01d7663..070ab6546987 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -39,8 +39,6 @@ #include <drm/drm_cache.h> #include <drm/drm_vma_manager.h> -#include "display/intel_display.h" - #include "gem/i915_gem_clflush.h" #include "gem/i915_gem_context.h" #include "gem/i915_gem_ioctls.h" diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c index 7bd1861ddbdf..a9662cc6ed1e 100644 --- a/drivers/gpu/drm/i915/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c @@ -15,7 +15,6 @@ #include <asm/set_memory.h> #include <asm/smp.h> -#include "display/intel_frontbuffer.h" #include "gt/intel_gt.h" #include "gt/intel_gt_requests.h" diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 8059ac7e15fe..2321de48d169 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -34,7 +34,6 @@ #include <drm/drm_drv.h> #include "display/intel_display_irq.h" -#include "display/intel_display_types.h" #include "display/intel_hotplug.h" #include "display/intel_hotplug_irq.h" #include "display/intel_lpe_audio.h" diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c index 94c89ca2ef30..d37bb3a704d0 100644 --- a/drivers/gpu/drm/i915/i915_pci.c +++ b/drivers/gpu/drm/i915/i915_pci.c @@ -26,7 +26,6 @@ #include <drm/drm_drv.h> #include <drm/intel/i915_pciids.h> -#include "display/intel_display.h" #include "display/intel_display_driver.h" #include "gt/intel_gt_regs.h" #include "gt/intel_sa_media.h"
There are a number of leftover #include "display/..." directives that are completely unnecessary. Remove them to make it easier to spot the relevant ones. In one case, switch to a more specific include. Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 2 -- drivers/gpu/drm/i915/gt/intel_ggtt.c | 1 - drivers/gpu/drm/i915/i915_driver.c | 4 +--- drivers/gpu/drm/i915/i915_gem.c | 2 -- drivers/gpu/drm/i915/i915_gem_gtt.c | 1 - drivers/gpu/drm/i915/i915_irq.c | 1 - drivers/gpu/drm/i915/i915_pci.c | 1 - 7 files changed, 1 insertion(+), 11 deletions(-)