tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

drm/i915/display: drop lots of unnecessary #include i915_drv.h

With the PCH macros switched to use struct intel_display, we have a
number of files that no longer need struct drm_i915_private or anything
else from i915_drv.h anymore. Remove the #include, and add the missing
includes that were previously implicit.

v2: Drop even more of the includes

Reviewed-by: Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>
Link: https://lore.kernel.org/r/5dc9e6a98461c344febac4c645875d8688eba906.1744880985.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Jani Nikula 2958620a 4e9b0ac1

+57 -26
+3 -1
drivers/gpu/drm/i915/display/g4x_dp.c
··· 7 7 8 8 #include <linux/string_helpers.h> 9 9 10 + #include <drm/drm_print.h> 11 + 10 12 #include "g4x_dp.h" 11 - #include "i915_drv.h" 12 13 #include "i915_reg.h" 14 + #include "i915_utils.h" 13 15 #include "intel_audio.h" 14 16 #include "intel_backlight.h" 15 17 #include "intel_connector.h"
+2 -1
drivers/gpu/drm/i915/display/g4x_hdmi.c
··· 5 5 * HDMI support for G4x,ILK,SNB,IVB,VLV,CHV (HSW+ handled by the DDI code). 6 6 */ 7 7 8 + #include <drm/drm_print.h> 9 + 8 10 #include "g4x_hdmi.h" 9 - #include "i915_drv.h" 10 11 #include "i915_reg.h" 11 12 #include "intel_atomic.h" 12 13 #include "intel_audio.h"
+1 -1
drivers/gpu/drm/i915/display/intel_audio.c
··· 27 27 #include <drm/drm_edid.h> 28 28 #include <drm/drm_eld.h> 29 29 #include <drm/drm_fixed.h> 30 + #include <drm/drm_print.h> 30 31 #include <drm/intel/i915_component.h> 31 32 32 - #include "i915_drv.h" 33 33 #include "intel_atomic.h" 34 34 #include "intel_audio.h" 35 35 #include "intel_audio_regs.h"
+4 -1
drivers/gpu/drm/i915/display/intel_backlight.c
··· 10 10 11 11 #include <acpi/video.h> 12 12 13 - #include "i915_drv.h" 13 + #include <drm/drm_file.h> 14 + #include <drm/drm_print.h> 15 + 14 16 #include "i915_reg.h" 17 + #include "i915_utils.h" 15 18 #include "intel_backlight.h" 16 19 #include "intel_backlight_regs.h" 17 20 #include "intel_connector.h"
-1
drivers/gpu/drm/i915/display/intel_cmtg.c
··· 9 9 #include <drm/drm_device.h> 10 10 #include <drm/drm_print.h> 11 11 12 - #include "i915_drv.h" 13 12 #include "i915_reg.h" 14 13 #include "intel_crtc.h" 15 14 #include "intel_cmtg.h"
+1 -1
drivers/gpu/drm/i915/display/intel_crt.c
··· 31 31 #include <drm/drm_atomic_helper.h> 32 32 #include <drm/drm_crtc.h> 33 33 #include <drm/drm_edid.h> 34 + #include <drm/drm_print.h> 34 35 #include <drm/drm_probe_helper.h> 35 36 36 - #include "i915_drv.h" 37 37 #include "i915_irq.h" 38 38 #include "i915_reg.h" 39 39 #include "intel_connector.h"
+2 -1
drivers/gpu/drm/i915/display/intel_cursor.c
··· 9 9 #include <drm/drm_blend.h> 10 10 #include <drm/drm_damage_helper.h> 11 11 #include <drm/drm_fourcc.h> 12 + #include <drm/drm_print.h> 12 13 #include <drm/drm_vblank.h> 13 14 14 - #include "i915_drv.h" 15 15 #include "i915_reg.h" 16 + #include "i915_utils.h" 16 17 #include "intel_atomic.h" 17 18 #include "intel_atomic_plane.h" 18 19 #include "intel_cursor.h"
+3 -1
drivers/gpu/drm/i915/display/intel_cx0_phy.c
··· 6 6 #include <linux/log2.h> 7 7 #include <linux/math64.h> 8 8 9 - #include "i915_drv.h" 9 + #include <drm/drm_print.h> 10 + 10 11 #include "i915_reg.h" 12 + #include "i915_utils.h" 11 13 #include "intel_cx0_phy.h" 12 14 #include "intel_cx0_phy_regs.h" 13 15 #include "intel_ddi.h"
+2 -1
drivers/gpu/drm/i915/display/intel_ddi.c
··· 30 30 31 31 #include <drm/display/drm_dp_helper.h> 32 32 #include <drm/display/drm_scdc_helper.h> 33 + #include <drm/drm_print.h> 33 34 #include <drm/drm_privacy_screen_consumer.h> 34 35 35 - #include "i915_drv.h" 36 36 #include "i915_reg.h" 37 + #include "i915_utils.h" 37 38 #include "icl_dsi.h" 38 39 #include "intel_audio.h" 39 40 #include "intel_audio_regs.h"
+2 -1
drivers/gpu/drm/i915/display/intel_display_debugfs.c
··· 7 7 #include <linux/string_helpers.h> 8 8 9 9 #include <drm/drm_debugfs.h> 10 + #include <drm/drm_drv.h> 10 11 #include <drm/drm_edid.h> 12 + #include <drm/drm_file.h> 11 13 #include <drm/drm_fourcc.h> 12 14 13 15 #include "hsw_ips.h" 14 - #include "i915_drv.h" 15 16 #include "i915_irq.h" 16 17 #include "i915_reg.h" 17 18 #include "i9xx_wm_regs.h"
+5 -3
drivers/gpu/drm/i915/display/intel_display_device.c
··· 3 3 * Copyright © 2023 Intel Corporation 4 4 */ 5 5 6 - #include <drm/intel/pciids.h> 7 - #include <drm/drm_color_mgmt.h> 8 6 #include <linux/pci.h> 9 7 10 - #include "i915_drv.h" 8 + #include <drm/drm_color_mgmt.h> 9 + #include <drm/drm_drv.h> 10 + #include <drm/drm_print.h> 11 + #include <drm/intel/pciids.h> 12 + 11 13 #include "i915_reg.h" 12 14 #include "intel_cx0_phy_regs.h" 13 15 #include "intel_de.h"
+3 -1
drivers/gpu/drm/i915/display/intel_dp_aux.c
··· 3 3 * Copyright © 2020-2021 Intel Corporation 4 4 */ 5 5 6 - #include "i915_drv.h" 6 + #include <drm/drm_print.h> 7 + 7 8 #include "i915_reg.h" 9 + #include "i915_utils.h" 8 10 #include "intel_de.h" 9 11 #include "intel_display_types.h" 10 12 #include "intel_dp.h"
+3 -1
drivers/gpu/drm/i915/display/intel_dp_mst.c
··· 27 27 #include <drm/drm_atomic_helper.h> 28 28 #include <drm/drm_edid.h> 29 29 #include <drm/drm_fixed.h> 30 + #include <drm/drm_print.h> 30 31 #include <drm/drm_probe_helper.h> 31 32 32 - #include "i915_drv.h" 33 33 #include "i915_reg.h" 34 + #include "i915_utils.h" 34 35 #include "intel_atomic.h" 35 36 #include "intel_audio.h" 36 37 #include "intel_connector.h" ··· 52 51 #include "intel_link_bw.h" 53 52 #include "intel_pfit.h" 54 53 #include "intel_psr.h" 54 + #include "intel_step.h" 55 55 #include "intel_vdsc.h" 56 56 #include "intel_vrr.h" 57 57 #include "skl_scaler.h"
+4 -1
drivers/gpu/drm/i915/display/intel_dpll_mgr.c
··· 24 24 #include <linux/math.h> 25 25 #include <linux/string_helpers.h> 26 26 27 + #include <drm/drm_print.h> 28 + 27 29 #include "bxt_dpio_phy_regs.h" 28 - #include "i915_drv.h" 29 30 #include "i915_reg.h" 31 + #include "i915_utils.h" 30 32 #include "intel_cx0_phy.h" 31 33 #include "intel_de.h" 32 34 #include "intel_display_types.h" ··· 40 38 #include "intel_hti.h" 41 39 #include "intel_mg_phy_regs.h" 42 40 #include "intel_pch_refclk.h" 41 + #include "intel_step.h" 43 42 #include "intel_tc.h" 44 43 45 44 /**
+2 -1
drivers/gpu/drm/i915/display/intel_dsb.c
··· 4 4 * 5 5 */ 6 6 7 + #include <drm/drm_print.h> 7 8 #include <drm/drm_vblank.h> 8 9 9 - #include "i915_drv.h" 10 10 #include "i915_irq.h" 11 11 #include "i915_reg.h" 12 + #include "i915_utils.h" 12 13 #include "intel_crtc.h" 13 14 #include "intel_de.h" 14 15 #include "intel_display_rpm.h"
+3 -2
drivers/gpu/drm/i915/display/intel_fdi.c
··· 6 6 #include <linux/string_helpers.h> 7 7 8 8 #include <drm/drm_fixed.h> 9 + #include <drm/drm_print.h> 9 10 10 - #include "i915_drv.h" 11 11 #include "i915_reg.h" 12 + #include "i915_utils.h" 12 13 #include "intel_atomic.h" 13 14 #include "intel_crtc.h" 14 15 #include "intel_ddi.h" 15 16 #include "intel_de.h" 16 - #include "intel_dp.h" 17 17 #include "intel_display_types.h" 18 + #include "intel_dp.h" 18 19 #include "intel_fdi.h" 19 20 #include "intel_fdi_regs.h" 20 21 #include "intel_link_bw.h"
+4 -1
drivers/gpu/drm/i915/display/intel_global_state.c
··· 3 3 * Copyright © 2020 Intel Corporation 4 4 */ 5 5 6 + #include <linux/pci.h> 6 7 #include <linux/string.h> 7 8 8 - #include "i915_drv.h" 9 + #include <drm/drm_print.h> 10 + 9 11 #include "intel_atomic.h" 12 + #include "intel_display_core.h" 10 13 #include "intel_display_types.h" 11 14 #include "intel_global_state.h" 12 15
+1 -1
drivers/gpu/drm/i915/display/intel_lvds.c
··· 37 37 #include <drm/drm_atomic_helper.h> 38 38 #include <drm/drm_crtc.h> 39 39 #include <drm/drm_edid.h> 40 + #include <drm/drm_print.h> 40 41 #include <drm/drm_probe_helper.h> 41 42 42 - #include "i915_drv.h" 43 43 #include "i915_reg.h" 44 44 #include "intel_atomic.h" 45 45 #include "intel_backlight.h"
+2 -1
drivers/gpu/drm/i915/display/intel_pch_display.c
··· 3 3 * Copyright © 2021 Intel Corporation 4 4 */ 5 5 6 + #include <drm/drm_print.h> 7 + 6 8 #include "g4x_dp.h" 7 - #include "i915_drv.h" 8 9 #include "i915_reg.h" 9 10 #include "intel_crt.h" 10 11 #include "intel_crt_regs.h"
+1 -1
drivers/gpu/drm/i915/display/intel_sdvo.c
··· 36 36 #include <drm/drm_crtc.h> 37 37 #include <drm/drm_edid.h> 38 38 #include <drm/drm_eld.h> 39 + #include <drm/drm_print.h> 39 40 #include <drm/drm_probe_helper.h> 40 41 41 - #include "i915_drv.h" 42 42 #include "i915_reg.h" 43 43 #include "intel_atomic.h" 44 44 #include "intel_audio.h"
+2 -1
drivers/gpu/drm/i915/display/intel_sprite.c
··· 36 36 #include <drm/drm_blend.h> 37 37 #include <drm/drm_color_mgmt.h> 38 38 #include <drm/drm_fourcc.h> 39 + #include <drm/drm_print.h> 39 40 #include <drm/drm_rect.h> 40 41 41 - #include "i915_drv.h" 42 + #include "i915_utils.h" 42 43 #include "i9xx_plane.h" 43 44 #include "intel_atomic_plane.h" 44 45 #include "intel_de.h"
+4 -1
drivers/gpu/drm/i915/display/intel_vga.c
··· 4 4 */ 5 5 6 6 #include <linux/delay.h> 7 + #include <linux/pci.h> 7 8 #include <linux/vgaarb.h> 8 9 10 + #include <drm/drm_device.h> 11 + #include <drm/drm_print.h> 9 12 #include <video/vga.h> 13 + 10 14 #include "soc/intel_gmch.h" 11 15 12 - #include "i915_drv.h" 13 16 #include "i915_reg.h" 14 17 #include "intel_de.h" 15 18 #include "intel_vga.h"
+3 -1
drivers/gpu/drm/i915/display/skl_scaler.c
··· 3 3 * Copyright © 2020 Intel Corporation 4 4 */ 5 5 6 - #include "i915_drv.h" 6 + #include <drm/drm_print.h> 7 + 7 8 #include "i915_reg.h" 9 + #include "i915_utils.h" 8 10 #include "intel_de.h" 9 11 #include "intel_display_trace.h" 10 12 #include "intel_display_types.h"