Skip to content

Commit f70e437

Browse files
committed
drm/i915/dp: convert intel_dp_aux.[ch] to struct intel_display
Going forward, struct intel_display shall replace struct drm_i915_private as the main display device data pointer type. Convert intel_dp_aux.[ch] to struct intel_display. Reviewed-by: Ville Syrjälä <[email protected]> Signed-off-by: Jani Nikula <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/f295369d573d217323a624fd4b8dc477a6cf183b.1725012870.git.jani.nikula@intel.com
1 parent a954e0a commit f70e437

File tree

4 files changed

+73
-64
lines changed

4 files changed

+73
-64
lines changed

drivers/gpu/drm/i915/display/intel_display_irq.c

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -576,6 +576,7 @@ void valleyview_pipestat_irq_handler(struct drm_i915_private *dev_priv,
576576

577577
static void ibx_irq_handler(struct drm_i915_private *dev_priv, u32 pch_iir)
578578
{
579+
struct intel_display *display = &dev_priv->display;
579580
enum pipe pipe;
580581
u32 hotplug_trigger = pch_iir & SDE_HOTPLUG_MASK;
581582

@@ -589,7 +590,7 @@ static void ibx_irq_handler(struct drm_i915_private *dev_priv, u32 pch_iir)
589590
}
590591

591592
if (pch_iir & SDE_AUX_MASK)
592-
intel_dp_aux_irq_handler(dev_priv);
593+
intel_dp_aux_irq_handler(display);
593594

594595
if (pch_iir & SDE_GMBUS)
595596
intel_gmbus_irq_handler(dev_priv);
@@ -664,6 +665,7 @@ static void cpt_serr_int_handler(struct drm_i915_private *dev_priv)
664665

665666
static void cpt_irq_handler(struct drm_i915_private *dev_priv, u32 pch_iir)
666667
{
668+
struct intel_display *display = &dev_priv->display;
667669
enum pipe pipe;
668670
u32 hotplug_trigger = pch_iir & SDE_HOTPLUG_MASK_CPT;
669671

@@ -677,7 +679,7 @@ static void cpt_irq_handler(struct drm_i915_private *dev_priv, u32 pch_iir)
677679
}
678680

679681
if (pch_iir & SDE_AUX_MASK_CPT)
680-
intel_dp_aux_irq_handler(dev_priv);
682+
intel_dp_aux_irq_handler(display);
681683

682684
if (pch_iir & SDE_GMBUS_CPT)
683685
intel_gmbus_irq_handler(dev_priv);
@@ -709,7 +711,7 @@ void ilk_display_irq_handler(struct drm_i915_private *dev_priv, u32 de_iir)
709711
ilk_hpd_irq_handler(dev_priv, hotplug_trigger);
710712

711713
if (de_iir & DE_AUX_CHANNEL_A)
712-
intel_dp_aux_irq_handler(dev_priv);
714+
intel_dp_aux_irq_handler(display);
713715

714716
if (de_iir & DE_GSE)
715717
intel_opregion_asle_intr(display);
@@ -775,7 +777,7 @@ void ivb_display_irq_handler(struct drm_i915_private *dev_priv, u32 de_iir)
775777
}
776778

777779
if (de_iir & DE_AUX_CHANNEL_A_IVB)
778-
intel_dp_aux_irq_handler(dev_priv);
780+
intel_dp_aux_irq_handler(display);
779781

780782
if (de_iir & DE_GSE_IVB)
781783
intel_opregion_asle_intr(display);
@@ -1065,6 +1067,7 @@ static void gen8_read_and_ack_pch_irqs(struct drm_i915_private *i915, u32 *pch_i
10651067

10661068
void gen8_de_irq_handler(struct drm_i915_private *dev_priv, u32 master_ctl)
10671069
{
1070+
struct intel_display *display = &dev_priv->display;
10681071
u32 iir;
10691072
enum pipe pipe;
10701073

@@ -1100,7 +1103,7 @@ void gen8_de_irq_handler(struct drm_i915_private *dev_priv, u32 master_ctl)
11001103
intel_uncore_write(&dev_priv->uncore, GEN8_DE_PORT_IIR, iir);
11011104

11021105
if (iir & gen8_de_port_aux_mask(dev_priv)) {
1103-
intel_dp_aux_irq_handler(dev_priv);
1106+
intel_dp_aux_irq_handler(display);
11041107
found = true;
11051108
}
11061109

0 commit comments

Comments
 (0)