drm/i915/audio: convert LPE audio to struct intel_display

Going forward, struct intel_display will be the main display device
structure. Convert intel_lpe_audio.[ch] to it. Do some minor checkpatch
fixes while at it.

TODO: Not sure if irq_set_chip_data(irq, dev_priv); is used.

Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/f04dd028cd8869cdfb9ab9eb6aceed8ff8e7ddcd.1736345025.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_audio.c b/drivers/gpu/drm/i915/display/intel_audio.c
index 8c26e0e7c2cd6f912162c346d2585c6d8eef95b6..241e5d3904dcaa7701e38c7318bf13f0bbf12a5f 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_audio.c
+++ b/drivers/gpu/drm/i915/display/intel_audio.c
@@ -732,7 +732,6 @@ void intel_audio_codec_enable(struct intel_encoder *encoder,
                              const struct drm_connector_state *conn_state)
 {
        struct intel_display *display = to_intel_display(encoder);
-       struct drm_i915_private *i915 = to_i915(encoder->base.dev);
        struct i915_audio_component *acomp = display->audio.component;
        struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
        struct intel_connector *connector = to_intel_connector(conn_state->connector);
@@ -774,7 +773,7 @@ void intel_audio_codec_enable(struct intel_encoder *encoder,
                                                      (int)port, (int)cpu_transcoder);
        }
 
-       intel_lpe_audio_notify(i915, cpu_transcoder, port, crtc_state->eld,
+       intel_lpe_audio_notify(display, cpu_transcoder, port, crtc_state->eld,
                               crtc_state->port_clock,
                               intel_crtc_has_dp_encoder(crtc_state));
 }
@@ -793,7 +792,6 @@ void intel_audio_codec_disable(struct intel_encoder *encoder,
                               const struct drm_connector_state *old_conn_state)
 {
        struct intel_display *display = to_intel_display(encoder);
-       struct drm_i915_private *i915 = to_i915(encoder->base.dev);
        struct i915_audio_component *acomp = display->audio.component;
        struct intel_crtc *crtc = to_intel_crtc(old_crtc_state->uapi.crtc);
        struct intel_connector *connector = to_intel_connector(old_conn_state->connector);
@@ -833,7 +831,7 @@ void intel_audio_codec_disable(struct intel_encoder *encoder,
                                                      (int)port, (int)cpu_transcoder);
        }
 
-       intel_lpe_audio_notify(i915, cpu_transcoder, port, NULL, 0, false);
+       intel_lpe_audio_notify(display, cpu_transcoder, port, NULL, 0, false);
 }
 
 static void intel_acomp_get_config(struct intel_encoder *encoder,
@@ -1399,9 +1397,7 @@ static void i915_audio_component_cleanup(struct intel_display *display)
  */
 void intel_audio_init(struct intel_display *display)
 {
-       struct drm_i915_private *i915 = to_i915(display->drm);
-
-       if (intel_lpe_audio_init(i915) < 0)
+       if (intel_lpe_audio_init(display) < 0)
                i915_audio_component_init(display);
 }
 
@@ -1417,10 +1413,8 @@ void intel_audio_register(struct intel_display *display)
  */
 void intel_audio_deinit(struct intel_display *display)
 {
-       struct drm_i915_private *i915 = to_i915(display->drm);
-
        if (display->audio.lpe.platdev)
-               intel_lpe_audio_teardown(i915);
+               intel_lpe_audio_teardown(display);
        else
                i915_audio_component_cleanup(display);
 }

diff --git a/drivers/gpu/drm/i915/display/intel_lpe_audio.c b/drivers/gpu/drm/i915/display/intel_lpe_audio.c
index f11626176fe2cc23a740706b4d9243281c3b1ab5..59551c8414c2d0ca6fb4872f6ca9b6629689901d 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_lpe_audio.c
+++ b/drivers/gpu/drm/i915/display/intel_lpe_audio.c
@@ -77,12 +77,12 @@
 #include "intel_lpe_audio.h"
 #include "intel_pci_config.h"
 
-#define HAS_LPE_AUDIO(dev_priv) ((dev_priv)->display.audio.lpe.platdev != NULL)
+#define HAS_LPE_AUDIO(display) ((display)->audio.lpe.platdev)
 
 static struct platform_device *
-lpe_audio_platdev_create(struct drm_i915_private *dev_priv)
+lpe_audio_platdev_create(struct intel_display *display)
 {
-       struct pci_dev *pdev = to_pci_dev(dev_priv->drm.dev);
+       struct pci_dev *pdev = to_pci_dev(display->drm->dev);
        struct platform_device_info pinfo = {};
        struct resource *rsc;
        struct platform_device *platdev;
@@ -98,7 +98,8 @@ lpe_audio_platdev_create(struct drm_i915_private *dev_priv)
                return ERR_PTR(-ENOMEM);
        }
 
-       rsc[0].start    = rsc[0].end = dev_priv->display.audio.lpe.irq;
+       rsc[0].start    = display->audio.lpe.irq;
+       rsc[0].end      = display->audio.lpe.irq;
        rsc[0].flags    = IORESOURCE_IRQ;
        rsc[0].name     = "hdmi-lpe-audio-irq";
 
@@ -109,7 +110,7 @@ lpe_audio_platdev_create(struct drm_i915_private *dev_priv)
        rsc[1].flags    = IORESOURCE_MEM;
        rsc[1].name     = "hdmi-lpe-audio-mmio";
 
-       pinfo.parent = dev_priv->drm.dev;
+       pinfo.parent = display->drm->dev;
        pinfo.name = "hdmi-lpe-audio";
        pinfo.id = -1;
        pinfo.res = rsc;
@@ -118,8 +119,8 @@ lpe_audio_platdev_create(struct drm_i915_private *dev_priv)
        pinfo.size_data = sizeof(*pdata);
        pinfo.dma_mask = DMA_BIT_MASK(32);
 
-       pdata->num_pipes = INTEL_NUM_PIPES(dev_priv);
-       pdata->num_ports = IS_CHERRYVIEW(dev_priv) ? 3 : 2; /* B,C,D or B,C */
+       pdata->num_pipes = INTEL_NUM_PIPES(display);
+       pdata->num_ports = display->platform.cherryview ? 3 : 2; /* B,C,D or B,C */
        pdata->port[0].pipe = -1;
        pdata->port[1].pipe = -1;
        pdata->port[2].pipe = -1;
@@ -130,7 +131,7 @@ lpe_audio_platdev_create(struct drm_i915_private *dev_priv)
        kfree(pdata);
 
        if (IS_ERR(platdev)) {
-               drm_err(&dev_priv->drm,
+               drm_err(display->drm,
                        "Failed to allocate LPE audio platform device\n");
                return platdev;
        }
@@ -140,7 +141,7 @@ lpe_audio_platdev_create(struct drm_i915_private *dev_priv)
        return platdev;
 }
 
-static void lpe_audio_platdev_destroy(struct drm_i915_private *dev_priv)
+static void lpe_audio_platdev_destroy(struct intel_display *display)
 {
        /* XXX Note that platform_device_register_full() allocates a dma_mask
         * and never frees it. We can't free it here as we cannot guarantee
@@ -150,7 +151,7 @@ static void lpe_audio_platdev_destroy(struct drm_i915_private *dev_priv)
         * than us fiddle with its internals.
         */
 
-       platform_device_unregister(dev_priv->display.audio.lpe.platdev);
+       platform_device_unregister(display->audio.lpe.platdev);
 }
 
 static void lpe_audio_irq_unmask(struct irq_data *d)
@@ -167,11 +168,12 @@ static struct irq_chip lpe_audio_irqchip = {
        .irq_unmask = lpe_audio_irq_unmask,
 };
 
-static int lpe_audio_irq_init(struct drm_i915_private *dev_priv)
+static int lpe_audio_irq_init(struct intel_display *display)
 {
-       int irq = dev_priv->display.audio.lpe.irq;
+       struct drm_i915_private *dev_priv = to_i915(display->drm);
+       int irq = display->audio.lpe.irq;
 
-       drm_WARN_ON(&dev_priv->drm, !intel_irqs_enabled(dev_priv));
+       drm_WARN_ON(display->drm, !intel_irqs_enabled(dev_priv));
        irq_set_chip_and_handler_name(irq,
                                &lpe_audio_irqchip,
                                handle_simple_irq,
@@ -180,11 +182,11 @@ static int lpe_audio_irq_init(struct drm_i915_private *dev_priv)
        return irq_set_chip_data(irq, dev_priv);
 }
 
-static bool lpe_audio_detect(struct drm_i915_private *dev_priv)
+static bool lpe_audio_detect(struct intel_display *display)
 {
        int lpe_present = false;
 
-       if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) {
+       if (display->platform.valleyview || display->platform.cherryview) {
                static const struct pci_device_id atom_hdaudio_ids[] = {
                        /* Baytrail */
                        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x0f04)},
@@ -194,7 +196,7 @@ static bool lpe_audio_detect(struct drm_i915_private *dev_priv)
                };
 
                if (!pci_dev_present(atom_hdaudio_ids)) {
-                       drm_info(&dev_priv->drm,
+                       drm_info(display->drm,
                                 "HDaudio controller not detected, using LPE audio instead\n");
                        lpe_present = true;
                }
@@ -202,34 +204,34 @@ static bool lpe_audio_detect(struct drm_i915_private *dev_priv)
        return lpe_present;
 }
 
-static int lpe_audio_setup(struct drm_i915_private *dev_priv)
+static int lpe_audio_setup(struct intel_display *display)
 {
        int ret;
 
-       dev_priv->display.audio.lpe.irq = irq_alloc_desc(0);
-       if (dev_priv->display.audio.lpe.irq < 0) {
-               drm_err(&dev_priv->drm, "Failed to allocate IRQ desc: %d\n",
-                       dev_priv->display.audio.lpe.irq);
-               ret = dev_priv->display.audio.lpe.irq;
+       display->audio.lpe.irq = irq_alloc_desc(0);
+       if (display->audio.lpe.irq < 0) {
+               drm_err(display->drm, "Failed to allocate IRQ desc: %d\n",
+                       display->audio.lpe.irq);
+               ret = display->audio.lpe.irq;
                goto err;
        }
 
-       drm_dbg(&dev_priv->drm, "irq = %d\n", dev_priv->display.audio.lpe.irq);
+       drm_dbg(display->drm, "irq = %d\n", display->audio.lpe.irq);
 
-       ret = lpe_audio_irq_init(dev_priv);
+       ret = lpe_audio_irq_init(display);
 
        if (ret) {
-               drm_err(&dev_priv->drm,
+               drm_err(display->drm,
                        "Failed to initialize irqchip for lpe audio: %d\n",
                        ret);
                goto err_free_irq;
        }
 
-       dev_priv->display.audio.lpe.platdev = lpe_audio_platdev_create(dev_priv);
+       display->audio.lpe.platdev = lpe_audio_platdev_create(display);
 
-       if (IS_ERR(dev_priv->display.audio.lpe.platdev)) {
-               ret = PTR_ERR(dev_priv->display.audio.lpe.platdev);
-               drm_err(&dev_priv->drm,
+       if (IS_ERR(display->audio.lpe.platdev)) {
+               ret = PTR_ERR(display->audio.lpe.platdev);
+               drm_err(display->drm,
                        "Failed to create lpe audio platform device: %d\n",
                        ret);
                goto err_free_irq;
@@ -238,54 +240,54 @@ static int lpe_audio_setup(struct drm_i915_private *dev_priv)
        /* enable chicken bit; at least this is required for Dell Wyse 3040
         * with DP outputs (but only sometimes by some reason!)
         */
-       intel_de_write(dev_priv, VLV_AUD_CHICKEN_BIT_REG,
+       intel_de_write(display, VLV_AUD_CHICKEN_BIT_REG,
                       VLV_CHICKEN_BIT_DBG_ENABLE);
 
        return 0;
 err_free_irq:
-       irq_free_desc(dev_priv->display.audio.lpe.irq);
+       irq_free_desc(display->audio.lpe.irq);
 err:
-       dev_priv->display.audio.lpe.irq = -1;
-       dev_priv->display.audio.lpe.platdev = NULL;
+       display->audio.lpe.irq = -1;
+       display->audio.lpe.platdev = NULL;
        return ret;
 }
 
 /**
  * intel_lpe_audio_irq_handler() - forwards the LPE audio irq
- * @dev_priv: the i915 drm device private data
+ * @display: display device
  *
  * the LPE Audio irq is forwarded to the irq handler registered by LPE audio
  * driver.
  */
-void intel_lpe_audio_irq_handler(struct drm_i915_private *dev_priv)
+void intel_lpe_audio_irq_handler(struct intel_display *display)
 {
        int ret;
 
-       if (!HAS_LPE_AUDIO(dev_priv))
+       if (!HAS_LPE_AUDIO(display))
                return;
 
-       ret = generic_handle_irq(dev_priv->display.audio.lpe.irq);
+       ret = generic_handle_irq(display->audio.lpe.irq);
        if (ret)
-               drm_err_ratelimited(&dev_priv->drm,
+               drm_err_ratelimited(display->drm,
                                    "error handling LPE audio irq: %d\n", ret);
 }
 
 /**
  * intel_lpe_audio_init() - detect and setup the bridge between HDMI LPE Audio
  * driver and i915
- * @dev_priv: the i915 drm device private data
+ * @display: display device
  *
  * Return: 0 if successful. non-zero if detection or
  * llocation/initialization fails
  */
-int intel_lpe_audio_init(struct drm_i915_private *dev_priv)
+int intel_lpe_audio_init(struct intel_display *display)
 {
        int ret = -ENODEV;
 
-       if (lpe_audio_detect(dev_priv)) {
-               ret = lpe_audio_setup(dev_priv);
+       if (lpe_audio_detect(display)) {
+               ret = lpe_audio_setup(display);
                if (ret < 0)
-                       drm_err(&dev_priv->drm,
+                       drm_err(display->drm,
                                "failed to setup LPE Audio bridge\n");
        }
        return ret;
@@ -294,27 +296,27 @@ int intel_lpe_audio_init(struct drm_i915_private *dev_priv)
 /**
  * intel_lpe_audio_teardown() - destroy the bridge between HDMI LPE
  * audio driver and i915
- * @dev_priv: the i915 drm device private data
+ * @display: display device
  *
  * release all the resources for LPE audio <-> i915 bridge.
  */
-void intel_lpe_audio_teardown(struct drm_i915_private *dev_priv)
+void intel_lpe_audio_teardown(struct intel_display *display)
 {
-       if (!HAS_LPE_AUDIO(dev_priv))
+       if (!HAS_LPE_AUDIO(display))
                return;
 
-       lpe_audio_platdev_destroy(dev_priv);
+       lpe_audio_platdev_destroy(display);
 
-       irq_free_desc(dev_priv->display.audio.lpe.irq);
+       irq_free_desc(display->audio.lpe.irq);
 
-       dev_priv->display.audio.lpe.irq = -1;
-       dev_priv->display.audio.lpe.platdev = NULL;
+       display->audio.lpe.irq = -1;
+       display->audio.lpe.platdev = NULL;
 }
 
 /**
  * intel_lpe_audio_notify() - notify lpe audio event
  * audio driver and i915
- * @dev_priv: the i915 drm device private data
+ * @display: display device
  * @cpu_transcoder: CPU transcoder
  * @port: port
  * @eld : ELD data
@@ -323,7 +325,7 @@ void intel_lpe_audio_teardown(struct drm_i915_private *dev_priv)
  *
  * Notify lpe audio driver of eld change.
  */
-void intel_lpe_audio_notify(struct drm_i915_private *dev_priv,
+void intel_lpe_audio_notify(struct intel_display *display,
                            enum transcoder cpu_transcoder, enum port port,
                            const void *eld, int ls_clock, bool dp_output)
 {
@@ -332,15 +334,15 @@ void intel_lpe_audio_notify(struct drm_i915_private *dev_priv,
        struct intel_hdmi_lpe_audio_port_pdata *ppdata;
        u32 audio_enable;
 
-       if (!HAS_LPE_AUDIO(dev_priv))
+       if (!HAS_LPE_AUDIO(display))
                return;
 
-       pdata = dev_get_platdata(&dev_priv->display.audio.lpe.platdev->dev);
+       pdata = dev_get_platdata(&display->audio.lpe.platdev->dev);
        ppdata = &pdata->port[port - PORT_B];
 
        spin_lock_irqsave(&pdata->lpe_audio_slock, irqflags);
 
-       audio_enable = intel_de_read(dev_priv, VLV_AUD_PORT_EN_DBG(port));
+       audio_enable = intel_de_read(display, VLV_AUD_PORT_EN_DBG(port));
 
        if (eld != NULL) {
                memcpy(ppdata->eld, eld, HDMI_MAX_ELD_BYTES);
@@ -349,7 +351,7 @@ void intel_lpe_audio_notify(struct drm_i915_private *dev_priv,
                ppdata->dp_output = dp_output;
 
                /* Unmute the amp for both DP and HDMI */
-               intel_de_write(dev_priv, VLV_AUD_PORT_EN_DBG(port),
+               intel_de_write(display, VLV_AUD_PORT_EN_DBG(port),
                               audio_enable & ~VLV_AMP_MUTE);
        } else {
                memset(ppdata->eld, 0, HDMI_MAX_ELD_BYTES);
@@ -358,12 +360,12 @@ void intel_lpe_audio_notify(struct drm_i915_private *dev_priv,
                ppdata->dp_output = false;
 
                /* Mute the amp for both DP and HDMI */
-               intel_de_write(dev_priv, VLV_AUD_PORT_EN_DBG(port),
+               intel_de_write(display, VLV_AUD_PORT_EN_DBG(port),
                               audio_enable | VLV_AMP_MUTE);
        }
 
        if (pdata->notify_audio_lpe)
-               pdata->notify_audio_lpe(dev_priv->display.audio.lpe.platdev, port - PORT_B);
+               pdata->notify_audio_lpe(display->audio.lpe.platdev, port - PORT_B);
 
        spin_unlock_irqrestore(&pdata->lpe_audio_slock, irqflags);
 }

diff --git a/drivers/gpu/drm/i915/display/intel_lpe_audio.h b/drivers/gpu/drm/i915/display/intel_lpe_audio.h
index 2c5fcb6e1fd0a980ae76efe4af2f75e93fb00ca4..5234e11fd6627edb71364fab7204a2fcacf1e52b 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_lpe_audio.h
+++ b/drivers/gpu/drm/i915/display/intel_lpe_audio.h
@@ -10,27 +10,27 @@
 
 enum port;
 enum transcoder;
-struct drm_i915_private;
+struct intel_display;
 
 #ifdef I915
-int  intel_lpe_audio_init(struct drm_i915_private *dev_priv);
-void intel_lpe_audio_teardown(struct drm_i915_private *dev_priv);
-void intel_lpe_audio_irq_handler(struct drm_i915_private *dev_priv);
-void intel_lpe_audio_notify(struct drm_i915_private *dev_priv,
+int  intel_lpe_audio_init(struct intel_display *display);
+void intel_lpe_audio_teardown(struct intel_display *display);
+void intel_lpe_audio_irq_handler(struct intel_display *display);
+void intel_lpe_audio_notify(struct intel_display *display,
                            enum transcoder cpu_transcoder, enum port port,
                            const void *eld, int ls_clock, bool dp_output);
 #else
-static inline int intel_lpe_audio_init(struct drm_i915_private *dev_priv)
+static inline int intel_lpe_audio_init(struct intel_display *display)
 {
        return -ENODEV;
 }
-static inline void intel_lpe_audio_teardown(struct drm_i915_private *dev_priv)
+static inline void intel_lpe_audio_teardown(struct intel_display *display)
 {
 }
-static inline void intel_lpe_audio_irq_handler(struct drm_i915_private *dev_priv)
+static inline void intel_lpe_audio_irq_handler(struct intel_display *display)
 {
 }
-static inline void intel_lpe_audio_notify(struct drm_i915_private *dev_priv,
+static inline void intel_lpe_audio_notify(struct intel_display *display,
                                          enum transcoder cpu_transcoder, enum port port,
                                          const void *eld, int ls_clock, bool dp_output)
 {

diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 7920ad9585ae6ecab67cb8c28527d8f146d6d102..202eb1b6ae54d258184bdf8df8294a448519b8de 100644 (file)
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -207,6 +207,7 @@ out:
 static irqreturn_t valleyview_irq_handler(int irq, void *arg)
 {
        struct drm_i915_private *dev_priv = arg;
+       struct intel_display *display = &dev_priv->display;
        irqreturn_t ret = IRQ_NONE;
 
        if (!intel_irqs_enabled(dev_priv))
@@ -260,7 +261,7 @@ static irqreturn_t valleyview_irq_handler(int irq, void *arg)
 
                if (iir & (I915_LPE_PIPE_A_INTERRUPT |
                           I915_LPE_PIPE_B_INTERRUPT))
-                       intel_lpe_audio_irq_handler(dev_priv);
+                       intel_lpe_audio_irq_handler(display);
 
                /*
                 * VLV_IIR is single buffered, and reflects the level
@@ -293,6 +294,7 @@ static irqreturn_t valleyview_irq_handler(int irq, void *arg)
 static irqreturn_t cherryview_irq_handler(int irq, void *arg)
 {
        struct drm_i915_private *dev_priv = arg;
+       struct intel_display *display = &dev_priv->display;
        irqreturn_t ret = IRQ_NONE;
 
        if (!intel_irqs_enabled(dev_priv))
@@ -343,7 +345,7 @@ static irqreturn_t cherryview_irq_handler(int irq, void *arg)
                if (iir & (I915_LPE_PIPE_A_INTERRUPT |
                           I915_LPE_PIPE_B_INTERRUPT |
                           I915_LPE_PIPE_C_INTERRUPT))
-                       intel_lpe_audio_irq_handler(dev_priv);
+                       intel_lpe_audio_irq_handler(display);
 
                /*
                 * VLV_IIR is single buffered, and reflects the level