Re: [v2 17/19] drm/{i915, xe}: Remove i915_reg.h from intel_display_power_well.c

Jani Nikula
2026-01-22T12:19:50Z

On Thu, 22 Jan 2026, Uma Shankar <uma.shankar@intel.com> wrote:
> Make intel_display_power_well.c free from including i915_reg.h.
>
> Signed-off-by: Uma Shankar <uma.shankar@intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_display_power_well.c | 2 +-
> drivers/gpu/drm/i915/display/intel_display_regs.h | 2 ++
> drivers/gpu/drm/i915/i915_reg.h | 3 ---
> 3 files changed, 3 insertions(+), 4 deletions(-)
>
> 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 db185a859133..8a1f1c61c6da 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_power_well.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_power_well.c
> @@ -6,8 +6,8 @@
> #include <linux/iopoll.h>
>
> #include <drm/drm_print.h>
> +#include <drm/intel/intel_gmd_common_regs.h>

Again, I dislike the catch-all header, because I have no idea why this
is included. More granular is better.

BR,
Jani.

>
> -#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_regs.h b/drivers/gpu/drm/i915/display/intel_display_regs.h
> index fb21b1cf6124..1def3dccdf61 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_regs.h
> +++ b/drivers/gpu/drm/i915/display/intel_display_regs.h
> @@ -319,6 +319,8 @@
> #define FW_CSPWRDWNEN (1 << 15)
>
> #define MI_ARB_VLV _MMIO(VLV_DISPLAY_BASE + 0x6504)
> +/* Disable display A/B trickle feed */
> +#define MI_ARB_DISPLAY_TRICKLE_FEED_DISABLE (1 << 2)
>
> #define CZCLK_CDCLK_FREQ_RATIO _MMIO(VLV_DISPLAY_BASE + 0x6508)
> #define CDCLK_FREQ_SHIFT 4
> diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> index a85e2d9ab561..c68a64bc7646 100644
> --- a/drivers/gpu/drm/i915/i915_reg.h
> +++ b/drivers/gpu/drm/i915/i915_reg.h
> @@ -428,9 +428,6 @@
> #define MI_ARB_LOW_PRIORITY_GRACE_4KB (0 << 4) /* default */
> #define MI_ARB_LOW_PRIORITY_GRACE_8KB (1 << 4)
>
> -/* Disable display A/B trickle feed */
> -#define MI_ARB_DISPLAY_TRICKLE_FEED_DISABLE (1 << 2)
> -
> /* Set display plane priority */
> #define MI_ARB_DISPLAY_PRIORITY_A_B (0 << 0) /* display A > display B */
> #define MI_ARB_DISPLAY_PRIORITY_B_A (1 << 0) /* display B > display A */

--
Jani Nikula, Intel