On Fri, Nov 12, 2021 at 09:38:12PM +0200, Ville Syrjala wrote:
> From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
>
> Use REG_BIT() & co. for DPINVTT/VLV_DPFLIPSTAT bits.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/i915_irq.c | 2 +-
> drivers/gpu/drm/i915/i915_reg.h | 94 ++++++++++++++++-----------------
> 2 files changed, 48 insertions(+), 48 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
> index eb8c92324aee..1021f7ae0dda 100644
> --- a/drivers/gpu/drm/i915/i915_irq.c
> +++ b/drivers/gpu/drm/i915/i915_irq.c
> @@ -3013,7 +3013,7 @@ static void vlv_display_irq_reset(struct drm_i915_private *dev_priv)
> if (IS_CHERRYVIEW(dev_priv))
> intel_uncore_write(uncore, DPINVGTT, DPINVGTT_STATUS_MASK_CHV);
> else
> - intel_uncore_write(uncore, DPINVGTT, DPINVGTT_STATUS_MASK);
> + intel_uncore_write(uncore, DPINVGTT, DPINVGTT_STATUS_MASK_VLV);
>
> i915_hotplug_interrupt_update_locked(dev_priv, 0xffffffff, 0);
> intel_uncore_write(uncore, PORT_HOTPLUG_STAT, intel_uncore_read(&dev_priv->uncore, PORT_HOTPLUG_STAT));
> diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> index 6ba5ab277675..0ceb88828d93 100644
> --- a/drivers/gpu/drm/i915/i915_reg.h
> +++ b/drivers/gpu/drm/i915/i915_reg.h
> @@ -6358,55 +6358,55 @@ enum {
> #define PIPE_STATUS_PORT_UNDERRUN_XELPD REG_BIT(26)
>
> #define VLV_DPFLIPSTAT _MMIO(VLV_DISPLAY_BASE + 0x70028)
> -#define PIPEB_LINE_COMPARE_INT_EN (1 << 29)
> -#define PIPEB_HLINE_INT_EN (1 << 28)
> -#define PIPEB_VBLANK_INT_EN (1 << 27)
> -#define SPRITED_FLIP_DONE_INT_EN (1 << 26)
> -#define SPRITEC_FLIP_DONE_INT_EN (1 << 25)
> -#define PLANEB_FLIP_DONE_INT_EN (1 << 24)
> -#define PIPE_PSR_INT_EN (1 << 22)
> -#define PIPEA_LINE_COMPARE_INT_EN (1 << 21)
> -#define PIPEA_HLINE_INT_EN (1 << 20)
> -#define PIPEA_VBLANK_INT_EN (1 << 19)
> -#define SPRITEB_FLIP_DONE_INT_EN (1 << 18)
> -#define SPRITEA_FLIP_DONE_INT_EN (1 << 17)
> -#define PLANEA_FLIPDONE_INT_EN (1 << 16)
> -#define PIPEC_LINE_COMPARE_INT_EN (1 << 13)
> -#define PIPEC_HLINE_INT_EN (1 << 12)
> -#define PIPEC_VBLANK_INT_EN (1 << 11)
> -#define SPRITEF_FLIPDONE_INT_EN (1 << 10)
> -#define SPRITEE_FLIPDONE_INT_EN (1 << 9)
> -#define PLANEC_FLIPDONE_INT_EN (1 << 8)
> +#define PIPEB_LINE_COMPARE_INT_EN REG_BIT(29)
> +#define PIPEB_HLINE_INT_EN REG_BIT(28)
> +#define PIPEB_VBLANK_INT_EN REG_BIT(27)
> +#define SPRITED_FLIP_DONE_INT_EN REG_BIT(26)
> +#define SPRITEC_FLIP_DONE_INT_EN REG_BIT(25)
> +#define PLANEB_FLIP_DONE_INT_EN REG_BIT(24)
> +#define PIPE_PSR_INT_EN REG_BIT(22)
> +#define PIPEA_LINE_COMPARE_INT_EN REG_BIT(21)
> +#define PIPEA_HLINE_INT_EN REG_BIT(20)
> +#define PIPEA_VBLANK_INT_EN REG_BIT(19)
> +#define SPRITEB_FLIP_DONE_INT_EN REG_BIT(18)
> +#define SPRITEA_FLIP_DONE_INT_EN REG_BIT(17)
> +#define PLANEA_FLIPDONE_INT_EN REG_BIT(16)
> +#define PIPEC_LINE_COMPARE_INT_EN REG_BIT(13)
> +#define PIPEC_HLINE_INT_EN REG_BIT(12)
> +#define PIPEC_VBLANK_INT_EN REG_BIT(11)
> +#define SPRITEF_FLIPDONE_INT_EN REG_BIT(10)
> +#define SPRITEE_FLIPDONE_INT_EN REG_BIT(9)
> +#define PLANEC_FLIPDONE_INT_EN REG_BIT(8)
>
> #define DPINVGTT _MMIO(VLV_DISPLAY_BASE + 0x7002c) /* VLV/CHV only */
> -#define SPRITEF_INVALID_GTT_INT_EN (1 << 27)
> -#define SPRITEE_INVALID_GTT_INT_EN (1 << 26)
> -#define PLANEC_INVALID_GTT_INT_EN (1 << 25)
> -#define CURSORC_INVALID_GTT_INT_EN (1 << 24)
> -#define CURSORB_INVALID_GTT_INT_EN (1 << 23)
> -#define CURSORA_INVALID_GTT_INT_EN (1 << 22)
> -#define SPRITED_INVALID_GTT_INT_EN (1 << 21)
> -#define SPRITEC_INVALID_GTT_INT_EN (1 << 20)
> -#define PLANEB_INVALID_GTT_INT_EN (1 << 19)
> -#define SPRITEB_INVALID_GTT_INT_EN (1 << 18)
> -#define SPRITEA_INVALID_GTT_INT_EN (1 << 17)
> -#define PLANEA_INVALID_GTT_INT_EN (1 << 16)
> -#define DPINVGTT_EN_MASK 0xff0000
> -#define DPINVGTT_EN_MASK_CHV 0xfff0000
> -#define SPRITEF_INVALID_GTT_STATUS (1 << 11)
> -#define SPRITEE_INVALID_GTT_STATUS (1 << 10)
> -#define PLANEC_INVALID_GTT_STATUS (1 << 9)
> -#define CURSORC_INVALID_GTT_STATUS (1 << 8)
> -#define CURSORB_INVALID_GTT_STATUS (1 << 7)
> -#define CURSORA_INVALID_GTT_STATUS (1 << 6)
> -#define SPRITED_INVALID_GTT_STATUS (1 << 5)
> -#define SPRITEC_INVALID_GTT_STATUS (1 << 4)
> -#define PLANEB_INVALID_GTT_STATUS (1 << 3)
> -#define SPRITEB_INVALID_GTT_STATUS (1 << 2)
> -#define SPRITEA_INVALID_GTT_STATUS (1 << 1)
> -#define PLANEA_INVALID_GTT_STATUS (1 << 0)
> -#define DPINVGTT_STATUS_MASK 0xff
> -#define DPINVGTT_STATUS_MASK_CHV 0xfff
> +#define DPINVGTT_EN_MASK_CHV REG_GENMASK(27, 16)
> +#define DPINVGTT_EN_MASK_VLV REG_GENMASK(23, 16)
> +#define SPRITEF_INVALID_GTT_INT_EN REG_BIT(27)
> +#define SPRITEE_INVALID_GTT_INT_EN REG_BIT(26)
> +#define PLANEC_INVALID_GTT_INT_EN REG_BIT(25)
> +#define CURSORC_INVALID_GTT_INT_EN REG_BIT(24)
> +#define CURSORB_INVALID_GTT_INT_EN REG_BIT(23)
> +#define CURSORA_INVALID_GTT_INT_EN REG_BIT(22)
> +#define SPRITED_INVALID_GTT_INT_EN REG_BIT(21)
> +#define SPRITEC_INVALID_GTT_INT_EN REG_BIT(20)
> +#define PLANEB_INVALID_GTT_INT_EN REG_BIT(19)
> +#define SPRITEB_INVALID_GTT_INT_EN REG_BIT(18)
> +#define SPRITEA_INVALID_GTT_INT_EN REG_BIT(17)
> +#define PLANEA_INVALID_GTT_INT_EN REG_BIT(16)
> +#define DPINVGTT_STATUS_MASK_CHV REG_GENMASK(11, 0)
> +#define DPINVGTT_STATUS_MASK_VLV REG_GENMASK(7, 0)
> +#define SPRITEF_INVALID_GTT_STATUS REG_BIT(11)
> +#define SPRITEE_INVALID_GTT_STATUS REG_BIT(10)
> +#define PLANEC_INVALID_GTT_STATUS REG_BIT(9)
> +#define CURSORC_INVALID_GTT_STATUS REG_BIT(8)
> +#define CURSORB_INVALID_GTT_STATUS REG_BIT(7)
> +#define CURSORA_INVALID_GTT_STATUS REG_BIT(6)
> +#define SPRITED_INVALID_GTT_STATUS REG_BIT(5)
> +#define SPRITEC_INVALID_GTT_STATUS REG_BIT(4)
> +#define PLANEB_INVALID_GTT_STATUS REG_BIT(3)
> +#define SPRITEB_INVALID_GTT_STATUS REG_BIT(2)
> +#define SPRITEA_INVALID_GTT_STATUS REG_BIT(1)
> +#define PLANEA_INVALID_GTT_STATUS REG_BIT(0)
>
> #define DSPARB _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x70030)
> #define DSPARB_CSTART_MASK (0x7f << 7)
> --
> 2.32.0
>
