[PATCH 6/8] drm/i915: move de_irq_mask to display substruct

[Lucas De Marchi]

On Mon, Apr 08, 2024 at 09:08:41PM +0300, Jani Nikula wrote:
>The info is related to display, and should be placed under
>i915->display.
>
>Signed-off-by: Jani Nikula <jani.nikula at intel.com>
>---
> .../gpu/drm/i915/display/intel_display_core.h   |  2 ++
> .../gpu/drm/i915/display/intel_display_irq.c    | 17 +++++++++--------
> drivers/gpu/drm/i915/i915_drv.h                 |  5 +----
> drivers/gpu/drm/xe/xe_device_types.h            |  7 ++-----
> 4 files changed, 14 insertions(+), 17 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/display/intel_display_core.h b/drivers/gpu/drm/i915/display/intel_display_core.h
>index 68aee44b4822..7a70b162b015 100644
>--- a/drivers/gpu/drm/i915/display/intel_display_core.h
>+++ b/drivers/gpu/drm/i915/display/intel_display_core.h
>@@ -452,6 +452,8 @@ struct intel_display {
>
> 		/* For i915gm/i945gm vblank irq workaround */
> 		u8 vblank_enabled;
>+
>+		u32 de_irq_mask[I915_MAX_PIPES];
> 	} irq;
>
> 	struct {
>diff --git a/drivers/gpu/drm/i915/display/intel_display_irq.c b/drivers/gpu/drm/i915/display/intel_display_irq.c
>index e9fcdac90efd..9b9548ae9797 100644
>--- a/drivers/gpu/drm/i915/display/intel_display_irq.c
>+++ b/drivers/gpu/drm/i915/display/intel_display_irq.c
>@@ -117,13 +117,14 @@ static void bdw_update_pipe_irq(struct drm_i915_private *dev_priv,
> 	if (drm_WARN_ON(&dev_priv->drm, !intel_irqs_enabled(dev_priv)))
> 		return;
>
>-	new_val = dev_priv->de_irq_mask[pipe];
>+	new_val = dev_priv->display.irq.de_irq_mask[pipe];


is this a good name though?  I'd expect to see something like
display.irq.mask in the code.

Lucas De Marchi