From: Jani Nikula <jani.nikula@intel.com>
To: Uma Shankar <uma.shankar@intel.com>,
intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org
Cc: ville.syrjala@linux.intel.com, Uma Shankar <uma.shankar@intel.com>
Subject: Re: [v2 14/19] drm/{i915, xe}: Remove i915_reg.h from intel_psr.c
Date: Thu, 22 Jan 2026 14:10:25 +0200 [thread overview]
Message-ID: <276bfaa323b9c616ebb18783ab9540d2ee6c900a@intel.com> (raw)
In-Reply-To: <20260121232414.707192-15-uma.shankar@intel.com>
On Thu, 22 Jan 2026, Uma Shankar <uma.shankar@intel.com> wrote:
> Move some chicken registers to display header to make
> intel_psr.c free from including i915_reg.h.
>
> v2: Use display header instead of gmd common include (Jani)
>
> Signed-off-by: Uma Shankar <uma.shankar@intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
> ---
> .../gpu/drm/i915/display/intel_display_regs.h | 26 +++++++++++++++++++
> drivers/gpu/drm/i915/display/intel_psr.c | 1 -
> drivers/gpu/drm/i915/i915_reg.h | 26 -------------------
> 3 files changed, 26 insertions(+), 27 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display_regs.h b/drivers/gpu/drm/i915/display/intel_display_regs.h
> index f468e0d20b92..aafe71a3b410 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_regs.h
> +++ b/drivers/gpu/drm/i915/display/intel_display_regs.h
> @@ -363,6 +363,32 @@
> #define OGAMC1 _MMIO(0x30020)
> #define OGAMC0 _MMIO(0x30024)
>
> +#define GEN8_CHICKEN_DCPR_1 _MMIO(0x46430)
> +#define _LATENCY_REPORTING_REMOVED_PIPE_D REG_BIT(31)
> +#define SKL_SELECT_ALTERNATE_DC_EXIT REG_BIT(30)
> +#define _LATENCY_REPORTING_REMOVED_PIPE_C REG_BIT(25)
> +#define _LATENCY_REPORTING_REMOVED_PIPE_B REG_BIT(24)
> +#define _LATENCY_REPORTING_REMOVED_PIPE_A REG_BIT(23)
> +#define LATENCY_REPORTING_REMOVED(pipe) _PICK((pipe), \
> + _LATENCY_REPORTING_REMOVED_PIPE_A, \
> + _LATENCY_REPORTING_REMOVED_PIPE_B, \
> + _LATENCY_REPORTING_REMOVED_PIPE_C, \
> + _LATENCY_REPORTING_REMOVED_PIPE_D)
> +#define ICL_DELAY_PMRSP REG_BIT(22)
> +#define DISABLE_FLR_SRC REG_BIT(15)
> +#define MASK_WAKEMEM REG_BIT(13)
> +#define DDI_CLOCK_REG_ACCESS REG_BIT(7)
> +
> +#define CHICKEN_PAR1_1 _MMIO(0x42080)
> +#define IGNORE_KVMR_PIPE_A REG_BIT(23)
> +#define KBL_ARB_FILL_SPARE_22 REG_BIT(22)
> +#define DIS_RAM_BYPASS_PSR2_MAN_TRACK REG_BIT(16)
> +#define SKL_DE_COMPRESSED_HASH_MODE REG_BIT(15)
> +#define HSW_MASK_VBL_TO_PIPE_IN_SRD REG_BIT(15) /* hsw/bdw */
> +#define FORCE_ARB_IDLE_PLANES REG_BIT(14)
> +#define SKL_EDP_PSR_FIX_RDWRAP REG_BIT(3)
> +#define IGNORE_PSR2_HW_TRACKING REG_BIT(1)
> +
> #define GEN9_CLKGATE_DIS_4 _MMIO(0x4653C)
> #define BXT_GMBUS_GATING_DIS (1 << 14)
> #define DG2_DPFC_GATING_DIS REG_BIT(31)
> diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c
> index 62208ffc5101..bde7dbfe15a8 100644
> --- a/drivers/gpu/drm/i915/display/intel_psr.c
> +++ b/drivers/gpu/drm/i915/display/intel_psr.c
> @@ -29,7 +29,6 @@
> #include <drm/drm_print.h>
> #include <drm/drm_vblank.h>
>
> -#include "i915_reg.h"
> #include "intel_alpm.h"
> #include "intel_atomic.h"
> #include "intel_crtc.h"
> diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> index d43c04e491e1..62d58d7cfa7a 100644
> --- a/drivers/gpu/drm/i915/i915_reg.h
> +++ b/drivers/gpu/drm/i915/i915_reg.h
> @@ -806,36 +806,10 @@
> #define CHICKEN3_DGMG_REQ_OUT_FIX_DISABLE REG_BIT(5)
> #define CHICKEN3_DGMG_DONE_FIX_DISABLE REG_BIT(2)
>
> -#define CHICKEN_PAR1_1 _MMIO(0x42080)
> -#define IGNORE_KVMR_PIPE_A REG_BIT(23)
> -#define KBL_ARB_FILL_SPARE_22 REG_BIT(22)
> -#define DIS_RAM_BYPASS_PSR2_MAN_TRACK REG_BIT(16)
> -#define SKL_DE_COMPRESSED_HASH_MODE REG_BIT(15)
> -#define HSW_MASK_VBL_TO_PIPE_IN_SRD REG_BIT(15) /* hsw/bdw */
> -#define FORCE_ARB_IDLE_PLANES REG_BIT(14)
> -#define SKL_EDP_PSR_FIX_RDWRAP REG_BIT(3)
> -#define IGNORE_PSR2_HW_TRACKING REG_BIT(1)
> -
> #define CHICKEN_PAR2_1 _MMIO(0x42090)
> #define KVM_CONFIG_CHANGE_NOTIFICATION_SELECT REG_BIT(14)
>
>
> -#define GEN8_CHICKEN_DCPR_1 _MMIO(0x46430)
> -#define _LATENCY_REPORTING_REMOVED_PIPE_D REG_BIT(31)
> -#define SKL_SELECT_ALTERNATE_DC_EXIT REG_BIT(30)
> -#define _LATENCY_REPORTING_REMOVED_PIPE_C REG_BIT(25)
> -#define _LATENCY_REPORTING_REMOVED_PIPE_B REG_BIT(24)
> -#define _LATENCY_REPORTING_REMOVED_PIPE_A REG_BIT(23)
> -#define LATENCY_REPORTING_REMOVED(pipe) _PICK((pipe), \
> - _LATENCY_REPORTING_REMOVED_PIPE_A, \
> - _LATENCY_REPORTING_REMOVED_PIPE_B, \
> - _LATENCY_REPORTING_REMOVED_PIPE_C, \
> - _LATENCY_REPORTING_REMOVED_PIPE_D)
> -#define ICL_DELAY_PMRSP REG_BIT(22)
> -#define DISABLE_FLR_SRC REG_BIT(15)
> -#define MASK_WAKEMEM REG_BIT(13)
> -#define DDI_CLOCK_REG_ACCESS REG_BIT(7)
> -
> #define VLV_PMWGICZ _MMIO(0x1300a4)
>
> #define HSW_EDRAM_CAP _MMIO(0x120010)
--
Jani Nikula, Intel
next prev parent reply other threads:[~2026-01-22 12:10 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-01-21 23:23 [v2 00/19] Make Display free from i915_reg.h Uma Shankar
2026-01-21 23:23 ` [v2 01/19] drm/{i915, xe}: Extract display registers from i915_reg.h to display Uma Shankar
2026-01-22 11:16 ` Jani Nikula
2026-01-22 11:16 ` Jani Nikula
2026-01-23 10:38 ` Shankar, Uma
2026-01-21 23:23 ` [v2 02/19] drm/{i915, xe}: Extract South chicken " Uma Shankar
2026-01-22 11:26 ` Jani Nikula
2026-01-23 10:40 ` Shankar, Uma
2026-01-21 23:23 ` [v2 03/19] drm/{i915, xe}: Extract display interrupt definitions Uma Shankar
2026-01-22 11:29 ` Jani Nikula
2026-01-23 10:42 ` Shankar, Uma
2026-01-21 23:23 ` [v2 04/19] drm/{i915, xe}: Extract DSPCLK_GATE_D from i915_reg to display Uma Shankar
2026-01-22 11:31 ` Jani Nikula
2026-01-21 23:24 ` [v2 05/19] drm/{i915, xe}: Extract pcode definitions to common header Uma Shankar
2026-01-22 11:40 ` Jani Nikula
2026-01-23 10:45 ` Shankar, Uma
2026-01-22 11:46 ` Jani Nikula
2026-01-23 10:46 ` Shankar, Uma
2026-01-21 23:24 ` [v2 06/19] drm/{i915, xe}: Remove i915_reg.h from intel_display_device.c Uma Shankar
2026-01-22 11:36 ` Jani Nikula
2026-01-23 10:43 ` Shankar, Uma
2026-01-21 23:24 ` [v2 07/19] drm/{i915, xe}: Remove i915_reg.h from intel_dram.c Uma Shankar
2026-01-22 11:41 ` Jani Nikula
2026-01-23 10:45 ` Shankar, Uma
2026-01-21 23:24 ` [v2 08/19] drm/{i915, xe}: Removed i915_reg.h from intel_display.c Uma Shankar
2026-01-22 11:43 ` Jani Nikula
2026-01-21 23:24 ` [v2 09/19] drm/{i915, xe}: Remove i915_reg.h from intel_overlay.c Uma Shankar
2026-01-22 11:51 ` Jani Nikula
2026-01-23 10:47 ` Shankar, Uma
2026-01-21 23:24 ` [v2 10/19] drm/{i915, xe}: Remove i915_reg.h from g4x_dp.c Uma Shankar
2026-01-22 12:00 ` Jani Nikula
2026-01-23 10:48 ` Shankar, Uma
2026-01-21 23:24 ` [v2 11/19] drm/{i915, xe}: Remove i915_reg.h from i9xx_wm.c Uma Shankar
2026-01-21 23:24 ` [v2 12/19] drm/{i915, xe}: Remove i915_reg.h from g4x_hdmi.c Uma Shankar
2026-01-22 12:08 ` Jani Nikula
2026-01-21 23:24 ` [v2 13/19] drm/{i915, xe}: Remove i915_reg.h from intel_rom.c Uma Shankar
2026-01-22 12:09 ` Jani Nikula
2026-01-21 23:24 ` [v2 14/19] drm/{i915, xe}: Remove i915_reg.h from intel_psr.c Uma Shankar
2026-01-22 12:10 ` Jani Nikula [this message]
2026-01-21 23:24 ` [v2 15/19] drm/{i915, xe}: Remove i915_reg.h from intel_fifo_underrun.c Uma Shankar
2026-01-22 12:14 ` Jani Nikula
2026-01-23 10:49 ` Shankar, Uma
2026-01-21 23:24 ` [v2 16/19] drm/{i915, xe}: Remove i915_reg.h from intel_display_irq.c Uma Shankar
2026-01-22 12:18 ` Jani Nikula
2026-01-23 10:49 ` Shankar, Uma
2026-01-21 23:24 ` [v2 17/19] drm/{i915, xe}: Remove i915_reg.h from intel_display_power_well.c Uma Shankar
2026-01-22 12:19 ` Jani Nikula
2026-01-23 10:50 ` Shankar, Uma
2026-01-21 23:24 ` [v2 18/19] drm/{i915, xe}: Remove i915_reg.h from intel_modeset_setup.c Uma Shankar
2026-01-22 12:21 ` Jani Nikula
2026-01-21 23:24 ` [v2 19/19] drm/{i915, xe}: Remove i915_reg.h from display Uma Shankar
2026-01-22 12:20 ` Jani Nikula
2026-01-23 10:53 ` Shankar, Uma
2026-01-21 23:56 ` ✗ CI.checkpatch: warning for Make Display free from i915_reg.h (rev2) Patchwork
2026-01-21 23:58 ` ✓ CI.KUnit: success " Patchwork
2026-01-22 0:13 ` ✗ CI.checksparse: warning " Patchwork
2026-01-22 0:39 ` ✓ Xe.CI.BAT: success " Patchwork
2026-01-22 10:10 ` ✓ Xe.CI.Full: " 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=276bfaa323b9c616ebb18783ab9540d2ee6c900a@intel.com \
--to=jani.nikula@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=intel-xe@lists.freedesktop.org \
--cc=uma.shankar@intel.com \
--cc=ville.syrjala@linux.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox