[PATCH 01/15] drm/i915/display: pass display to HAS_PCH_*() macros

[Jani Nikula]

Convert some leftover i915 usages to struct intel_display.

Signed-off-by: Jani Nikula <jani.nik...@intel.com>
---
 drivers/gpu/drm/i915/display/intel_display_irq.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display_irq.c 
b/drivers/gpu/drm/i915/display/intel_display_irq.c
index fb25ec8adae3..cbf6ed62825c 100644
--- a/drivers/gpu/drm/i915/display/intel_display_irq.c
+++ b/drivers/gpu/drm/i915/display/intel_display_irq.c
@@ -1986,20 +1986,17 @@ void vlv_display_irq_postinstall(struct intel_display 
*display)
 
 void ibx_display_irq_reset(struct intel_display *display)
 {
-       struct drm_i915_private *i915 = to_i915(display->drm);
-
-       if (HAS_PCH_NOP(i915))
+       if (HAS_PCH_NOP(display))
                return;
 
        gen2_irq_reset(to_intel_uncore(display->drm), SDE_IRQ_REGS);
 
-       if (HAS_PCH_CPT(i915) || HAS_PCH_LPT(i915))
+       if (HAS_PCH_CPT(display) || HAS_PCH_LPT(display))
                intel_de_write(display, SERR_INT, 0xffffffff);
 }
 
 void gen8_display_irq_reset(struct intel_display *display)
 {
-       struct drm_i915_private *i915 = to_i915(display->drm);
        enum pipe pipe;
 
        if (!HAS_DISPLAY(display))
@@ -2016,7 +2013,7 @@ void gen8_display_irq_reset(struct intel_display *display)
        intel_display_irq_regs_reset(display, GEN8_DE_PORT_IRQ_REGS);
        intel_display_irq_regs_reset(display, GEN8_DE_MISC_IRQ_REGS);
 
-       if (HAS_PCH_SPLIT(i915))
+       if (HAS_PCH_SPLIT(display))
                ibx_display_irq_reset(display);
 }
 
-- 
2.39.5