From: Rodrigo Vivi <rodrigo.vivi@intel.com>
To: Jani Nikula <jani.nikula@intel.com>
Cc: lucas.demarchi@intel.com, intel-xe@lists.freedesktop.org
Subject: Re: [Intel-xe] [PATCH 7/9] drm/i915: use explicit includes for i915_reg.h and i915_irq.h
Date: Wed, 19 Apr 2023 15:36:20 -0400 [thread overview]
Message-ID: <ZEBCtLdx/vL0hytP@intel.com> (raw)
In-Reply-To: <20230419123947.543175-8-jani.nikula@intel.com>
On Wed, Apr 19, 2023 at 03:39:45PM +0300, Jani Nikula wrote:
> 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: Jani Nikula <jani.nikula@intel.com>
> Link: https://patchwork.freedesktop.org/patch/msgid/20230419094243.366821-1-jani.nikula@intel.com
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> ---
> drivers/gpu/drm/i915/display/i9xx_wm.c | 1 +
> drivers/gpu/drm/i915/display/intel_display_power.c | 1 +
> drivers/gpu/drm/i915/display/intel_display_power_well.c | 1 +
> drivers/gpu/drm/i915/display/intel_display_trace.h | 1 -
> drivers/gpu/drm/i915/display/intel_fbc.c | 1 +
> drivers/gpu/drm/i915/display/intel_fifo_underrun.c | 2 ++
> drivers/gpu/drm/i915/gt/intel_gt_irq.c | 1 +
> drivers/gpu/drm/i915/gt/intel_reset.c | 1 +
> drivers/gpu/drm/i915/gt/intel_rps.c | 1 +
> drivers/gpu/drm/i915/gt/selftest_rps.c | 1 +
> drivers/gpu/drm/i915/gt/uc/intel_guc.c | 1 +
> drivers/gpu/drm/i915/i915_debugfs.c | 1 +
> drivers/gpu/drm/i915/i915_irq.c | 1 +
> drivers/gpu/drm/i915/i915_irq.h | 2 +-
> drivers/gpu/drm/i915/intel_clock_gating.c | 1 +
> 15 files changed, 15 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/i9xx_wm.c b/drivers/gpu/drm/i915/display/i9xx_wm.c
> index caef72d38798..e42f5844ae56 100644
> --- a/drivers/gpu/drm/i915/display/i9xx_wm.c
> +++ b/drivers/gpu/drm/i915/display/i9xx_wm.c
> @@ -4,6 +4,7 @@
> */
>
> #include "i915_drv.h"
> +#include "i915_reg.h"
> #include "i9xx_wm.h"
> #include "intel_atomic.h"
> #include "intel_display.h"
> diff --git a/drivers/gpu/drm/i915/display/intel_display_power.c b/drivers/gpu/drm/i915/display/intel_display_power.c
> index d02378d2ab4e..d5330db12846 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_power.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_power.c
> @@ -7,6 +7,7 @@
>
> #include "i915_drv.h"
> #include "i915_irq.h"
> +#include "i915_reg.h"
> #include "intel_backlight_regs.h"
> #include "intel_cdclk.h"
> #include "intel_combo_phy.h"
> diff --git a/drivers/gpu/drm/i915/display/intel_display_power_well.c b/drivers/gpu/drm/i915/display/intel_display_power_well.c
> index bd86f570f462..dfd3fd250f1c 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_power_well.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_power_well.c
> @@ -5,6 +5,7 @@
>
> #include "i915_drv.h"
> #include "i915_irq.h"
> +#include "i915_reg.h"
> #include "intel_backlight_regs.h"
> #include "intel_combo_phy.h"
> #include "intel_combo_phy_regs.h"
> diff --git a/drivers/gpu/drm/i915/display/intel_display_trace.h b/drivers/gpu/drm/i915/display/intel_display_trace.h
> index 651ea8564e1b..99bdb833591c 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_trace.h
> +++ b/drivers/gpu/drm/i915/display/intel_display_trace.h
> @@ -14,7 +14,6 @@
> #include <linux/tracepoint.h>
>
> #include "i915_drv.h"
> -#include "i915_irq.h"
> #include "intel_crtc.h"
> #include "intel_display_types.h"
> #include "intel_vblank.h"
> diff --git a/drivers/gpu/drm/i915/display/intel_fbc.c b/drivers/gpu/drm/i915/display/intel_fbc.c
> index b1e7b2588fd9..9dc7083fe974 100644
> --- a/drivers/gpu/drm/i915/display/intel_fbc.c
> +++ b/drivers/gpu/drm/i915/display/intel_fbc.c
> @@ -44,6 +44,7 @@
> #include <drm/drm_fourcc.h>
>
> #include "i915_drv.h"
> +#include "i915_reg.h"
> #include "i915_utils.h"
> #include "i915_vgpu.h"
> #include "intel_cdclk.h"
> diff --git a/drivers/gpu/drm/i915/display/intel_fifo_underrun.c b/drivers/gpu/drm/i915/display/intel_fifo_underrun.c
> index b708a62e509a..e7f77a225739 100644
> --- a/drivers/gpu/drm/i915/display/intel_fifo_underrun.c
> +++ b/drivers/gpu/drm/i915/display/intel_fifo_underrun.c
> @@ -26,6 +26,8 @@
> */
>
> #include "i915_drv.h"
> +#include "i915_reg.h"
> +#include "i915_irq.h"
> #include "intel_de.h"
> #include "intel_display_trace.h"
> #include "intel_display_types.h"
> diff --git a/drivers/gpu/drm/i915/gt/intel_gt_irq.c b/drivers/gpu/drm/i915/gt/intel_gt_irq.c
> index 1b25a6039152..c0f3ff4746ad 100644
> --- a/drivers/gpu/drm/i915/gt/intel_gt_irq.c
> +++ b/drivers/gpu/drm/i915/gt/intel_gt_irq.c
> @@ -7,6 +7,7 @@
>
> #include "i915_drv.h"
> #include "i915_irq.h"
> +#include "i915_reg.h"
> #include "intel_breadcrumbs.h"
> #include "intel_gt.h"
> #include "intel_gt_irq.h"
> diff --git a/drivers/gpu/drm/i915/gt/intel_reset.c b/drivers/gpu/drm/i915/gt/intel_reset.c
> index 0bb9094fdacd..382a72727582 100644
> --- a/drivers/gpu/drm/i915/gt/intel_reset.c
> +++ b/drivers/gpu/drm/i915/gt/intel_reset.c
> @@ -18,6 +18,7 @@
> #include "i915_file_private.h"
> #include "i915_gpu_error.h"
> #include "i915_irq.h"
> +#include "i915_reg.h"
> #include "intel_breadcrumbs.h"
> #include "intel_engine_pm.h"
> #include "intel_engine_regs.h"
> diff --git a/drivers/gpu/drm/i915/gt/intel_rps.c b/drivers/gpu/drm/i915/gt/intel_rps.c
> index 6d7395aa404a..7bdc140addf6 100644
> --- a/drivers/gpu/drm/i915/gt/intel_rps.c
> +++ b/drivers/gpu/drm/i915/gt/intel_rps.c
> @@ -10,6 +10,7 @@
> #include "display/intel_display.h"
> #include "i915_drv.h"
> #include "i915_irq.h"
> +#include "i915_reg.h"
> #include "intel_breadcrumbs.h"
> #include "intel_gt.h"
> #include "intel_gt_clock_utils.h"
> diff --git a/drivers/gpu/drm/i915/gt/selftest_rps.c b/drivers/gpu/drm/i915/gt/selftest_rps.c
> index 84e77e8dbba1..fb30f733b036 100644
> --- a/drivers/gpu/drm/i915/gt/selftest_rps.c
> +++ b/drivers/gpu/drm/i915/gt/selftest_rps.c
> @@ -8,6 +8,7 @@
>
> #include "gem/i915_gem_internal.h"
>
> +#include "i915_reg.h"
> #include "intel_engine_heartbeat.h"
> #include "intel_engine_pm.h"
> #include "intel_engine_regs.h"
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.c b/drivers/gpu/drm/i915/gt/uc/intel_guc.c
> index d76508fa3af7..e89f16ecf1ae 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_guc.c
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc.c
> @@ -16,6 +16,7 @@
> #include "intel_guc_submission.h"
> #include "i915_drv.h"
> #include "i915_irq.h"
> +#include "i915_reg.h"
>
> /**
> * DOC: GuC
> diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
> index 80c2bf98e341..41389a32e998 100644
> --- a/drivers/gpu/drm/i915/i915_debugfs.c
> +++ b/drivers/gpu/drm/i915/i915_debugfs.c
> @@ -50,6 +50,7 @@
> #include "i915_debugfs_params.h"
> #include "i915_driver.h"
> #include "i915_irq.h"
> +#include "i915_reg.h"
> #include "i915_scheduler.h"
> #include "intel_mchbar_regs.h"
>
> diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
> index 31271c30a8cf..aa3182918331 100644
> --- a/drivers/gpu/drm/i915/i915_irq.c
> +++ b/drivers/gpu/drm/i915/i915_irq.c
> @@ -52,6 +52,7 @@
> #include "i915_driver.h"
> #include "i915_drv.h"
> #include "i915_irq.h"
> +#include "i915_reg.h"
>
> /**
> * DOC: interrupt handling
> diff --git a/drivers/gpu/drm/i915/i915_irq.h b/drivers/gpu/drm/i915/i915_irq.h
> index 03ee4c8b1ed3..7f9e483f6ec3 100644
> --- a/drivers/gpu/drm/i915/i915_irq.h
> +++ b/drivers/gpu/drm/i915/i915_irq.h
> @@ -9,7 +9,7 @@
> #include <linux/ktime.h>
> #include <linux/types.h>
>
> -#include "i915_reg.h"
> +#include "i915_reg_defs.h"
>
> enum pipe;
> struct drm_crtc;
> diff --git a/drivers/gpu/drm/i915/intel_clock_gating.c b/drivers/gpu/drm/i915/intel_clock_gating.c
> index 8cfc19b48760..6692f74dc37c 100644
> --- a/drivers/gpu/drm/i915/intel_clock_gating.c
> +++ b/drivers/gpu/drm/i915/intel_clock_gating.c
> @@ -36,6 +36,7 @@
> #include "gt/intel_gt_regs.h"
>
> #include "i915_drv.h"
> +#include "i915_reg.h"
> #include "intel_clock_gating.h"
> #include "intel_mchbar_regs.h"
> #include "vlv_sideband.h"
> --
> 2.39.2
>
next prev parent reply other threads:[~2023-04-19 19:36 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-19 12:39 [Intel-xe] [PATCH 0/9] xe & i915 display integration cleanups Jani Nikula
2023-04-19 12:39 ` [Intel-xe] [PATCH 1/9] fixup! drm/xe/display: Implement display support Jani Nikula
2023-04-19 21:56 ` Lucas De Marchi
2023-04-20 8:49 ` Jani Nikula
2023-04-21 21:27 ` Lucas De Marchi
2023-04-24 11:41 ` Jani Nikula
2023-04-19 12:39 ` [Intel-xe] [PATCH 2/9] drm/i915/wm: remove stale and unused ilk_wm_max_level() declaration Jani Nikula
2023-04-19 19:35 ` Rodrigo Vivi
2023-04-19 19:49 ` Rodrigo Vivi
2023-04-19 19:50 ` Jani Nikula
2023-04-19 12:39 ` [Intel-xe] [PATCH 3/9] drm/i915/display: add I915 conditional build to i9xx_wm.h Jani Nikula
2023-04-19 19:35 ` Rodrigo Vivi
2023-04-19 12:39 ` [Intel-xe] [PATCH 4/9] fixup! drm/xe/display: Implement display support Jani Nikula
2023-04-19 12:39 ` [Intel-xe] [PATCH 5/9] drm/i915: rename intel_pm.[ch] to intel_clock_gating.[ch] Jani Nikula
2023-04-19 12:39 ` [Intel-xe] [PATCH 6/9] fixup! drm/xe/display: Implement display support Jani Nikula
2023-04-19 12:39 ` [Intel-xe] [PATCH 7/9] drm/i915: use explicit includes for i915_reg.h and i915_irq.h Jani Nikula
2023-04-19 19:36 ` Rodrigo Vivi [this message]
2023-04-19 12:39 ` [Intel-xe] [PATCH 8/9] fixup! drm/xe/display: Implement display support Jani Nikula
2023-04-19 12:39 ` [Intel-xe] [PATCH 9/9] fixup! drm/i915/display: Remaining changes to make xe compile Jani Nikula
2023-04-19 12:43 ` [Intel-xe] ✓ CI.Patch_applied: success for xe & i915 display integration cleanups Patchwork
2023-04-19 12:44 ` [Intel-xe] ✓ CI.KUnit: " Patchwork
2023-04-19 12:48 ` [Intel-xe] ✓ CI.Build: " Patchwork
2023-04-19 13:10 ` [Intel-xe] ○ CI.BAT: info " Patchwork
2023-04-19 19:33 ` [Intel-xe] [PATCH 0/9] " Rodrigo Vivi
2023-04-20 19:30 ` Rodrigo Vivi
2023-04-20 19:59 ` Jani Nikula
2023-04-21 21:29 ` [Intel-xe] ✗ CI.Patch_applied: failure for xe & i915 display integration cleanups (rev2) Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ZEBCtLdx/vL0hytP@intel.com \
--to=rodrigo.vivi@intel.com \
--cc=intel-xe@lists.freedesktop.org \
--cc=jani.nikula@intel.com \
--cc=lucas.demarchi@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.