Commit 476f62b8 authored by Jani Nikula's avatar Jani Nikula

drm/i915: use explicit includes for i915_reg.h and i915_irq.h

A lot of places include i915_reg.h implicitly via i915_irq.h, which gets
included implicitly via intel_display_trace.h. Remove the includes from
the headers, and include i915_reg.h and i915_irq.h explicitly where
needed.
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarAndrzej Hajda <andrzej.hajda@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230419094243.366821-1-jani.nikula@intel.com
parent 27ac123b
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
*/ */
#include "i915_drv.h" #include "i915_drv.h"
#include "i915_reg.h"
#include "i9xx_wm.h" #include "i9xx_wm.h"
#include "intel_atomic.h" #include "intel_atomic.h"
#include "intel_display.h" #include "intel_display.h"
......
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
#include <drm/drm_fourcc.h> #include <drm/drm_fourcc.h>
#include "i915_config.h" #include "i915_config.h"
#include "i915_reg.h"
#include "intel_atomic_plane.h" #include "intel_atomic_plane.h"
#include "intel_cdclk.h" #include "intel_cdclk.h"
#include "intel_display_rps.h" #include "intel_display_rps.h"
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
#include "i915_drv.h" #include "i915_drv.h"
#include "i915_irq.h" #include "i915_irq.h"
#include "i915_reg.h"
#include "intel_backlight_regs.h" #include "intel_backlight_regs.h"
#include "intel_cdclk.h" #include "intel_cdclk.h"
#include "intel_combo_phy.h" #include "intel_combo_phy.h"
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
#include "i915_drv.h" #include "i915_drv.h"
#include "i915_irq.h" #include "i915_irq.h"
#include "i915_reg.h"
#include "intel_backlight_regs.h" #include "intel_backlight_regs.h"
#include "intel_combo_phy.h" #include "intel_combo_phy.h"
#include "intel_combo_phy_regs.h" #include "intel_combo_phy_regs.h"
......
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
#include <linux/tracepoint.h> #include <linux/tracepoint.h>
#include "i915_drv.h" #include "i915_drv.h"
#include "i915_irq.h"
#include "intel_crtc.h" #include "intel_crtc.h"
#include "intel_display_types.h" #include "intel_display_types.h"
#include "intel_vblank.h" #include "intel_vblank.h"
......
...@@ -44,6 +44,7 @@ ...@@ -44,6 +44,7 @@
#include <drm/drm_fourcc.h> #include <drm/drm_fourcc.h>
#include "i915_drv.h" #include "i915_drv.h"
#include "i915_reg.h"
#include "i915_utils.h" #include "i915_utils.h"
#include "i915_vgpu.h" #include "i915_vgpu.h"
#include "intel_cdclk.h" #include "intel_cdclk.h"
......
...@@ -26,6 +26,8 @@ ...@@ -26,6 +26,8 @@
*/ */
#include "i915_drv.h" #include "i915_drv.h"
#include "i915_reg.h"
#include "i915_irq.h"
#include "intel_de.h" #include "intel_de.h"
#include "intel_display_trace.h" #include "intel_display_trace.h"
#include "intel_display_types.h" #include "intel_display_types.h"
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
#include "i915_drv.h" #include "i915_drv.h"
#include "i915_irq.h" #include "i915_irq.h"
#include "i915_reg.h"
#include "intel_breadcrumbs.h" #include "intel_breadcrumbs.h"
#include "intel_gt.h" #include "intel_gt.h"
#include "intel_gt_irq.h" #include "intel_gt_irq.h"
......
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
#include "i915_file_private.h" #include "i915_file_private.h"
#include "i915_gpu_error.h" #include "i915_gpu_error.h"
#include "i915_irq.h" #include "i915_irq.h"
#include "i915_reg.h"
#include "intel_breadcrumbs.h" #include "intel_breadcrumbs.h"
#include "intel_engine_pm.h" #include "intel_engine_pm.h"
#include "intel_engine_regs.h" #include "intel_engine_regs.h"
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#include "display/intel_display.h" #include "display/intel_display.h"
#include "i915_drv.h" #include "i915_drv.h"
#include "i915_irq.h" #include "i915_irq.h"
#include "i915_reg.h"
#include "intel_breadcrumbs.h" #include "intel_breadcrumbs.h"
#include "intel_gt.h" #include "intel_gt.h"
#include "intel_gt_clock_utils.h" #include "intel_gt_clock_utils.h"
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
#include "gem/i915_gem_internal.h" #include "gem/i915_gem_internal.h"
#include "i915_reg.h"
#include "intel_engine_heartbeat.h" #include "intel_engine_heartbeat.h"
#include "intel_engine_pm.h" #include "intel_engine_pm.h"
#include "intel_engine_regs.h" #include "intel_engine_regs.h"
......
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#include "intel_guc_submission.h" #include "intel_guc_submission.h"
#include "i915_drv.h" #include "i915_drv.h"
#include "i915_irq.h" #include "i915_irq.h"
#include "i915_reg.h"
/** /**
* DOC: GuC * DOC: GuC
......
...@@ -50,6 +50,7 @@ ...@@ -50,6 +50,7 @@
#include "i915_debugfs_params.h" #include "i915_debugfs_params.h"
#include "i915_driver.h" #include "i915_driver.h"
#include "i915_irq.h" #include "i915_irq.h"
#include "i915_reg.h"
#include "i915_scheduler.h" #include "i915_scheduler.h"
#include "intel_mchbar_regs.h" #include "intel_mchbar_regs.h"
......
...@@ -54,6 +54,7 @@ ...@@ -54,6 +54,7 @@
#include "i915_driver.h" #include "i915_driver.h"
#include "i915_drv.h" #include "i915_drv.h"
#include "i915_irq.h" #include "i915_irq.h"
#include "i915_reg.h"
/** /**
* DOC: interrupt handling * DOC: interrupt handling
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#include <linux/ktime.h> #include <linux/ktime.h>
#include <linux/types.h> #include <linux/types.h>
#include "i915_reg.h" #include "i915_reg_defs.h"
enum pipe; enum pipe;
struct drm_crtc; struct drm_crtc;
......
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
#include "gt/intel_gt_regs.h" #include "gt/intel_gt_regs.h"
#include "i915_drv.h" #include "i915_drv.h"
#include "i915_reg.h"
#include "intel_clock_gating.h" #include "intel_clock_gating.h"
#include "intel_mchbar_regs.h" #include "intel_mchbar_regs.h"
#include "vlv_sideband.h" #include "vlv_sideband.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment