From: Rodrigo Vivi <rodrigo.vivi@intel.com>
To: Jani Nikula <jani.nikula@intel.com>
Cc: <intel-gfx@lists.freedesktop.org>, <intel-xe@lists.freedesktop.org>
Subject: Re: [PATCH 2/2] drm/xe/compat: stop including i915_utils.h from compat i915_drv.h
Date: Fri, 1 Aug 2025 11:22:28 -0400 [thread overview]
Message-ID: <aIzbtCt7eGyvtwnK@intel.com> (raw)
In-Reply-To: <6338c8524e600e048b56c5484624cfb51ed49d1d.1753965351.git.jani.nikula@intel.com>
On Thu, Jul 31, 2025 at 03:36:16PM +0300, Jani Nikula wrote:
> Expose the places that need i915_utils.h, and include it where needed.
again trusting your compiler more than my eyes
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_bios.c | 1 +
> drivers/gpu/drm/i915/display/intel_cdclk.c | 1 +
> drivers/gpu/drm/i915/display/intel_display_driver.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_fb.c | 1 +
> drivers/gpu/drm/i915/display/intel_gmbus.c | 1 +
> drivers/gpu/drm/i915/display/intel_hotplug.c | 1 +
> drivers/gpu/drm/i915/display/intel_vblank.c | 1 +
> drivers/gpu/drm/i915/display/skl_universal_plane.c | 1 +
> drivers/gpu/drm/i915/soc/intel_dram.c | 1 +
> drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h | 1 -
> drivers/gpu/drm/xe/display/ext/i915_utils.c | 1 +
> 13 files changed, 12 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c
> index 9c268bed091d..276ac29e4daf 100644
> --- a/drivers/gpu/drm/i915/display/intel_bios.c
> +++ b/drivers/gpu/drm/i915/display/intel_bios.c
> @@ -36,6 +36,7 @@
> #include "soc/intel_rom.h"
>
> #include "i915_drv.h"
> +#include "i915_utils.h"
> #include "intel_display.h"
> #include "intel_display_core.h"
> #include "intel_display_rpm.h"
> diff --git a/drivers/gpu/drm/i915/display/intel_cdclk.c b/drivers/gpu/drm/i915/display/intel_cdclk.c
> index 228aa64c1349..8ff20415770f 100644
> --- a/drivers/gpu/drm/i915/display/intel_cdclk.c
> +++ b/drivers/gpu/drm/i915/display/intel_cdclk.c
> @@ -31,6 +31,7 @@
> #include "hsw_ips.h"
> #include "i915_drv.h"
> #include "i915_reg.h"
> +#include "i915_utils.h"
> #include "intel_atomic.h"
> #include "intel_audio.h"
> #include "intel_bw.h"
> diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.c b/drivers/gpu/drm/i915/display/intel_display_driver.c
> index 8586ba102605..cf1c14412abe 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_driver.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_driver.c
> @@ -18,6 +18,7 @@
> #include <drm/drm_vblank.h>
>
> #include "i915_drv.h"
> +#include "i915_utils.h"
> #include "i9xx_wm.h"
> #include "intel_acpi.h"
> #include "intel_atomic.h"
> diff --git a/drivers/gpu/drm/i915/display/intel_display_power.c b/drivers/gpu/drm/i915/display/intel_display_power.c
> index 273054c22325..cc80c72ac9d1 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_power.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_power.c
> @@ -10,6 +10,7 @@
> #include "i915_drv.h"
> #include "i915_irq.h"
> #include "i915_reg.h"
> +#include "i915_utils.h"
> #include "intel_backlight_regs.h"
> #include "intel_cdclk.h"
> #include "intel_clock_gating.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 48cac225a809..6efe5524cbbf 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_power_well.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_power_well.c
> @@ -6,6 +6,7 @@
> #include "i915_drv.h"
> #include "i915_irq.h"
> #include "i915_reg.h"
> +#include "i915_utils.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_fb.c b/drivers/gpu/drm/i915/display/intel_fb.c
> index 0da842bd2f2f..b210c3250501 100644
> --- a/drivers/gpu/drm/i915/display/intel_fb.c
> +++ b/drivers/gpu/drm/i915/display/intel_fb.c
> @@ -11,6 +11,7 @@
> #include <drm/drm_modeset_helper.h>
>
> #include "i915_drv.h"
> +#include "i915_utils.h"
> #include "intel_bo.h"
> #include "intel_display.h"
> #include "intel_display_core.h"
> diff --git a/drivers/gpu/drm/i915/display/intel_gmbus.c b/drivers/gpu/drm/i915/display/intel_gmbus.c
> index 637f0f23f163..6a74805570e1 100644
> --- a/drivers/gpu/drm/i915/display/intel_gmbus.c
> +++ b/drivers/gpu/drm/i915/display/intel_gmbus.c
> @@ -36,6 +36,7 @@
> #include "i915_drv.h"
> #include "i915_irq.h"
> #include "i915_reg.h"
> +#include "i915_utils.h"
> #include "intel_de.h"
> #include "intel_display_regs.h"
> #include "intel_display_types.h"
> diff --git a/drivers/gpu/drm/i915/display/intel_hotplug.c b/drivers/gpu/drm/i915/display/intel_hotplug.c
> index 265aa97fcc75..740e5c930521 100644
> --- a/drivers/gpu/drm/i915/display/intel_hotplug.c
> +++ b/drivers/gpu/drm/i915/display/intel_hotplug.c
> @@ -28,6 +28,7 @@
>
> #include "i915_drv.h"
> #include "i915_irq.h"
> +#include "i915_utils.h"
> #include "intel_connector.h"
> #include "intel_display_power.h"
> #include "intel_display_core.h"
> diff --git a/drivers/gpu/drm/i915/display/intel_vblank.c b/drivers/gpu/drm/i915/display/intel_vblank.c
> index 3e51deca0c21..46d6db5fed11 100644
> --- a/drivers/gpu/drm/i915/display/intel_vblank.c
> +++ b/drivers/gpu/drm/i915/display/intel_vblank.c
> @@ -6,6 +6,7 @@
> #include <drm/drm_vblank.h>
>
> #include "i915_drv.h"
> +#include "i915_utils.h"
> #include "intel_color.h"
> #include "intel_crtc.h"
> #include "intel_de.h"
> diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drivers/gpu/drm/i915/display/skl_universal_plane.c
> index ec3fe75f2c6c..950dc79dbdd4 100644
> --- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
> +++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
> @@ -10,6 +10,7 @@
>
> #include "pxp/intel_pxp.h"
> #include "i915_drv.h"
> +#include "i915_utils.h"
> #include "intel_bo.h"
> #include "intel_de.h"
> #include "intel_display_irq.h"
> diff --git a/drivers/gpu/drm/i915/soc/intel_dram.c b/drivers/gpu/drm/i915/soc/intel_dram.c
> index deb159548a09..3eeaabdf59e8 100644
> --- a/drivers/gpu/drm/i915/soc/intel_dram.c
> +++ b/drivers/gpu/drm/i915/soc/intel_dram.c
> @@ -11,6 +11,7 @@
>
> #include "i915_drv.h"
> #include "i915_reg.h"
> +#include "i915_utils.h"
> #include "intel_dram.h"
> #include "intel_mchbar_regs.h"
> #include "intel_pcode.h"
> diff --git a/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h b/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h
> index d8cd66a96621..b8269391bc69 100644
> --- a/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h
> +++ b/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h
> @@ -12,7 +12,6 @@
>
> #include <drm/drm_drv.h>
>
> -#include "i915_utils.h"
> #include "xe_device.h" /* for xe_device_has_flat_ccs() */
> #include "xe_device_types.h"
>
> diff --git a/drivers/gpu/drm/xe/display/ext/i915_utils.c b/drivers/gpu/drm/xe/display/ext/i915_utils.c
> index 43b10a2cc508..1421c2a7b64d 100644
> --- a/drivers/gpu/drm/xe/display/ext/i915_utils.c
> +++ b/drivers/gpu/drm/xe/display/ext/i915_utils.c
> @@ -4,6 +4,7 @@
> */
>
> #include "i915_drv.h"
> +#include "i915_utils.h"
>
> bool i915_vtd_active(struct drm_i915_private *i915)
> {
> --
> 2.39.5
>
next prev parent reply other threads:[~2025-08-01 15:22 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-31 12:36 [PATCH 0/2] drm/xe/compat: cleanups Jani Nikula
2025-07-31 12:36 ` [PATCH 1/2] drm/xe/compat: remove unused platform macros Jani Nikula
2025-08-01 15:21 ` Rodrigo Vivi
2025-08-04 8:29 ` Jani Nikula
2025-07-31 12:36 ` [PATCH 2/2] drm/xe/compat: stop including i915_utils.h from compat i915_drv.h Jani Nikula
2025-08-01 15:22 ` Rodrigo Vivi [this message]
2025-07-31 13:40 ` ✓ i915.CI.BAT: success for drm/xe/compat: cleanups Patchwork
2025-07-31 15:41 ` ✓ CI.KUnit: " Patchwork
2025-07-31 16:49 ` ✓ Xe.CI.BAT: " Patchwork
2025-07-31 18:51 ` ✓ i915.CI.Full: " Patchwork
2025-07-31 18:55 ` ✗ Xe.CI.Full: failure " 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=aIzbtCt7eGyvtwnK@intel.com \
--to=rodrigo.vivi@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=intel-xe@lists.freedesktop.org \
--cc=jani.nikula@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.